Upgrade cime in ACME to CIME5 #1142
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Remove ACMEs version of cime2 as it existed in the alpha.9 tag
git-subtree-dir: cime git-subtree-split: 0eb331d
Update CAM to use CIME5 and update the CIME5 config files with latest ACME changes.
Update aquap to use CIME5
Update cice to use CIME5
Update clm to use CIME5 and add additional compsets to the clm compset file.
Update mosart to use CIME5
Update mpas-cice to use CIME5 and add MPASCICE_IC_MODE to config_component.xml for mpas-cice
update mpas-o to use CIME5
update mpasli to use CIME5
Update rtm to work with CIME5
Update the build-namelist and buildnml scripts with CIME5 and alpha.9 changes. Correct user_nl names.
Bring in CIME5 changes to bld/configure cnd bld/config_files/definition.xml
Add the buildlib and buildnml scripts to rtm/cime_config
Update the mpasli build-namelist and buildnml scripts with CIME5 and alpha.9 changes.
Update the build-namelist and configure scripts for cice with CIME5 and alpha.9 changes.
Change megan default to off in CLM build namelist CIME5 is smart enought to try to turn it on everywhere which is not what is wanted. So make it "0". Also update locations of perl files. Remove glimmer from the descriptions of glacierMEC use_cases in CLM
Update mosart build-namelist for CIME5
Fix typo in mpas-o build-namelist.
Some compset names have changes in CIME5. CMPASO-NYF CMPASO_NYF MPASLI_ONLY MPASLISIA MPASLIALB_ONLY MPASLIALB
Change shr_orb_cosz calculation back to cime2 version which can be inaccurate for large values of the arugment. This change keeps CIME5 BFB with CIME2
Remove 2 duplicate entries from driver's config_component.xml that were already in the mpasli one. Also fix a map file name used in the MPAS_LISO_TEST compset
|
I've verified that this case "-compset FC5ATMMOD -res ne16_ne16 -compiler intel -mach anvil" is BFB for a 1-day run with this branch and alpha.9. |
|
A wcycle case is giving me an error message Need to fix that before pushing to next. |
|
@rljacob congrats on all the hard work. |
jgfouca
added a commit
that referenced
this pull request
Nov 14, 2016
Upgrade ACME's version of CIME from v2 to v5.1. Should be [BFB] * origin/rljacob/cime/cime5-upgrade: (22 commits) Fix 2 mpasli items in config files Change shr_orb_cosz calculation back to cime2 Change compset names in tests to match new ones Fix typo in mpas-o build-namelist Update mosart build-namelist for CIME5 Update more of CLM scripts for CIME5 More updates to cice for CIME5 More update mpasli for CIME5 More update rtm for CIME5 More update cam for CIME5 More update mpas-o and mpas-cice for CIME5 Update rtm to work with CIME5 update mpasli to use CIME5 update mpas-o to use CIME5 Update mpas-cice to use CIME5 Update mosart to use CIME5 Update clm to use CIME5 Update cice to use CIME5 Update aquap to use CIME5 Update cam to use CIME5 ...
|
OK, I pushed to next. The results of tonights testing should be interesting. |
Create the ACME CAM config_pes.xml starting with a copy of config_pesall.xml and removing the non-F-case settings.
Add mira,cetus ne30 config for F-case that was missing.
Separate file for all the coupled pe configs for ACME. ACME ones are in front, followed by old POP ones.
Add entry for coupled cases on anvil in config_pes.xml in allactive
…ACME into rljacob/cime/cime5-upgrade
Set up the ACME CLM config_pes.xml for I cases.
This isn't used in any ACME cases but add it anyway. The config_pes.xml for cice
Set up ACME MPAS-O config_pes.xml. THis is used for the pe layouts for MPAS-O only cases and MPAS ocean-sea-ice and ocean-sea-ice-land-ice cases.
A standalone CICE test, DTEST, is in our suite an needs a pe layout. Add it.
Add a config_pes.xml for mpas-cice. Only 1 generic setting (one full node).
Set up a config_pes.xml file for land-ice only cases. We have a couple of those for MPASLI SIA and MPASLI with Albany.
After checking test layouts with beta0 on anvil, update clm, mpas-o and allactive config_pes.xml to match old pe-layouts
Stop referencing config_pesall.xml and instead use a separate config_pes.xml for each component. Setup is described in config_files.xml: <value component="allactive">$CIMEROOT/cime_config/$MODEL/allactive/config_pes.xml</value> <value component="drv" >$CIMEROOT/driver_cpl/cime_config/config_pes.xml</value> <value component="cam" >$SRCROOT/components/cam/cime_config/config_pes.xml</value> <value component="clm" >$SRCROOT/components/clm/cime_config/config_pes.xml</value> <value component="mpaso" >$SRCROOT/components/mpas-o/cime_config/config_pes.xml</value> <value component="mpasli" >$SRCROOT/components/mpasli/cime_config/config_pes.xml</value> <value component="mpascice" >$SRCROOT/components/mpas-cice/cime_config/config_pes.xml</value>
For now, unshare sharedlibs due to unfixed race conditions in cime-5.1. This should NOT be merged into ESMCI CIME.
openmpi-1.8 was causing segfaults in some cases.
This reverts commit f9b4bb3. Delay using multiple config_pes files. Continue to reference config_pesall.xml for all cases except X,A,S.
Test needs to run long enough for ROF to drop a restart file.
Add the new 04P2 F compsets to the CIME5 CAM config files. Also set AV1C-L to use 04P2 as in beta0.
Set CO2_PPMV value for ACME AV1C-04P2 compset
Add the EC60to30wLI, QU240wLI, and RRS30to10wLI grids, which all include ocean cavities below ice shelves in Antarctica, to the CIME5 version of config_grids.xml
Add beta0 changes to the cime5 mpas-o buildnml
Add beta0 changes to the cime5 mpas-cice buildnml
|
Now that we have all the necessary fixes for this branch to merge BFB, will close this PR and issue a new one. |
agsalin
pushed a commit
that referenced
this pull request
Apr 13, 2017
…ternal This replaces the cime/cime_config/cesm/allactive directory tree with a git external (https://github.com/CESM-Development/cime_config) in order to separate out the allactive configuration settings from CIME thus allowing quick updates to allactive compsets, pes and testmods without requiring a full update to CIME. NOTE - this change is currently planned to be included in cesm2_0_alpha06h for the SVN_EXTENALS_DIRECTORIES update. Test suite: B1850, f19_g16 2 month case and scripts_regression_tests.pye Fixes [Github issue #]: #1142 User interface changes: None Input data changes: None Code review: @fischer-ncar
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Upgrade ACME's version of CIME from v2 to v5.1.
Should be [BFB]