write to output if patch has been disturbed (1) or not (0) this year.

lucialayr · Mar 28, 2022 · 79565a8 · 79565a8
1 parent 025d6dc
commit 79565a8
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 4 deletions.
diff --git a/trunk/build/guess b/trunk/build/guess
diff --git a/trunk/build/submit.sh b/trunk/build/submit.sh
@@ -6,7 +6,7 @@
 # /home/lucia/lpjguess/code/trunk/build/guess
 # as a parallel job using SLURM on Simba2. Based on Aurora.tmpl.
 #
-# Created automatically on Mo 28. Feb 16:36:55 CET 2022
+# Created automatically on Mo 28. Mär 14:11:26 CEST 2022
 # 
 # Usage: 
 #

diff --git a/trunk/framework/framework.cpp b/trunk/framework/framework.cpp
@@ -29,6 +29,7 @@
 #include "soilmethane.h"
 
 #include <memory>
+#include <iostream>
 
 /// Prints the date and time together with the name of this simulation
 void print_logfile_heading() {
@@ -141,7 +142,8 @@ void simulate_day(Gridcell& gridcell, InputModule* input_module) {
 		crop_rotation(stand);
 
 		if (date.islastday && date.islastmonth) {
-			// LAST DAY OF YEAR
+
+            // LAST DAY OF YEAR
 			stand.firstobj();
 			while (stand.isobj) {
 

diff --git a/trunk/modules/vegdynam.cpp b/trunk/modules/vegdynam.cpp
@@ -31,6 +31,7 @@
 #include "vegdynam.h"
 #include "growth.h"
 #include "driver.h"
+#include <iostream>
 
 
 /// Upper LAI limit for wetland species. No limit: 0 //TODO remove this after daily allocation.
@@ -1498,7 +1499,10 @@ void disturbance(Patch& patch, double disturb_prob) {
 		patch.age = 0;
 	}
 
-	else patch.disturbed = false;
+	else {
+        patch.disturbed = false;
+    }
+
 }
 
 

diff --git a/trunk/modules/vegstructoutput.cpp b/trunk/modules/vegstructoutput.cpp
@@ -116,7 +116,7 @@ namespace GuessOutput {
                      full_path.c_str());
             } else {
                 dprintf("dummy\n");
-                fprintf(out_vegstruct_patch, "Lon Lat Year SID PID PFT cmass lai lai1 lai2 lai3 lai4 lai5 lai6 lai7 lai8 lai9 lai10 lai11 lai12 dens\n");
+                fprintf(out_vegstruct_patch, "Lon Lat Year SID PID PFT cmass lai lai1 lai2 lai3 lai4 lai5 lai6 lai7 lai8 lai9 lai10 lai11 lai12 dens dhist\n");
             }
         }
     }
@@ -214,6 +214,21 @@ namespace GuessOutput {
                                     fprintf(out_vegstruct_patch, " %6.2f", mlai[m]);
                                 }
                                 fprintf(out_vegstruct_patch, " %6.2f ", patchpft_dens);
+                                fprintf(out_vegstruct_patch, " %i", patch.disturbed);
+                                fprintf(out_vegstruct_patch, "\n");
+                            }
+                            else if (patch.disturbed){ //Make sure disturbance years are printed out even tho biomass is zero
+                                fprintf(out_vegstruct_patch, "%7.2f %6.2f %4i ", lon, lat, date.get_calendar_year() );
+                                fprintf(out_vegstruct_patch, " %i ",    stand.id);
+                                fprintf(out_vegstruct_patch, " %i ",    patch.id);
+                                fprintf(out_vegstruct_patch, " %10s", (char*) pft.name);
+                                fprintf(out_vegstruct_patch, " %6.2f ", patchpft_cmass);
+                                fprintf(out_vegstruct_patch, " %6.2f", patchpft_lai);
+                                for (m=0;m<12;m++) {
+                                    fprintf(out_vegstruct_patch, " %6.2f", mlai[m]);
+                                }
+                                fprintf(out_vegstruct_patch, " %6.2f ", patchpft_dens);
+                                fprintf(out_vegstruct_patch, " %i", patch.disturbed);
                                 fprintf(out_vegstruct_patch, "\n");
                             }