Merge pull request #780 from dgergel/feature/fix_close_energy_bug

Feature/fix close energy bug
UW-Hydro · Mar 9, 2018 · 9fae303 · 9fae303
2 parents 69cb323 + d1a3a2c
commit 9fae303
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/vic/drivers/shared_all/src/initialize_parameters.c b/vic/drivers/shared_all/src/initialize_parameters.c
@@ -33,7 +33,6 @@ void
 initialize_parameters()
 {
     extern parameters_struct param;
-    extern option_struct     options;
     // Initialize temporary parameters
 
     // Lapse Rate
@@ -215,13 +214,12 @@ initialize_parameters()
     param.FROZEN_MAXITER = 1000;
 
     // Canopy Iterations
-    if (options.CLOSE_ENERGY) {
-        // iterate to close energy balance
-        param.MAX_ITER_GRND_CANOPY = 10;
-    }
-    else {
-        param.MAX_ITER_GRND_CANOPY = 0;
-    }
+    // initialized to 10, set to 0 if
+    // options.CLOSE_ENERGY is false
+    // this allows for flexibility in
+    // changing the maximum number of
+    // iterations
+    param.MAX_ITER_GRND_CANOPY = 10;
 
     // Newton-Raphson solver parameters
     param.NEWT_RAPH_MAXTRIAL = 150;

diff --git a/vic/drivers/shared_image/src/vic_init.c b/vic/drivers/shared_image/src/vic_init.c
@@ -1563,6 +1563,12 @@ vic_init(void)
         initialize_energy(all_vars[i].energy, nveg);
     }
 
+    // Canopy Iterations
+    if (!options.CLOSE_ENERGY) {
+        // do not iterate to close energy balance
+        param.MAX_ITER_GRND_CANOPY = 0;
+    }
+
     // set state metadata structure
     set_state_meta_data_info();