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

Develop -> Master (5.1.0.rc2) #908

Merged
merged 154 commits into from
Dec 14, 2021
+1,086 −5,634
Merged

Develop -> Master (5.1.0.rc2) #908

Changes from 2 commits
Commits
Show all changes
154 commits
Select commit Hold shift + click to select a range
8255669
cleanup release notes for 5.1 rc1 release
Apr 27, 2018
ec69c0e
update definitions list to include missing parameters
dgergel May 18, 2018
b487b10
Fixed incorrect apportioning of root fractions.
May 21, 2018
40471c9
update to include documentation on running uncrustify
dgergel May 22, 2018
d7984bf
Merge branch 'develop' of github.com:UW-Hydro/VIC into fix/py_datetime
May 22, 2018
288927b
fixed datetime bug in unit tests
May 22, 2018
4dc0a82
update with Joe's edits
dgergel May 22, 2018
7543796
Simplification of code (removed terms that always cancel out).
May 22, 2018
03ba3dd
Better comments.
May 22, 2018
73b30bd
Added more comments and simplified logic.
May 23, 2018
2d0082b
Fixed accidental placement of file in wrong location.
May 23, 2018
ae67f1d
Merge pull request #797 from jhamman/fix/py_datetime
May 23, 2018
8045610
Merge branch 'develop' into feature/add_parameters_definitions
May 23, 2018
6d99209
Merge branch 'develop' into fix/fix_calc_root_fraction
May 23, 2018
a2fc4b4
Replaced explicit check on dum with call to assert_close_double().
May 23, 2018
53a99c0
Merge branch 'develop' into feature/add_uncrustify_developer_document…
May 23, 2018
31625ee
update global parameter defaults for full energy, number of thermal n…
dgergel May 23, 2018
b6a25c4
update output defaults to include monthly and daily output
dgergel May 24, 2018
ab8b5cc
update to specify correct caseid
dgergel May 24, 2018
42741c8
update syntax
dgergel May 24, 2018
46dc9e0
add release notes entry and overall cleanup of CESM driver updates
dgergel May 24, 2018
5794736
Merge pull request #794 from tbohn/fix/fix_calc_root_fraction
bartnijssen May 31, 2018
1477501
Merge branch 'develop' into feature/add_uncrustify_developer_document…
bartnijssen May 31, 2018
ce4a77a
Merge pull request #796 from dgergel/feature/add_uncrustify_developer…
bartnijssen May 31, 2018
6382c30
Merge branch 'develop' into feature/add_parameters_definitions
bartnijssen May 31, 2018
0b73218
Merge pull request #791 from dgergel/feature/add_parameters_definitions
bartnijssen May 31, 2018
d4c1a79
Merge branch 'develop' of github.com:UW-Hydro/VIC into feature/update…
dgergel May 31, 2018
dd22880
switch back for markdown automatic numbering
dgergel May 31, 2018
a5aa6bd
fix indentation error
dgergel May 31, 2018
8c3ffec
update histfreq and default output vars
dgergel May 31, 2018
29364dc
add soil node temperature to monthly outputs
dgergel May 31, 2018
9f3a4c9
fix indentation
dgergel Aug 24, 2018
76feedb
fix indent again
dgergel Aug 24, 2018
49f6263
Merge pull request #800 from dgergel/feature/update_cesm_driver_globa…
Aug 28, 2018
0b3d406
Fixed incorrect passing of lake_con structure to vic_run() and put_da…
Sep 8, 2018
2ece8a9
Relaxed validation conditions for lake params. Validation only perfor…
Sep 8, 2018
a80a77b
add BULK_DENSITY_COMB option to global parameter file to enable readi…
dgergel Sep 10, 2018
478eef6
increment option struct items
dgergel Sep 10, 2018
52807ed
forgot to add one more file to first commit
dgergel Sep 10, 2018
363fa3d
fix syntax error
dgergel Sep 10, 2018
41b5534
remove previous change
dgergel Sep 10, 2018
e2ad02d
change param name
dgergel Sep 11, 2018
c1ba7d2
ran uncrustify
dgergel Sep 11, 2018
88db90f
remove redundant bulk density calculation from classic driver soil pa…
dgergel Sep 11, 2018
a504e11
fix travis test failure for classic driver
dgergel Sep 11, 2018
baa1ed3
update readme to allow for multiple resolutions and current machines …
dgergel Sep 13, 2018
1dd3526
update supported machines
dgergel Sep 13, 2018
e85f6a8
Merge pull request #817 from dgergel/feature/add_combined_bulk_densit…
bartnijssen Sep 13, 2018
4b836c1
Merge branch 'develop' into feature/add_resolution_to_cesm_driver_bui…
bartnijssen Sep 14, 2018
1b5ffb1
Merge pull request #819 from dgergel/feature/add_resolution_to_cesm_d…
bartnijssen Sep 14, 2018
d9df233
Fixes for fcanopy/LAI/esoil logic so that pure bare soil tiles get es…
Sep 21, 2018
003342f
add release notes entry for bulk density comb option
dgergel Sep 24, 2018
2d813a5
Moved comment to match convention.
Sep 24, 2018
d3b8913
Merge branch 'develop' into feature/add_documentation_for_bulk_densit…
bartnijssen Sep 24, 2018
36ca630
Merge pull request #824 from dgergel/feature/add_documentation_for_bu…
bartnijssen Sep 24, 2018
328568f
Merge branch 'develop' into fix/fix_esoil_fcan1
bartnijssen Sep 24, 2018
76ebfdb
Merge pull request #823 from tbohn/fix/fix_esoil_fcan1
bartnijssen Sep 25, 2018
6c1fb38
Merge branch 'develop' into fix/less_strict_lake_param_validation
Sep 26, 2018
01ecf32
Fixed bugs in lake default state and writing state file.
Sep 27, 2018
7f91eec
Made separate dimensions for static lake basin nodes and dynamic lake…
Sep 27, 2018
a4677b1
Extended NLAKENODES changes to vic_restore.c.
Sep 28, 2018
7d78e76
Updated release notes to reflect contents of this PR.
Sep 28, 2018
99fb81e
Removed Meteorological Forcing Disaggregation parameters from list of…
Sep 28, 2018
383449c
Updated release notes to include contents of this PR.
Sep 28, 2018
4972c37
Merge branch 'fix/update_docs' into fix/fix_lake_bugs
Sep 28, 2018
3574c11
Added definition of new LAKE_NODES option to global param file docume…
Sep 28, 2018
047abfb
Merge pull request #826 from tbohn/fix/fix_lake_bugs
bartnijssen Sep 28, 2018
46ffb06
Removed info about forcing disaggregation from image driver docs.
Sep 28, 2018
3adca76
Merge branch 'develop' into fix/update_docs
Sep 28, 2018
0069366
Updated release notes.
Sep 28, 2018
7cc9634
create new maximum snow albedo option
dgergel Sep 29, 2018
751e49d
add new snow albedo to solve_snow routine
dgergel Sep 29, 2018
7f459fb
Added release note for bugfix for O ET in pure bare soil tiles.
Sep 29, 2018
abe1570
additional changes to add maximum snow albedo to snow routines
dgergel Sep 29, 2018
3c5f42a
fix some bugs with the implementation and one unrelated bug in vic_re…
dgergel Sep 29, 2018
4dbe907
fix bug
dgergel Oct 1, 2018
c9e679b
ran uncrustify
dgergel Oct 1, 2018
cd081f2
add release notes entry
dgergel Oct 1, 2018
88be097
update organic fract option to allow for bulk density comb option
dgergel Oct 1, 2018
eb9ab6e
fix travis test
dgergel Oct 1, 2018
afd060b
ran uncrustify
dgergel Oct 1, 2018
2a41dbc
add release notes entry
dgergel Oct 1, 2018
00c2a9a
add in new namelist options
dgergel Oct 1, 2018
82f59c7
uncrustify fixes
dgergel Oct 1, 2018
528498f
Merge pull request #840 from dgergel/uncrustify_update
bartnijssen Oct 1, 2018
0462636
Fixed typo in vic_store.c that wrote wrong variable as lake soil T.
Oct 2, 2018
a69f081
Merge branch 'develop' into feature/add_maximum_snow_albedo_option
Oct 2, 2018
c868fd7
update unit test for new snow albedo to account for veg-dep albedo
dgergel Oct 2, 2018
4261b77
Merge pull request #842 from tbohn/fix/fix_lake_bugs
bartnijssen Oct 3, 2018
9d14b64
Merge branch 'develop' into feature/add_maximum_snow_albedo_option
Oct 3, 2018
c9270a6
Merge branch 'develop' into feature/update_organic_fract_option
Oct 3, 2018
b170cc3
fix travis test with future PR
dgergel Oct 3, 2018
0e84d6e
Merge pull request #835 from dgergel/feature/add_maximum_snow_albedo_…
bartnijssen Oct 3, 2018
7cc2da3
Merge branch 'develop' into feature/update_organic_fract_option
Oct 3, 2018
2b4170e
fix merge conflict in release notes
dgergel Oct 9, 2018
c41bbeb
fix merge issue
dgergel Oct 9, 2018
77133b0
Merge pull request #837 from dgergel/feature/update_organic_fract_option
bartnijssen Oct 9, 2018
26ffffb
Merge branch 'develop' into feature/add_cesm_namelist_options
bartnijssen Oct 9, 2018
b419185
Merge pull request #839 from dgergel/feature/add_cesm_namelist_options
bartnijssen Oct 9, 2018
ed066de
Eliminated unnecessary unit conversions for resid_moist etc.
Oct 24, 2018
67084bc
Fixed typo in read_soilparam.c
Oct 24, 2018
ce96f01
Fixed typo in func_surf_energy_bal.c
Oct 24, 2018
50a6ae6
Update readme.md
kiritokun07 Nov 6, 2018
c2c5300
Merge branch 'develop' into patch-2
Nov 6, 2018
9af0e29
Merge pull request #852 from kiritokun07/patch-2
Nov 6, 2018
59172f3
Modify the type of seconds since midnight and the cast type of curr_d…
quasi-mod Dec 1, 2018
eb39958
Modify uint64_t to unsigned long long
quasi-mod Dec 1, 2018
6a04532
Merge branch 'develop' into fix/update_docs
Feb 15, 2019
4cf15f1
Fixed pre-existing typo in comments.
Feb 15, 2019
3da0722
Merge branch 'develop' into feature/soil_param_units
Feb 15, 2019
fb1e028
Merge pull request #833 from tbohn/fix/update_docs
Feb 17, 2019
0355c99
Merge branch 'develop' into feature/soil_param_units
Feb 18, 2019
7caf9b7
Merge pull request #850 from tbohn/feature/soil_param_units
Mar 7, 2019
4e0ee7a
Fixed input units of resid_moist and made docs clearer.
Mar 31, 2019
0e1b34c
Merge pull request #862 from tbohn/fix/resid_moist_typo
bartnijssen Apr 19, 2019
e491048
update default outputs for upcoming rbr runs with vic5
dgergel Apr 19, 2019
45ec17a
update directory and filename for vic5 parameters
dgergel Apr 19, 2019
e55924f
add release notes entry
dgergel Apr 19, 2019
53f3521
Merge pull request #866 from dgergel/feature/update_cesm_driver_outpu…
bartnijssen Apr 19, 2019
29ed156
fix repeated output variable
dgergel Apr 22, 2019
bbabae1
Merge pull request #867 from dgergel/feature/fix_default_output_optio…
bartnijssen Apr 22, 2019
be7ff70
add support for 25km
dgergel May 3, 2019
4650218
add release notes entry
dgergel May 3, 2019
c8d617a
Merge pull request #869 from dgergel/feature/add_25km_cesm_driver_sup…
bartnijssen May 3, 2019
ef84d5c
add statefile support for 25km and 50km
May 14, 2019
b641772
remove encoding addition
May 14, 2019
8a4822f
add release notes entry
May 14, 2019
091fd35
Merge pull request #871 from dgergel/feature/add_statefile_support
bartnijssen May 14, 2019
1cf00ec
add STATENAME_CESM option to option_struct for CESM statefile naming …
Jun 13, 2019
ea80bef
ran uncrustify
dgergel Jun 13, 2019
b35c31c
add release notes entry
dgergel Jun 13, 2019
9517746
attempt to fix travis tests
dgergel Jun 13, 2019
2f849ed
fix travis tests again
dgergel Jun 13, 2019
63c611b
Merge pull request #880 from dgergel/feature/update_cesm_driver_state…
bartnijssen Jun 13, 2019
72f4add
Merge branch 'develop' into dev
bartnijssen Jun 28, 2019
2363827
Merge pull request #854 from quasi-mod/dev
bartnijssen Jun 28, 2019
09a51f6
added precip back in as default output variable for cesm driver
dgergel Sep 8, 2019
2e92472
Merge pull request #893 from dgergel/feature/add_precip_cesm_default_…
bartnijssen Sep 10, 2019
a50ffef
cffi headers: respect $CC if defined
minrk Sep 24, 2019
ec5c5a4
cffi headers: respect $CC if defined
minrk Sep 24, 2019
5f55891
Merge branch 'patch-1' of https://github.com/minrk/VIC into patch-1
Sep 27, 2019
9749335
pin gcc version for cesm driver
Sep 27, 2019
52a306e
use_cc
Sep 27, 2019
81a76d2
cesm test to allowed failures
Sep 27, 2019
7db79d6
Merge pull request #894 from minrk/patch-1
Sep 27, 2019
7734516
switch to MIT License
Dec 9, 2021
ae1c1a0
run uncrustify
Dec 9, 2021
ac694cd
add release notes entry
Dec 9, 2021
50b7f38
disable travis-ci
Dec 11, 2021
110bc27
remove travis badges
Dec 11, 2021
e0c1520
Merge pull request #917 from jhamman/change-license
Dec 11, 2021
f333560
Merge branch 'develop' into disable-travis
Dec 11, 2021
95e0915
Merge pull request #918 from jhamman/disable-travis
Dec 11, 2021
7670905
update documentation in prep for release
Dec 14, 2021
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
1 change: 1 addition & 0 deletions vic/drivers/cesm/bld/vic.globalconfig.txt
View file
Original file line number Diff line number Diff line change
@@ -66,6 +66,7 @@ OUT_FORMAT NETCDF4_CLASSIC
HISTFREQ NMONTHS 1
OUTVAR OUT_RUNOFF
OUTVAR OUT_BASEFLOW
OUTVAR OUT_PREC
OUTVAR OUT_EVAP
OUTVAR OUT_SOIL_TEMP
OUTVAR OUT_SOIL_TNODE