Closed mvertens closed 11 months ago
@rosiealice @mvdebolskiy - I'd like to get these changes back in a NorESM tag soon. Are you okay with my changes?
Probably needs a smoke test here (I1850) and in the NorESM repo (B1850), just so when it goes to ESCOMP it will take less time to get accepted.
I have verified that the following command now generates and runs the following tests ran: ./create_test --xml-category aux_clm_noresm --xml-mach betzy --project nn9560k
ERS_D_Ld15.f45_f45_mg37.I2000Clm50FatesRs.betzy_intel.clm-FatesColdTreeDamage (Overall: PASS) details:
ERS_D_Ld3_PS.f09_g17.I2000Clm50FatesRs.betzy_intel.clm-FatesCold (Overall: PASS) details:
ERS_Lm13.f45_f45_mg37.I2000Clm50Fates.betzy_intel.clm-FatesColdNoComp (Overall: FAIL) details:
FAIL ERS_Lm13.f45_f45_mg37.I2000Clm50Fates.betzy_intel.clm-FatesColdNoComp COMPARE_base_rest
SMS.f45_f45_mg37.I2000Clm51FatesSpRsGs.betzy_intel.clm-FatesColdSatPhen (Overall: PASS) details:
But the bad news is that the I2000CLM50Fates with the FatesColdNoComp fails restart.
@mvdebolskiy - can we go ahead and merge this in - knowing that there is an outstanding restart test failure. That way we can get this updated code in a new noresm development snapshot that I am creating.
@mvdebolskiy - thank you! Is there an updated tag for this?
Thanks for the tag!
Description of changes
Changes to get FATES-NOCOMP working with CAM6
Specific notes
This PR creates a new compset attribute for CTSM (e.g. CTSM5.1%FATES-NOCOMP) that turns on no competition mode for FATES and also provides fixes for CTSM that enable FATES to run with CAM6 out of the box.
Contributors other than yourself, if any: @rosiealice
CTSM Issues Fixed: None
Are answers expected to change (and if so in what way)? No
Any User Interface Changes (namelist or namelist defaults changes)? New compset attribute %FATES-NOCOMP that turns on user_fates_nocomp to .true.
Testing performed, if any: Demonstrated that the following compset ran successfully on betzy: --compset 1850_CAM60_CLM51%FATES-NOCOMP_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV --res f19_f19_mg17