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

Jump to bottom

Develop -> Master (5.1.0.rc2) #908

Merged
merged 154 commits into from
Dec 14, 2021
Merged

Develop -> Master (5.1.0.rc2) #908

merged 154 commits into from
Dec 14, 2021

Conversation

jhamman
Copy link
Member

@jhamman jhamman commented Sep 28, 2020

  • closes #xxx
  • tests passed
  • new tests added
  • science test figures
  • ran uncrustify prior to final commit
  • ReleaseNotes entry

Joseph Hamman and others added 30 commits April 27, 2018 09:08
cleanup release notes for 5.1 rc1 release
8255669
@dgergel
update definitions list to include missing parameters
ec69c0e
Fixed incorrect apportioning of root fractions.
b487b10
@dgergel
update to include documentation on running uncrustify
40471c9
Merge branch 'develop' of github.com:UW-Hydro/VIC into fix/py_datetime
d7984bf
fixed datetime bug in unit tests
288927b
@dgergel
update with Joe's edits
4dc0a82
Simplification of code (removed terms that always cancel out).
7543796
Better comments.
03ba3dd
Added more comments and simplified logic.
73b30bd
Fixed accidental placement of file in wrong location.
2d0082b
Merge pull request #797 from jhamman/fix/py_datetime
ae67f1d 
Fix/py datetime
Merge branch 'develop' into feature/add_parameters_definitions
8045610
Merge branch 'develop' into fix/fix_calc_root_fraction
6d99209
Replaced explicit check on dum with call to assert_close_double().
a2fc4b4
Merge branch 'develop' into feature/add_uncrustify_developer_document…
53a99c0 
…ation
@dgergel
update global parameter defaults for full energy, number of thermal n…
31625ee 
…odes, default output variables and default output filename
@dgergel
update output defaults to include monthly and daily output
b6a25c4
@dgergel
update to specify correct caseid
ab8b5cc
@dgergel
update syntax
42741c8
@dgergel
add release notes entry and overall cleanup of CESM driver updates
46dc9e0
@bartnijssen
Merge pull request #794 from tbohn/fix/fix_calc_root_fraction
5794736 
Fixed incorrect apportioning of root fractions.
@bartnijssen
Merge branch 'develop' into feature/add_uncrustify_developer_document…
1477501 
…ation
@bartnijssen
Merge pull request #796 from dgergel/feature/add_uncrustify_developer…
ce4a77a 
…_documentation

update to include documentation on running uncrustify
@bartnijssen
Merge branch 'develop' into feature/add_parameters_definitions
6382c30
@bartnijssen
Merge pull request #791 from dgergel/feature/add_parameters_definitions
0b73218 
update definitions list to include missing parameters
@dgergel
Merge branch 'develop' of github.com:UW-Hydro/VIC into feature/update…
d4c1a79 
…_cesm_driver_global_param_defaults
@dgergel
switch back for markdown automatic numbering
dd22880
@dgergel
fix indentation error
a5aa6bd
@dgergel
update histfreq and default output vars
8c3ffec
dgergel and others added 19 commits June 13, 2019 12:50
@dgergel
ran uncrustify
ea80bef
@dgergel
add release notes entry
b35c31c
@dgergel
attempt to fix travis tests
9517746
@dgergel
fix travis tests again
2f849ed
@bartnijssen
Merge pull request #880 from dgergel/feature/update_cesm_driver_state…
63c611b 
…file_name

Feature/update cesm driver statefile name
@bartnijssen
Merge branch 'develop' into dev
72f4add
@bartnijssen
Merge pull request #854 from quasi-mod/dev
2363827 
Modify the type of seconds since midnight
@dgergel
added precip back in as default output variable for cesm driver
09a51f6
@bartnijssen
Merge pull request #893 from dgergel/feature/add_precip_cesm_default_…
2e92472 
…outputs

added precip back in as default output variable for cesm driver
@minrk
cffi headers: respect $CC if defined
a50ffef 
default behavior is unchanged, but fixes builds on e.g. conda where compilers have funky names
@minrk
cffi headers: respect $CC if defined
ec5c5a4 
default behavior is unchanged, but fixes builds on e.g. conda where compilers have funky names
Merge branch 'patch-1' of https://github.com/minrk/VIC into patch-1
5f55891
pin gcc version for cesm driver
9749335
use_cc
52a306e
cesm test to allowed failures
81a76d2
Merge pull request #894 from minrk/patch-1
7db79d6 
cffi headers: respect $CC if defined
switch to MIT License
7734516
run uncrustify
ae1c1a0
add release notes entry
ac694cd
@jhamman
Copy link
Member Author

jhamman commented Dec 9, 2021

Quick update here. We are going to release the set of changes here in the coming days. We need to resolve #917 first but once that is done, we will make the 5.1 release.

@jhamman
Copy link
Member Author

jhamman commented Dec 11, 2021

FYI - I will (finally) make this release on Monday unless I hear any further comments.

@bartnijssen
Copy link
Member

bartnijssen commented Dec 13, 2021 •
edited

In the readme or whatsnew, add:

@bartnijssen
Copy link
Member

@jhamman : Looks good - go ahead and merge and release after adding a few comments to the release notes (see previous comment)

@jhamman jhamman merged commit 04a8230 into master Dec 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@jhamman @bartnijssen @Bereket1241 @dgergel @kiritokun07 @quasi-mod @minrk