Moved VERBOSE from user_def.h to vicNl_def.h. Removed user_def.h.

Author: tbohn

src/Makefile

@@ -77,7 +77,7 @@ CFLAGS  = -I. -g -Wall -Wno-unused
 # MOST USERS DO NOT NEED TO MODIFY BELOW THIS LINE
 # -----------------------------------------------------------------------
 
-HDRS = vicNl.h vicNl_def.h global.h snow.h user_def.h mtclim_constants_vic.h mtclim_parameters_vic.h LAKE.h
+HDRS = vicNl.h vicNl_def.h global.h snow.h mtclim_constants_vic.h mtclim_parameters_vic.h LAKE.h
 
 OBJS =  CalcAerodynamic.o CalcBlowingSnow.o SnowPackEnergyBalance.o \
         StabilityCorrection.o advected_sensible_heat.o alloc_atmos.o \

src/README.txt

@@ -656,7 +656,7 @@ Cleanup of compile-time options
 	SnowPackEnergyBalance.c
 	solve_snow.c
 	surface_fluxes.c
-	user_def.h
+	user_def.h (removed)
 	vicNl_def.h
 	vicNl.c
 	vicNl.h
@@ -670,36 +670,32 @@ Cleanup of compile-time options
 
 	Cleanup of user_def.h, either by removing options/settings or moving
 	them to vicNl_def.h (becoming run-time options if appropriate).
-	Details are as follows:
-
-	* Removed the LWAVE_COR option; if the user wishes to correct any of the
-	forcing variables, the user can do this externally to VIC.
-
-	* Removed the OUTPUT_FORCE_STATS option.
-
-	* Removed the EXCESS_ICE option.
-
-	* Removed the QUICK_FS option.
+	user_def.h has been removed.
 
-	* Removed the NO_REWIND option.  All parameter files must contain the
-	same grid cells in the same order.
+	The following options were removed:
 
-	* Replaced the LOW_RES_MOIST compile-time option with LOG_MATRIC
-	run-time option.
+	* NO_REWIND.  All parameter files must contain the same grid cells in
+	  the same order.
+	* QUICK_FS.
+	* EXCESS_ICE.
+	* OUTPUT_FORCE_STATS.
+	* LWAVE_COR.  If the user wishes to correct any of the forcing
+	  variables, the user can do this externally to VIC.
 
-	* Moved CLOSE_ENERGY from compile-time to run-time options.
+	The following options were moved from compile-time to run-time (in the
+	options_struct in vicNl_def.h):
 
-	* Moved SPATIAL_SNOW from compile-time to run-time options.
+	* LOW_RES_MOIST (renamed to LOG_MATRIC)
+	* OUTPUT_FORCE
+	* CLOSE_ENERGY
+	* SPATIAL_SNOW
+	* SPATIAL_FROST
 
-	* Moved SPATIAL_FROST from compile-time to run-time options.
+	The following terms were moved to vicNl_def.h without modification:
 
-	* Moved OUTPUT_FORCE from compile-time to run-time options.
-
-	* Moved max array dimensions such as MAX_VEG, MAX_LAYERS, etc. to
-	vicNl_def.h.
-
-	* Moved other constants such as MAXIT_FE and LAI_WATER_FACTOR to
-	vicNl_def.h.
+	* VERBOSE (still a compile-time option)
+	* Max array dimensions such as MAX_VEG, MAX_LAYERS, etc.
+	* Constants such as MAXIT_FE and LAI_WATER_FACTOR
 
 
 

src/calc_snow_coverage.c

