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.

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

Bugfix 117 connor #218

Merged
merged 99 commits into from
Oct 18, 2019
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
b594a41
117_UnitTest_Connor:Reset branch due to undetected merge conflicts
cjb643 Jul 10, 2018
35906fd
Merge remote-tracking branch 'origin/master' into Bugfix_117_Connor
cjb643 Jul 16, 2018
cb63413
Merge remote-tracking branch 'origin/master' into Bugfix_117_Connor
cjb643 Jul 17, 2018
bb6857a
Added unit tests and citations, updated documention
cjb643 Jul 23, 2018
b770b01
Updated documentation and citations.
cjb643 Jul 24, 2018
4a8479e
Updated citations and documenation for SW_Flow_lib.c and SOILWAT2.bib
cjb643 Jul 30, 2018
19447bb
Fixed error due to to SW_SWCbulk2SWPmatric comment
cjb643 Jul 30, 2018
15de375
Merge branch 'master' into Bugfix_117_Connor
Jul 31, 2018
0090f31
Updated documentaion, updated unit test for Flow_Lib.cc
cjb643 Jul 31, 2018
d03aea5
Updated tests for remove_from_soil and infiltrate_water_low functions
cjb643 Jul 31, 2018
5972db7
Merge branch 'master' into Bugfix_117_Connor
Aug 6, 2018
f86db40
Completed all requested changes
cjb643 Aug 6, 2018
eb51ec6
117_Connor: Updated requested changes
cjb643 Aug 13, 2018
e844855
FINAL Updated requested changes
cjb643 Aug 13, 2018
aba9413
Updated changes to failing tests. Aug, 20.
cjb643 Aug 20, 2018
50b3cb9
Simplified failing tests.
cjb643 Aug 20, 2018
c6d083b
Merge branch 'master' into Bugfix_117_Connor
cjb643 Aug 20, 2018
517531d
Merge branch 'master' into Bugfix_117_Connor
cjb643 Aug 20, 2018
9a0e141
Adjusted failing test from Flow_lib_temp.cc
cjb643 Aug 20, 2018
97390fe
Merge remote-tracking branch 'origin/Bugfix_117_Connor' into Bugfix_1…
cjb643 Aug 20, 2018
bf48d6c
Added Reset_SOILWAT2_after_UnitTest();
cjb643 Aug 20, 2018
341acbc
Fixed MOST suggested changes for my branch.
cjb643 Aug 29, 2018
4efed6b
Merge branch 'master' into Bugfix_117_Connor
cjb643 Oct 16, 2018
c659f9f
Added function _set_layers
cjb643 Nov 27, 2018
7605fd6
Files needed for _set_layers function.
cjb643 Dec 20, 2018
9758094
Fixes to function `_set_layers`
dschlaep Dec 21, 2018
4889130
Make some fixes to `SW_Flow_Lib` unit tests
dschlaep Dec 21, 2018
1e42590
Merge branch 'master' into Bugfix_117_Connor
cjb643 Dec 21, 2018
1d29f1d
Merge remote-tracking branch 'origin/Bugfix_117_Connor' into Bugfix_1…
cjb643 Dec 21, 2018
4606206
Added unit test for transp_weighted avg function
cjb643 Dec 21, 2018
393383b
Test pot_soil_evap
cjb643 Mar 5, 2019
82fe84c
Added unit testing for remove_from_soil
cjb643 Apr 2, 2019
2d1cead
Added unit tests for hydraulic_redistribution function
cjb643 Apr 18, 2019
da9251c
Updated unit test for function infiltrate_water_low
cjb643 Apr 25, 2019
1173f8e
Updated unit test for pot_soil_evap
cjb643 Apr 25, 2019
bc06d48
Merge branch 'master' into Bugfix_117_Connor
cjb643 Apr 30, 2019
48bc633
Revert "Updated unit test for pot_soil_evap"
cjb643 Apr 25, 2019
d5aaf54
Merge branch 'master' into Bugfix_117_Connor
dschlaep Apr 30, 2019
20eb681
Merging remote branch with local branch
cjb643 May 7, 2019
c8de4d6
Merge branch 'master' into Bugfix_117_Connor
cjb643 May 7, 2019
af64149
Resolved additional merge conflicts
cjb643 May 7, 2019
1b6ced6
Updated unit tests for transp_weighted_avg, pot_soil_evap, & "_bs
cjb643 May 9, 2019
4b9e343
Two tests involving pot_soil_evap, SW_Flowlib.c
cjb643 May 16, 2019
3f3fc2a
New unit tests for function `pot_soil_evap` which itself is more robust
dschlaep May 17, 2019
5d202f0
Updated unit tests for functions in test_SW_Flow_Lib.cc
cjb643 May 21, 2019
d907c44
Updated unit test pot_soil_evap_bs
cjb643 May 23, 2019
dd67a65
Updated unit tests for remove_from_soil function
cjb643 May 28, 2019
789abf3
Updated unit tests for function `remove_from_soil`
dschlaep May 29, 2019
af6a859
Harmonized use of tolerance in unit tests
dschlaep May 29, 2019
f23f190
Some linting of code `test/test_SW_Flow_Lib.cc`
dschlaep May 29, 2019
6654979
Fixed some more unit test tolerance issues
dschlaep May 29, 2019
071e07f
Fix unit tests: names of water balance checks
dschlaep May 29, 2019
fb9f6c6
Fixes edge case of `remove_from_soil`: no extractable water
dschlaep May 29, 2019
37d67e1
Revert "Fixes edge case of `remove_from_soil`: no extractable water"
dschlaep May 29, 2019
a1d9315
Revert "Fixes edge case of `remove_from_soil`: no extractable water"
dschlaep May 29, 2019
11f3656
Merge branch 'master' into Bugfix_117_Connor
dschlaep Jun 3, 2019
9587f41
Explore appveyor-ci failure to pass unit test "SWFlowTest.remove_from…
dschlaep Jun 3, 2019
3b56dfc
Hack to make appveyor-ci pass unit test "SWFlowTest.remove_from_soil"
dschlaep Jun 3, 2019
3184cd9
Merge remote-tracking branch 'origin/Bugfix_117_Connor' into Bugfix_1…
cjb643 Jun 4, 2019
c255af2
Updated unit testing for infiltrate_water_low function
cjb643 Jun 13, 2019
d3581e0
Updated unit testing for hydraulic_redistribution
cjb643 Jun 25, 2019
f272e2e
Remove duplicated code from `TEST(SWFlowTest, hydraulic_redistribution)`
dschlaep Jun 25, 2019
2cc65ed
Merge branch 'master' into Bugfix_117_Connor
dschlaep Jul 16, 2019
12a1773
Fix some doxygen warnings
dschlaep Jul 16, 2019
d3dbc5a
Fix previous commit 12a1773
dschlaep Jul 16, 2019
7354bdd
README: explain how to view documentation
dschlaep Jul 16, 2019
23b23ba
Re-organize and re-format README
dschlaep Jul 17, 2019
693cf5d
Document structures of `SW_VegProd.h` in doxygen format (#73)
dschlaep Jul 18, 2019
8d83275
Fix vegetation structure documentation
dschlaep Jul 18, 2019
687ea41
Document expected input biomass units (#265)
dschlaep Jul 18, 2019
52d92e8
Update Doxyfile to v1.8.15
dschlaep Jul 18, 2019
41bc0da
Attempt to have travis-ci check doxygen documentation
dschlaep Jul 18, 2019
e2f3bba
Fix commit 41bc0da
dschlaep Jul 18, 2019
ca5dc2d
Attempt to have run doxygen correctly on travis-ci
dschlaep Jul 24, 2019
fb3a2e4
Additional fixes to doxygen documentation
dschlaep Jul 24, 2019
6e6bf27
Add time stamp to doxygen produced html documentation
dschlaep Jul 25, 2019
cadf3a5
Add `tools/ and move scripts
dschlaep Jul 25, 2019
e299743
New script to create documentation and report warnings (disregard exc…
dschlaep Jul 25, 2019
6f6a058
Attempt to fix `tools/run_doxygen.sh` for travis-ci
dschlaep Jul 25, 2019
405e93a
Attempt to fix `tools/run_doxygen.sh` for travis-ci (part 2)
dschlaep Jul 25, 2019
c1bae18
Attempt to fix `tools/run_doxygen.sh` for travis-ci (part 3)
dschlaep Jul 25, 2019
952e100
Undo commit if travis-ci fails with this
dschlaep Jul 25, 2019
8c62513
Attempt to fix `tools/run_doxygen.sh` for travis-ci (part 4)
dschlaep Jul 25, 2019
d5812ee
Revert "Undo commit if travis-ci fails with this"
dschlaep Jul 25, 2019
f81e8f0
Add DOI badge to README
dschlaep Jul 26, 2019
9efdb97
Initial page for a user manual
dschlaep Jul 29, 2019
8a8c30b
Fix spelling/formatting of user guide
dschlaep Aug 19, 2019
92ff92a
Merge branch 'feature_soillayerswap' into Bugfix_117_Connor
dschlaep Aug 30, 2019
ab6ef02
Update `create_test_soillayers`
dschlaep Aug 30, 2019
b19bd21
Merge branch 'feature_soillayerswap' into Bugfix_117_Connor
dschlaep Aug 30, 2019
96989ae
Add input files to user manual
dschlaep Sep 4, 2019
5c4a1d2
Merge branch 'master' into Bugfix_117_Connor
dschlaep Sep 5, 2019
0c3491b
Improve documentation of input files
dschlaep Sep 12, 2019
3cca831
Improve user manual
dschlaep Oct 7, 2019
fcf3431
Update to doxygen v1.8.16
dschlaep Oct 16, 2019
6d21e1f
New make target `doc_open`
dschlaep Oct 16, 2019
8a78c25
Update README and user guide
dschlaep Oct 16, 2019
238ece3
Merge branch 'master' into Bugfix_117_Connor
dschlaep Oct 17, 2019
9321af3
Cherry picked Commit:
dschlaep Oct 17, 2019
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
Loading