Update CIME to ESMCI cime5.8.6 #3073
Merged
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
Nuopc cmeps
Allow custom run_exe and run_misc_suffix
This updates the config_machines.xsd schema to allow for a custom run_exe and misc_run_suffix, which can optionally be set inside a machine's mpirun definition. This allows, as shown in the updated E3SM config for machine anvil, to use the SLURM sbcast option which can speed up the job start time:
sbcast ${EXEROOT}/e3sm.exe /tmp/e3sm.exe; srun [ARGS] /tmp/e3sm.exe >> e3sm.log.$LID 2>&1
Note: I chose to define this inside the mpirun definition because changing the default_run_exe at the machine level would cause mpi-serial runs to be executed like:
/tmp/e3sm.exe >> e3sm.log.$LID 2>&1
instead of:
${EXEROOT}/e3sm.exe >> e3sm.log.$LID 2>&1
Test suite:
scripts_regression_tests.py on Anvil (same tests pass as before these changes)
Test baseline:
Test namelist changes:
Test status: bit for bit
Fixes #3081
User interface changes?: None
Update gh-pages html (Y/N)?: Y
Code review:jedwards
Fix ConfigParser fails with some saved submit_options
Jedwards/mergetob896c79
…tion to 5 and fix grid of F tests
dont require optional arguments
Including removing the addition of ocn_c2_glcshelf to seq_rest_read and seq_rest_write from a previous commit on this branch, now that ocn_c2_glcshelf is part of infodata.
Update CIME to ESMCI cime5.8.2-2 Squash merge of jgfouca/branch-for-to-acme-2019-05-06 Features * Nuopc update * nldas_forcing_v2: This is a regional, 0.125 degree data set over the U.S., for use in forcing CTSM. * Change DATM_CLMNCEP_YR_ALIGN for present-day compsets: Make DATM_CLMNCEP_YR_ALIGN match DATM_CLMNCEP_YR_START. This will make the model year align with the forcing year. For example, if RUN_STARTDATE is set to 2000-01-01, then the model will use year-2000 atmospheric forcing data in the first year, etc. non-BFB for any present-day compsets using datm (mostly I-cases and G-cases). Bug fix: * Fixes to NAG flags in scripts/Tools/Makefile [non-BFB] (datm)
Fix the calculation to give the best cflag value for cori-knl
University of Arizona flux scheme (Zeng et al., 1998) added alongside original version (as used in E3SMv1). UA scheme switched on by adding flux_scheme = 2 to user_nl_cpl. This follows the method of Kai Zhang for COARE scheme. Default remains the original scheme (or can specify flux_scheme = 0). This should be: [BFB] - Bit-For-Bit [FCC] - Flag Climate Changing but need to test. Files modified: cime/src/drivers/mct/cime_config/namelist_definition_drv.xml cime/src/drivers/mct/main/seq_flux_mct.F90 cime/src/drivers/mct/shr/seq_infodata_mod.F90 cime/src/share/util/shr_flux_mod.F90
…ose-theta-l Conflicts: components/homme/CMakeLists.txt components/homme/src/preqx_kokkos/CMakeLists.txt
modified: config/cesm/machines/config_compilers.xml
modified: config/cesm/machines/config_machines.xml
Now the calling routine and the subroutine itself match in argument number and type. Changes to shr_flux_mod.F90 also make the default routine more compatible with Kai's implementation. Should be: [BFB] - Bit-For-Bit [FCC] - Flag Climate Changing but still testing. Modified: cime/src/drivers/mct/main/seq_flux_mct.F90 cime/src/share/util/shr_flux_mod.F90
Updates for pleiades Update intel compiler version and ESMF lib for pleiades. Test suite: SMS_D_Ln9.f19_f19_mg16.FX2000.pleiades-has_intel (Overall: PASS) details: SMS_D_Ln9.f19_f19_mg16.FX2000.pleiades-san_intel (Overall: PASS) details: SMS_Ld1.f19_f19_mg16.FX2000.pleiades-bro_intel (Overall: PASS) details: SMS_Ld1.f19_f19_mg16.FX2000.pleiades-has_intel (Overall: PASS) details: SMS_Ld1.f19_f19_mg16.FX2000.pleiades-ivy_intel (Overall: PASS) details: SMS_Ld1.f19_f19_mg16.FX2000.pleiades-san_intel (Overall: PASS) details:
…9-06-25 Jgfouca/branch for acme split 2019 06 25 Changes: * Add UA and COARE ocean surface flux schemes (#2972) Test suite: scripts_regression_tests Test baseline: Test namelist changes: Test status: bit for bit Fixes [CIME Github issue #] User interface changes?: Update gh-pages html (Y/N)?: Code review: @jedwards4b
Caseinsensitive user_nl We were downcasing all user_nl and namelist variables but not all inputs handled by this function are case insensitive - for example ESMF runconfig files used in nuopc. So the input from namelist_definition.xml must be accepted in whatever case it is in the file and input from user_nl_* must match that input. The solution is to use a case insensitive dict type in namelist_definition.xml Test suite: scripts_regression_tests.py Test baseline: Test namelist changes: Test status: bit for bit Fixes User interface changes?: Update gh-pages html (Y/N)?: Code review: jgfouca
changes needed for nuopc/mct mom6 validation This also introduces the new grid tx0.61 Test suite: scripts_regression_tests Test baseline: no Test namelist changes: Test status: bit for bit Fixes: None User interface changes?: No Update gh-pages html (Y/N)?: N Code review:
ne120 SE grid updates. Update and add support for n120np4 and ne120pg3 cam SE grids. Test suite: scripts_regression_tests on izumi Test baseline: Test namelist changes: Test status: bit for bit Fixes [CIME Github issue #] User interface changes?: Update gh-pages html (Y/N)?: Code review:
Add support to run SE CONUS grid with mt12 mask Add domain filenames to run SE CONUS grid with mt12 mask Test suite: scripts_regression_tests on izumi, SMS_Ln9.ne0CONUSne30x8_ne0CONUSne30x8_mg17.F2000climo.cheyenne_intel Test baseline: Test namelist changes: Test status: bit for bit Fixes [CIME Github issue #] User interface changes?: Update gh-pages html (Y/N)?: Code review:
Needed to add back in the ESMF module loads for mct on cheyenne. This fixes failing WACCM-X tests. Test suite: scripts_regression_tests, SMS_Ld1.f19_f19_mg17.FXSD.cheyenne_intel.cam-outfrq1d Test baseline: Test namelist changes: Test status: bit for bit Fixes #3171 User interface changes?: Update gh-pages html (Y/N)?: Code review:
…branch-for-to-acme-2019-07-16
jgfouca
added a commit
that referenced
this pull request
Jul 16, 2019
Update CIME to ESMCI cime5.8.6 Squash merge of jgfouca/branch-for-to-acme-2019-07-16 Features: * Case insensitive user_nl * changes needed for nuopc/mct mom6 validation [BFB]
|
Squash-merged to next. |
jgfouca
added a commit
that referenced
this pull request
Jul 17, 2019
Make create_dirs more robust when multiple threads are running [BFB] * jgfouca/cime/fix_shared_exe_on_anvil: Make create_dirs more robust when multiple threads are running Update CIME to ESMCI cime5.8.6 (#3073)
rljacob
pushed a commit
that referenced
this pull request
Apr 12, 2021
Update CIME to ESMCI cime5.8.6
Squash merge of jgfouca/branch-for-to-acme-2019-07-16
Features:
* Case insensitive user_nl
* changes needed for nuopc/mct mom6 validation
[BFB]
rljacob
pushed a commit
that referenced
this pull request
Apr 21, 2021
Update CIME to ESMCI cime5.8.6
Squash merge of jgfouca/branch-for-to-acme-2019-07-16
Features:
* Case insensitive user_nl
* changes needed for nuopc/mct mom6 validation
[BFB]
jgfouca
pushed a commit
that referenced
this pull request
Nov 7, 2024
…nk-0 fix field deep copy on rank-0 fields
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.
Features:
[BFB]