Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Miscellaneous clean-up and minor fixes. #723

Merged
merged 25 commits into from
Feb 3, 2018
Merged

Miscellaneous clean-up and minor fixes. #723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
f555551
Cleanup after merging with develop, which seemed to have removed my c…
tbohn Jul 12, 2017
acb99ae
Simplified prepare_full_energy() to operate on a single instance of c…
tbohn Jul 12, 2017
ffad6a7
Removed re-formatting from uncrustify.
tbohn Jul 17, 2017
56231bf
Merge branch 'develop' into feature/clean_up_vic_run
Nov 18, 2017
8afe2bb
Changed "fcan" to "fcanopy" in vic/drivers/image/src/vic_force.c to b…
Nov 19, 2017
0d6f3f2
Fixed typo.
Dec 3, 2017
294b251
Removing MAX_VEG and MAX_BAND...
Dec 3, 2017
cf4755c
Removed MAX_VEG and MAX_BAND. Replaced arrays that were statically al…
Dec 3, 2017
eded5ae
A few more fixes.
Dec 4, 2017
52f4df6
Backed out changes to validation of bare soil tile.
Dec 6, 2017
85a77c0
Changed LAI_IN to LAI.
Dec 6, 2017
2d5e8ea
Changed "lai" to "LAI" in vic_force.c for consistency with vic_init.c.
Dec 6, 2017
19afd14
Changed LAI_IN to LAI. Updated docs to use FCANOPY instead of VEGCOVE…
Dec 18, 2017
1c59dbd
Backed out changes made to bare soil and Cv sum logic.
Dec 18, 2017
957bade
Changed LAI_IN to LAI.
Dec 18, 2017
7a0ea86
Fixed typos in docs and replaced warning with error in vic_init.c whe…
Dec 20, 2017
f9a9ccb
Fixed a couple more typos.
Dec 20, 2017
6a374db
Merge branch 'develop' into feature/clean_up_vic_run
Jan 2, 2018
9ae68af
Merge branch 'develop' into feature/clean_up_vic_run
Jan 2, 2018
7e87209
Added release notes entry.
Jan 11, 2018
9aa3ac6
Merge branch 'feature/clean_up_vic_run' of https://github.com/tbohn/V…
Jan 11, 2018
d3d5e17
Fixed bug in location of conversion from global to local LAI etc.
Jan 12, 2018
e505692
Merge branch 'develop' into feature/clean_up_vic_run
Jan 18, 2018
9131e3e
Merge branch 'develop' into feature/clean_up_vic_run
Feb 1, 2018
40bd771
Fixed problem with nans caused by location of global to local convers…
Feb 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions docs/Development/ReleaseNotes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docs/Documentation/Drivers/Classic/ForcingData.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
22 changes: 11 additions & 11 deletions docs/Documentation/Drivers/Classic/GlobalParam.md
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/Documentation/Drivers/Classic/VegLib.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`) |
Expand Down
4 changes: 2 additions & 2 deletions docs/Documentation/Drivers/Classic/VegParam.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
Loading