Merge pull request #723 from tbohn/feature/clean_up_vic_run

Miscellaneous clean-up and minor fixes.
UW-Hydro · Feb 3, 2018 · c7b369c · c7b369c
2 parents df5d1d2 + 40bd771
commit c7b369c
Show file tree

Hide file tree

Showing 34 changed files with 333 additions and 372 deletions.
diff --git a/docs/Development/ReleaseNotes.md b/docs/Development/ReleaseNotes.md
@@ -101,11 +101,11 @@ To check which release of VIC you are running:
 
 6. Cleanup of the initialization sections of the ``image`` and ``cesm`` drivers ([GH#701](https://github.com/UW-Hydro/VIC/pull/701))
 
-	Codified behavior in the initialization of the ``image`` and `cesm` drivers that requires the parameter variables `AreaFract`, `Pfactor`, `zone_fract`, and `Cv` must sum exactly to 1.0. If using the `SNOW_BAND` option, the area weighted `elevation` must match the mean grid cell elevation (`elev`). VIC will print *warnings* if any of these criteria are violated.  
+    Codified behavior in the initialization of the ``image`` and `cesm` drivers that requires the parameter variables `AreaFract`, `Pfactor`, `zone_fract`, and `Cv` must sum exactly to 1.0. If using the `SNOW_BAND` option, the area weighted `elevation` must match the mean grid cell elevation (`elev`). VIC will print *warnings* if any of these criteria are violated.  
 
 7. Added thread parallelization using OPENMP ([GH#712](https://github.com/UW-Hydro/VIC/pull/712))
 
-	The VIC image and CESM drivers now may be optionally compiled with OPENMP to enable shared memory thread parallelization. This option should improve the parallel scaling of these drivers by reducing the number of MPI messages and increasing message size.
+    The VIC image and CESM drivers now may be optionally compiled with OPENMP to enable shared memory thread parallelization. This option should improve the parallel scaling of these drivers by reducing the number of MPI messages and increasing message size.
 
 8. Added streamflow routing extensions ROUT_STUB and ROUT_RVIC for the VIC image driver ([GH#231](https://github.com/UW-Hydro/VIC/pull/231))
 
@@ -127,16 +127,12 @@ To check which release of VIC you are running:
         6. Updated names of variables and options for LAI and FCANOPY in documentation to match their new names in the code
         7. Removed constants MAX_VEG and MAX_BANDS from code; all arrays that were declared with those lengths were replaced with dynamic allocations.  This allowed for specification of veg libraries containing more classes without recompiling the code, and more efficient memory usage.
 
-    [GH#766](https://github.com/UW-Hydro/VIC/pull/766)
-
-        1. Improved logic in computing soil evaporation (esoil), primarily in func_surf_energy_bal(), by creating explicit terms for transpiration (transp) and esoil in the layer data structure.
-
 #### Bug Fixes:
 
-1.	Renamed "fcov" to "fcan" in image driver to better match variable code name ([GH#673](https://github.com/UW-Hydro/VIC/pull/673))
-
 1. NetCDF forcing files are now closed at the last timestep in stead of after the last timestep. ([GH#774](https://github.com/UW-Hydro/VIC/pull/774))
 
+2. Renamed "fcov" to "fcan" in image driver to better match variable code name ([GH#673](https://github.com/UW-Hydro/VIC/pull/673))
+
 ------------------------------
 
 ## VIC 5.0.1

diff --git a/docs/Documentation/Drivers/Classic/ForcingData.md b/docs/Documentation/Drivers/Classic/ForcingData.md
@@ -19,8 +19,8 @@ The VIC Classic Driver requires subdaily forcings (meteorological or other). For
 | Variable   | Description                                              | Units                       |
 |------------|----------------------------------------------------------|---------------------------- |
 | ALBEDO     | Surface Albedo                                           | fraction (between 0 and 1)  |
-| LAI_IN     | Leaf Area Index                                          | m<sup>2</sup>/m<sup>2</sup> |
-| VEGCOVER   | Partial veg cover fraction ( = 1 - canopy gap fraction ) | fraction (between 0 and 1)  |
+| LAI        | Leaf Area Index                                          | m<sup>2</sup>/m<sup>2</sup> |
+| FCANOPY    | Partial veg cover fraction ( = 1 - canopy gap fraction ) | fraction (between 0 and 1)  |
 
 #### Lake Forcings, Required when LAKES is TRUE:
 

diff --git a/docs/Documentation/Drivers/Classic/GlobalParam.md b/docs/Documentation/Drivers/Classic/GlobalParam.md
diff --git a/docs/Documentation/Drivers/Classic/VegLib.md b/docs/Documentation/Drivers/Classic/VegLib.md
@@ -11,7 +11,7 @@ Vegetation parameters needed for each vegetation type used in the VIC model are
 | rarc                                                              | s/m                   | 1                 | Architectural resistance of vegetation type (~2 s/m)                                                                                                                  |
 | rmin                                                              | s/m                   | 1                 | Minimum stomatal resistance of vegetation type (~100 s/m)                                                                                                             |
 | LAI                                                               | fraction              | 12                | Leaf-area index of vegetation type                                                                                                                                    |
-| VEGCOVER (Only present if VEGLIB_VEGCOVER=TRUE in [global parameter file](GlobalParam.md) | fraction              | 12                | Partial vegetation cover fraction                                                                                                                                     |
+| FCANOPY  (Only present if VEGLIB_FCAN=TRUE in [global parameter file](GlobalParam.md) | fraction              | 12                | Partial vegetation cover fraction                                                                                                                                     |
 | albedo                                                            | fraction              | 12                | Shortwave albedo for vegetation type                                                                                                                                  |
 | rough                                                             | m                     | 12                | Vegetation roughness length (typically `0.123 * vegetation height`)                                                                                                     |
 | displacement                                                      | m                     | 12                | Vegetation displacement height (typically `0.67 * vegetation height`)                                                                                                   |

diff --git a/docs/Documentation/Drivers/Classic/VegParam.md b/docs/Documentation/Drivers/Classic/VegParam.md
@@ -37,11 +37,11 @@ OPTIONAL - If VEGPARAM_LAI is TRUE in global parameter file, then for each veget
 |---------------  |---------- |-------------------------------- |
 | LAI             | fraction  | Leaf Area Index, one per month  |
 
-OPTIONAL - If VEGPARAM_VEGCOVER is TRUE in global parameter file, then for each vegetation tile, there must be a line containing the following parameters:
+OPTIONAL - If VEGPARAM_FCAN is TRUE in global parameter file, then for each vegetation tile, there must be a line containing the following parameters:
 
 | Variable Name   | Units     | Description                                       |
 |---------------  |---------- |-------------------------------------------------- |
-| VEGCOVER        | fraction  | Partial vegetation cover fraction, one per month  |
+| FCANOPY         | fraction  | Partial vegetation cover fraction, one per month  |
 
 OPTIONAL - If VEGPARAM_ALBEDO is TRUE in global parameter file, then for each vegetation tile, there must be a line containing the following parameters: