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

Fates harvest offmaster deconflict #10

Merged
merged 61 commits into from
Jul 24, 2020
Merged

Fates harvest offmaster deconflict #10

merged 61 commits into from
Jul 24, 2020

Conversation

glemieux
Copy link
Collaborator

This PR pre-merges fates master to deconflict recent changes to due to FATES PR #635.

All expected tests PASS:

/glade/u/home/glemieux/scratch/clmed-tests/fates-sci.1.40.0_api.13.0.0-clm5.0.30-Cbf68b374-F4f087cf9.fates.cheyenne.intel
/glade/u/home/glemieux/scratch/clmed-tests/fates-sci.1.40.0_api.13.0.0-clm5.0.30-Cbf68b374-F4f087cf9.fates.cheyenne.gnu

Li and others added 30 commits February 5, 2020 10:54
Added Medlyn stomatal model, first pass through.
3fa3292
Added Medlyn stomatal model, first pass through.
b1ddca4
Added Medlyn stomatal model, first pass through.
786c764
@glemieux
Adding comments and whitespace
9667f26
@glemieux
adding in optimum clai calc using lapack solver call
f7265bd
@glemieux
correcting indexing error
36b14ab
@glemieux
fixing indexing error for loop summation
0796e2f
@glemieux
corrected the fractional output
e6b68b6
@glemieux
forget to fix concurrent output desc
321bdb6
@glemieux
adding logic to reduce fit to last few layers
a010cd9
@glemieux
adding more temp diagnostic ouput
1bbd129
@glemieux
adjusting temp diagnostic output
5151bf0
@glemieux
adding in calculation of opmtimum trim value based on previous value
022bb72
@slevis-lmwg
Use lightning data coming in from the CTSM
779958e
@glemieux
add in calculation for optimum laimemory
b5a608a
@glemieux
fixing endif error
40e20de
@glemieux
Merge branch 'ngeet-master' into issue-383-linearfit-trimfraction
76ec910
Add switch for choosing between Medlyn stomatal model and Ball-Berry …
0957319 
…model
update parameter file
565fd71
Update parameter file
9ce3bc5
@rgknox
Updated python allometry FUTs to py3
2d57be3
@rgknox
Merge branch 'master' into allometry-funcutests
6bf9637
Revert the parameter file
927170e
Update the parameter file
1639e58
Merge branch 'master' of https://github.com/NGEET/fates into fates_ma…
00b06c4 
…ster_medlyn
Added the logging of Medlyn model error
b51ffe0
Small fix about the logging of Medlyn model error
bf8d5f6
@rgknox
minor updates to allometry func test
f59805e
small edits on parameter description
b636984
@glemieux
removing lai_canopy_above from the optimum cumulative lai calculation
4c93dff
slevis-lmwg and others added 26 commits June 5, 2020 18:02
@slevis-lmwg
Additional conflicts resolved; revisions in response to rgknox's review
b01ba28 
Had to resolve conflicts that did not get caught by git.

Did some cleanup recommended by rgknox in Friday's meeting.
@slevis-lmwg
Merge tag 'sci.1.36.0_api.11.2.0' into lightning_v2_fates
e2aa879 
Fixed Biogeography WITH competition update
@slevis-lmwg
One-line addition for "successful igntions" mode
46a0b0f 
In successful ignitions mode want cg_strikes = 1.0
@slevis-lmwg
Correction of last commit
e90e5f4 
For "successful ignitions" cases, could not overwrite cg_strikes
directly so created new local variable for that purpose.
@Qianyuxuan
Merge pull request #1 from rgknox/fates_master_medlyn
7f84a4b 
merge medlyn changes up to master
@xuchongang
resolve a bug when relh is zero
17e1b28
@xuchongang
resolve a loop hang bug
8f2be05
@amametjanov
Cleanup IBM compiler warnings and errors
4839f41
@amametjanov
Cleanup PGI compiler warning
334195c
@rgknox
Merge pull request NGEET#608 from Qianyuxuan/fates_master_medlyn
9a4627a 
Adding Medlyn stomatal conductance model into CTSM-FATES
@glemieux
Merge pull request NGEET#656 from rgknox/allometry-funcutests
e4b344a 
Minor updates to allometry functional unit tests
@glemieux
Merge pull request NGEET#666 from amametjanov/azamat/e3sm/cleanup-cpr…
70dda4c 
…-warnings

Cleanup compiler warnings and errors
@glemieux
minor formatting changes and refactor
30ecaf7
@glemieux
adding explanatory comments to the linear fit calculation
2f726a4
@glemieux
slight clarification in notes
38a70f5
@rgknox
Merge pull request NGEET#623 from glemieux/issue-383-linearfit-trimfr…
154bd29 
…action

Canopy trimming subroutine optimization update
@glemieux
Merge pull request NGEET#665 from xuchongang/xuchongang/fire_bug_fix
68bc434 
fire-hydro bug fix
@slevis-lmwg
Updates needed for anthropogenic ignitions in FATES-SPITFIRE
d9a632c 
Changes to the lightning_v2_fates branch corresponding to the commit
that I just made on the lightning_v2_ctsm branch: 35c9b8a
@slevis-lmwg
Declare spitfire_mode values as parameters
4922302
@slevis-lmwg
Added some comments to the code
79bafc0
@slevis-lmwg
Added more comments to the code
eb85d43
@slevis-lmwg @jkshuman
Apply suggestions from code review
1f09dc8 
Thank you for these suggestions @jkshuman. I have left a few others pending for now.

Co-authored-by: jkshuman <[email protected]>
@slevis-lmwg @jkshuman
Update main/FatesInterfaceTypesMod.F90
583b1d4 
Clearer comment.

Co-authored-by: jkshuman <[email protected]>
@slevis-lmwg
Made spitfire_mode flags public for use throughout CTSM-FATES
0ad0de9
@glemieux
Merge pull request NGEET#635 from slevisconsulting/lightning_v2_fates
7ca525d 
Use lightning data coming in from the CTSM
@glemieux
Merge branch 'ngeet-master' into fates_harvest_offmaster-deconflict
4f087cf
@ckoven ckoven merged commit ffaa76e into ckoven:fates_harvest_offmaster Jul 24, 2020
ckoven pushed a commit that referenced this pull request Dec 1, 2021
@rosiealice
Merge pull request #10 from ckoven/SAI_bugfix
1ce8c80 
fix for patch%radiation_error
@glemieux glemieux deleted the fates_harvest_offmaster-deconflict branch March 21, 2022 22:28
ckoven pushed a commit that referenced this pull request May 7, 2024
@mpaiao
Merge pull request #10 from rgknox/mpaiao-pr-allom-modes-eca
37db010 
protections metadata on eca phosphatase
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.
7 participants
@glemieux @ckoven @slevis-lmwg @rgknox @Qianyuxuan @xuchongang @amametjanov