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

two-stream finidat type restart fixes #1286

Closed
wants to merge 25 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
ee5ef88
adding land use parameters to file: grazing, PFT max canopy coverage
ckoven May 2, 2023
bc633e2
Merge branch 'luh2' into grazing
ckoven Jul 6, 2023
dbd692d
starting to add grazing parameterization
ckoven Jul 10, 2023
580df9e
more grazing updates
ckoven Jul 11, 2023
c62e98d
Merge branch 'luh2' into grazing_merge
ckoven Aug 14, 2023
cab4ee7
merged luh2 and resolved conflicts
ckoven Sep 18, 2023
cb5ea6d
fixed merged conflict
ckoven Sep 18, 2023
dcbf787
Merge branch 'luh2' into grazing_merge
ckoven Sep 19, 2023
2b36e09
Merge branch 'luh2' into grazing_merge
ckoven Oct 5, 2023
9e035dd
Merge branch 'luh2' into grazing_merge
ckoven Oct 16, 2023
3f755f0
merged main and resolved conflicts
ckoven Dec 19, 2023
4e818e8
changed hite to height
ckoven Dec 19, 2023
b67019d
changed grazing rate to 4%/day
ckoven Dec 19, 2023
53a6a44
merged main and resolved conflicts
ckoven Jul 19, 2024
636e003
read the grazing parameters
ckoven Jul 19, 2024
391d6e9
merged Rosie's file manual_nocomp_calibration__16july.cdl into fates_…
ckoven Jul 23, 2024
2b87e44
set all grazing_rate parameters to zero
ckoven Jul 24, 2024
b994519
Merge branch 'params_sp_nocomp_calibr' into grazing_paramcalib_merge
ckoven Jul 24, 2024
c039964
compile-time bugfixes
ckoven Jul 25, 2024
034f214
Merge branch 'grazing_merge' into grazing_paramcalib_merge
ckoven Jul 25, 2024
ed007e3
setting nclmax=3
ckoven Jul 25, 2024
ececdb5
changed order of promotion loop
ckoven Jul 26, 2024
ec6008e
added check for area gt 1
ckoven Jul 26, 2024
94fc5b1
two-stream restart bug fixes
rgknox Sep 7, 2024
298c6af
bug fix on allocating temp rad structures
rgknox Sep 9, 2024
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
Prev Previous commit
Next Next commit
Merge branch 'luh2' into grazing_merge
  • Loading branch information
ckoven committed Oct 16, 2023
commit 9e035dd296ce8383648227c3f2350b087e7118f3

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.