Skip to content

Updating rjs80 to RobTest5 #7

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

Open
RobTest5 wants to merge 35 commits into
base: master
Choose a base branch
from
Open

Updating rjs80 to RobTest5 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
f7d53b9
Merge pull request #8 from rjs80/working
rjs80 Sep 12, 2014
2d60261
Merge pull request #10 from rjs80/working
rjs80 Sep 19, 2014
0cdd563
Merge pull request #11 from rjs80/working
rjs80 Sep 19, 2014
d75b053
Merge pull request #12 from RobTest5/master
rjs80 Oct 1, 2014
1bf7f5d
Several Major Changes:
Oct 1, 2014
e801276
2017 Massive Update
rjs80 Jan 19, 2017
c23403f
2017 minor Update
rjs80 Jan 19, 2017
87c6c0d
2017 Massive Update2
rjs80 Jan 19, 2017
0ec4f0c
2017 Big Update
rjs80 Jan 19, 2017
edfbbdd
2017 Big Update2
rjs80 Jan 19, 2017
66ef9b5
Manually corrected merge errors in MDWaterBalance.c, Makefile, and ob…
rjs80 Jan 31, 2017
0aab452
Merge branch 'working'
rjs80 Jan 31, 2017
fc830cb
Wil's update to at-a-site w,d,s
rjs80 Jan 31, 2017
0d0ca4f
Merge branch 'working' of https://github.com/rjs80/WBMplus into working
rjs80 Jan 31, 2017
b89e98c
Merge branch 'working'
rjs80 Jan 31, 2017
424f68e
Many changes having to do with water balance and operational flags
Jan 31, 2017
ce5505e
Stragler from the water balance commit
Jan 31, 2017
cce4796
Several changes to water temperature functionality (inline with rjs80)
Jan 31, 2017
e4b1745
EPSCoR changes to nitrogen functioning
Jan 31, 2017
83dbfb8
EPSCoR chloride mass model
Jan 31, 2017
da94e81
merging conflicts working to master
Jan 31, 2017
97bc3fc
quick fix to MDChloride.c
rjs80 Feb 1, 2017
fd513c1
update MD.h to merge with rjs80 / master
Feb 1, 2017
2e3a81a
merge conflict resolution Rob Scaler + Shan EPSCoR
Feb 1, 2017
5b5a3e1
Uncommitted updates from the merge
Feb 3, 2017
576d6a5
Changes for code merger with rjs80
Feb 14, 2017
c637f99
Merge pull request #17 from soggyheron/master
rjs80 Feb 23, 2017
6e3828d
Added function for externally calculated deicer input
Feb 24, 2017
3053285
Corrected depth calculation in river width
soggyheron Feb 24, 2017
e43d6f5
embedded coefficient calculation into river width
soggyheron Feb 28, 2017
13842ed
Further updates to deicer loading and MIMT transport
soggyheron Mar 28, 2017
ff79dbc
update river velocity calculation
soggyheron Mar 28, 2017
84513f2
Merge branch 'deicerupdate' into velocityupdate
soggyheron Mar 28, 2017
90bc83c
Several updates that migrate bacteria, generalize river light, and cl…
soggyheron Apr 6, 2017
b771414
Merge pull request #18 from soggyheron/master
rjs80 Apr 6, 2017
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
81 changes: 0 additions & 81 deletions .gitignore
View file
Open in desktop

This file was deleted.

466 changes: 437 additions & 29 deletions include/MD.h
100644 → 100755
View file
Open in desktop

Large diffs are not rendered by default.

75 changes: 0 additions & 75 deletions nbproject/Package-Default.bash
View file
Open in desktop

This file was deleted.

Loading