-
Notifications
You must be signed in to change notification settings - Fork 371
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
Update ELM in the definition of multiple V3 compsets #6108
Conversation
Defines a new long compset for ELM that includes BGC and TOP solar parameterization.
The following compsets is updated to change ELM's SP mode to active BGC with TOP solar parameterization: - F1850 - F20TR - F2010 - WCYCL1850_chemUCI-Linozv3 - WCYCL1850_chemUCI-Linozv3-mam5 - WCYCL20TR_chemUCI-Linozv3-mam5 - WCYCL1850-4xCO2 - WCYCL1850 - WCYCL1850-1pctCO2 - WCYCL20TR
|
Aren't these climate changing (if you were running master with SPBC ) ? |
Make sure user e3sm_integration runs with these changes BEFORE merging to next. |
@bishtgautam , the config changes introduced in this PR would become incompatible with master for some compsets (e.g., F2010). This would cause many tests to fail during setup stage, if merging the PR to next, or rebasing it with master. A test like Look like certain recent land PRs in master have not accounted for F2010 with the intended ELM config opts. Note that the problem does not exist with this PR branch itself, which was based off an older master. |
@bbye see above. If FAN is not on, then the buildnamelist should not even try to set stream_year_first_fan should it? |
In ELMBuildNamelist.pm, add_default indeed is inside |
It shouldn't set the fan stream if fan isn't used, and this worked with the original PR, but I think the problem is in the namelist_default.xml file where the fan_stream is set in lines 730-766. I think changing the use_cn condition to a use_fan condition will resolve this issue. I have a commit to test this in my branch, but I don't know how to test it on the failing cases. |
@bbye , did you mean the test mentioned above? It can be created using the command as follows if doing it on pm-cpu.
|
This should be merged along with #6142 |
The following compsets are updated to change ELM mode from SP to active BGC mode with TOP solar parameterization: F1850 F20TR F2010 WCYCL1850_chemUCI-Linozv3 WCYCL1850_chemUCI-Linozv3-mam5 WCYCL20TR_chemUCI-Linozv3-mam5 WCYCL1850-4xCO2 WCYCL1850 WCYCL1850-1pctCO2 WCYCL20TR [CC] [non-BFB] but v3 critical path is already using these. [NML]
Verified master + #6108 and #6113 can BFB reproduce the current v3.LR.piControl-spinup after removing all non-IO related configuration settings in run script. Notes:
|
These compsets aren't changed. Should they be? |
There are runtime errors from ELM in the prod suite fully coupled cases. Probably because they are all using wrong finidat files?
ENDRUN: |
There are also runtime errors in the prod suite F-cases. finidat is commented out in those.
|
No I want to test the fixes. And if we can't fix the F-case fails, I'll revert this PR but will merge #6142 |
Since we're headed in to a 3-day weekend, I'm going to force-push this off next and we can try again Tuesday. |
This was reverted from next. |
The error like |
The new commits 0549495, 8fe3157, ede5796 fix the issues for the wcprod test suite and other F-cases. The wcprod test suite changes to use new v3.LR standard grid, ne30pg2_r05_IcoswISC30E3r5. wcprod test in atm_integration suite still uses bigrid ne30pg2_EC30to60E2r2. Ok for now to use the same testmod when not specifying an finidat. We can decide if to continue testing both bigrid and tri-grid for wcprod.
@bishtgautam , the default setting for
|
I compared the @rljacob I believe we are ready to re-merge this PR. |
Forgot one thing: the |
Yes @sbrus89 agreed we should update that one. We can merge this early next week. |
@rljacob Definition of |
The following compsets are updated to change ELM's mode from SP to active BGC mode with TOP solar parameterization: F1850 F20TR F2010 WCYCL1850_chemUCI-Linozv3 WCYCL1850_chemUCI-Linozv3-mam5 WCYCL20TR_chemUCI-Linozv3-mam5 WCYCL1850-4xCO2 WCYCL1850 WCYCL1850-1pctCO2 WCYCL20TR WCYCL1850NS [CC] [non-BFB] but v3 sims already using these by runscript. [NML]
merged to next |
There are 4 runtime fails on integration. All are BGC cases and all have the same error: The cases and compset longname.
|
The value of `use_top_solar_rad` is also included in the logic to create crop landunits.
Second merge of this branch. Fix 4 failing tests.
…(PR #6625) Updating CRYO compsets to v3 ELM settings Updates the ELM settings in the following compsets to the v3 settings in PR #6108: * CRYO1850 * CRYO1850-DISMF * CRYO1850-4xCO2 * CRYO1950 * CRYO1950-DISMF * CRYO20TR * CRYOSSP370 * CRYOSSP585 Adds following compsets matching the WCYCL counterparts: * CRYO1850-1pctCO2 * CRYOSSP245 [non-BFB] only for CRYO* compsets
Updating CRYO compsets to v3 ELM settings Updates the ELM settings in the following compsets to the v3 settings in PR #6108: * CRYO1850 * CRYO1850-DISMF * CRYO1850-4xCO2 * CRYO1950 * CRYO1950-DISMF * CRYO20TR * CRYOSSP370 * CRYOSSP585 Adds following compsets matching the WCYCL counterparts: * CRYO1850-1pctCO2 * CRYOSSP245 [NML] only for CRYO* compsets [non-BFB] only for CRYO* compsets
The following compsets are updated to change ELM's mode from SP to active BGC mode with TOP solar parameterization:
[CC]
[non-BFB] but v3 sims already using these by runscript.
[NML]