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

Icm veg #23

Merged
merged 22 commits into from
Nov 16, 2020
Merged

Icm veg #23

merged 22 commits into from
Nov 16, 2020

Conversation

josephzhang8
Copy link
Member

Inspect Nicole's changes in icm_veg

@nicolecx122
update notes
a35e46a
@nicolecx122
Merge branch 'master' of github.com:schism-dev/schism into icm_veg
acc3d9a
@nicolecx122
veg_icm frame
abb984c
@nicolecx122
boxes left for light/inundation stress + init
2eef02d
@nicolecx122
backup before adding dry_sediment_diagenesis
57fc8eb
@nicolecx122
sediment diagenesis under dry condition
9d1958e
@nicolecx122
backup for optional mortality process
3796b26
@nicolecx122
veg light interactions + renew sav whole volume unit
fd0d43d
@nicolecx122
round for check; back up for dynamic linkage
6f5d55a
@nicolecx122
Merge branch 'master' of github.com:schism-dev/schism into icm_veg
d410334
@nicolecx122
non-dynamic feedback set for multi-veg condition
2beb0ec
@nicolecx122
backup before going through diff and adding debugging outputs/msg
5da6dc0
@nicolecx122
backup test 1
551de68
@nicolecx122
backup before removing mht etc; replace morris formula with two linea…
dd8e4b7 
…r equaitons since it is universal for all locations
@nicolecx122
benchmark #2, to add veg-related process on nutrient dynamics; leave …
9a839fc 
…full dynamics loop apart after benchmark #3 with both veg+sav
@nicolecx122
benchmark#3, to fix temperal variation + spatial distribution; fixed …
8744027 
…SAV unit bug for nutrient dynamic processes + allow co-occupation
@nicolecx122
Merge branch 'master' of github.com:schism-dev/schism into icm_veg
af47f86
@nicolecx122
reset CMakeLists in WWMIII_Sept2020
67315ee
@nicolecx122
backup for benchmark #3; to modify parameters + add full feedback loop
35da4ab
@nicolecx122
Merge branch 'master' of github.com:schism-dev/schism into icm_veg
1e1a33e
@nicolecx122
benchmark #4, renewed nutrient recycle and tested equilibrium
f00cd7e
@nicolecx122
add vegetation production; modify hcan calc
8b6f308
josephzhang8
josephzhang8 commented Nov 16, 2020
View reviewed changes
Copy link
Member Author

@josephzhang8 josephzhang8 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nicole pulled from master a few time inside this branch; fortunately it did not seem to cause any conflicts.

@josephzhang8 josephzhang8 merged commit a8cd6e8 into master Nov 16, 2020
@josephzhang8 josephzhang8 deleted the icm_veg branch November 16, 2020 19:05
@josephzhang8
Copy link
Member Author

Merged Nicole's work in icm_veg into master

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
2 participants
@josephzhang8 @nicolecx122