@@ -23,7 +23,7 @@ double calc_snow_coverage(int    *store_snow,
   This routine computes the current fraction of the vegetation band
   that is covered with snow.  The snow distribution is assumed to 
   be uniform with a slope based on the value of max_snow_distrib_slope
-  set in user_def.h.  The original value was based on field observations
+  set in vicNl_def.h.  The original value was based on field observations
   from the University of Minnesota's Rosemount Agricultural Experiment
   station (see dissertation by Keith Cherkauer, 2001).
 

src/cmd_proc.c

@@ -79,11 +79,13 @@ void usage(char *temp)
 
   This routine prints out usage details.
 
+  Modifications:
+  2013-Dec-28 Removed user_def.h.				TJB
 **********************************************************************/
 {
   fprintf(stderr,"Usage: %s [-v | -o | -g<global_parameter_file>]\n",temp);
   fprintf(stderr,"  v: display version information\n");
-  fprintf(stderr,"  o: display compile-time options settings (set in user_def.h)\n");
+  fprintf(stderr,"  o: display compile-time options settings (set in vicNl_def.h)\n");
   fprintf(stderr,"  g: read model parameters from <global_parameter_file>.\n");
   fprintf(stderr,"       <global_parameter_file> is a file that contains all needed model\n");
   fprintf(stderr,"       parameters as well as model option flags, and the names and\n");

src/display_current_settings.c

@@ -11,10 +11,10 @@ void display_current_settings(int                 mode,
   display_current_settings	Ted Bohn			2003
 
   This routine displays the current settings of options defined in
-  user_def.h and the global parameter file.
+  vicNl_def.h and the global parameter file.
 
   NOTE: This file must be kept in sync with any additions, removals,
-  or modifications to names of parameters in user_def.h or get_global_param.c.
+  or modifications to names of parameters in vicNl_def.h or get_global_param.c.
 
   Modifications:
   2005-03-08 Added EQUAL_AREA option.				TJB
@@ -62,6 +62,7 @@ void display_current_settings(int                 mode,
   2013-Dec-27 Removed QUICK_FS option.					TJB
   2013-Dec-27 Moved OUTPUT_FORCE to options_struct.			TJB
   2013-Dec-28 Removed NO_REWIND option.					TJB
+  2013-Dec-28 Removed user_def.h.					TJB
 **********************************************************************/
 {
 

src/get_global_param.c

@@ -111,6 +111,7 @@ global_param_struct get_global_param(filenames_struct *names,
   2013-Dec-27 Moved SPATIAL_FROST from compile-time to run-time options.TJB
   2013-Dec-27 Removed QUICK_FS option.					TJB
   2013-Dec-27 Moved OUTPUT_FORCE to options_struct.			TJB
+  2013-Dec-28 Removed user_def.h.					TJB
 **********************************************************************/
 {
   extern option_struct    options;
@@ -906,7 +907,7 @@ global_param_struct get_global_param(filenames_struct *names,
       nrerror(ErrStr);
     }
     if(options.SNOW_BAND > MAX_BANDS) {
-      sprintf(ErrStr,"Global file wants more snow bands (%d) than are defined by MAX_BANDS (%d).  Edit user_def.h and recompile.",options.SNOW_BAND,MAX_BANDS);
+      sprintf(ErrStr,"Global file wants more snow bands (%d) than are defined by MAX_BANDS (%d).  Edit vicNl_def.h and recompile.",options.SNOW_BAND,MAX_BANDS);
       nrerror(ErrStr);
     }
   }
@@ -977,11 +978,11 @@ global_param_struct get_global_param(filenames_struct *names,
     nrerror(ErrStr);
   }
   if(options.Nlayer > MAX_LAYERS) {
-    sprintf(ErrStr,"Global file wants more soil moisture layers (%d) than are defined by MAX_LAYERS (%d).  Edit user_def.h and recompile.",options.Nlayer,MAX_LAYERS);
+    sprintf(ErrStr,"Global file wants more soil moisture layers (%d) than are defined by MAX_LAYERS (%d).  Edit vicNl_def.h and recompile.",options.Nlayer,MAX_LAYERS);
     nrerror(ErrStr);
   }
   if(options.Nnode > MAX_NODES) {
-    sprintf(ErrStr,"Global file wants more soil thermal nodes (%d) than are defined by MAX_NODES (%d).  Edit user_def.h and recompile.",options.Nnode,MAX_NODES);
+    sprintf(ErrStr,"Global file wants more soil thermal nodes (%d) than are defined by MAX_NODES (%d).  Edit vicNl_def.h and recompile.",options.Nnode,MAX_NODES);
     nrerror(ErrStr);
   }
   if(!options.FULL_ENERGY && options.CLOSE_ENERGY) {

src/user_def.h

@@ -139,11 +139,14 @@
   2013-Dec-27 Moved SPATIAL_FROST to options_struct.			TJB
   2013-Dec-27 Removed QUICK_FS option.					TJB
   2013-Dec-27 Moved OUTPUT_FORCE to options_struct.			TJB
+  2013-Dec-28 Moved VERBOSE from user_def.h to vicNl_def.h; deleted
+	      user_def.h.						TJB
 *********************************************************************/
-
-#include <user_def.h>
 #include <snow.h>
 
+/***** If TRUE include all model messages to stdout, and stderr *****/
+#define VERBOSE TRUE
+
 /***** Model Constants *****/
 #define MAXSTRING    2048
 #define MINSTRING    20