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.

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 CIME to cime5.3 #1413

Merged
merged 7,274 commits into from
Apr 19, 2017
Merged

Update CIME to cime5.3 #1413

merged 7,274 commits into from
Apr 19, 2017

Conversation

agsalin
Copy link
Member

@agsalin agsalin commented Apr 14, 2017

Update ACME to use CIME 5.3.x up to ESMCI hash 6156e0a from Thursday 4/13.

scripts_regression_tests and acme_developer tests pass on penn workstation.

This CIME change involves a large cosmetic change in CIME. Several directories have been renamed.

  • The main interface to CIME, the scripts dir remains unchanged.
  • cime/cime_config is renamed to cime/config
  • The Fortran source code has been consolidated in src directory: externals, components, share, and drivers
  • The driver_cpl directory has been moved to src/drivers/mct to prepare for multiple coupler options
  • The share/csm_share/share directory has been renamed src/share/util.
  • The cime script infrastructure source, utils/python/CIME, has moved to scripts/lib/CIME..

Fixes #1311
Fixes #1380
Fixes #1382
Fixes #1383
Fixes #1396
Fixes #1402
Fixes #1416

[BFB]

jgfouca and others added 30 commits March 10, 2017 13:19
Fix build model message

Test suite: None (minor change)
Test baseline:
Test namelist changes:
Test status: bit for bit

Fixes #1223

User interface changes?: None

Code review: @jedwards4b @jayeshkrishna
Test suite:  scripts_regression_tests.py,
             SMS.f09_g16.B1850.yellowstone_intel.allactive-defaultio build.
Test baseline:
Test namelist changes:
Test status: bit for bit

Fixes

User interface changes?:

Code review:
Compclasses cleanup
Get rid of hard coded comp_class settings and use get_values instead.
Punting on NCR test - it's broken, was broken before this PR will open a ticket.

Test suite: scripts_regression_tests.py, hand tests of PET and PEM tests. PEM.f19_g16.F1850.yellowstone_intel
PET.f19_g16.F1850.yellowstone_intel
Test baseline:
Test namelist changes:
Test status: bit for bit

Fixes #1170

User interface changes?:

Code review: gold2718
Config cesm allactive mv
Update config_files.xml to move config/cesm/allactive to the top of CESM in config/allactive.
config/allactive is being brought in by an external in the CESM subversion checkout.

Test suite: scripts_regression_tests.py, SMS.f09_g16.B1850.yellowstone_intel.allactive-defaultio build
Test baseline:
Test namelist changes:
Test status: bit for bit

Fixes

User interface changes?:

Code review:jedwards
Add gx1v7
Adds support for gx1v7 grids for cesm. In gx1v7 (1 degree ocean) the Caspian is removed from the ocean domain and added to the land domain.

Test suite: regression testing passed
Test baseline:
Test namelist changes:
Test status: [bit for bit, roundoff, climate changing]

Fixes [CIME Github issue #]

User interface changes?: Added new aliases for resolutions supporting a gx1v7 mask (Caspian in land domain). In addition to adding a gx1v7 version of existing gx1v6 grid aliases, I also added new aliases with a mask acronym in cases where the ocean mask was undefined. For example the resolution f09_f09 has an implicit gx1v6 mask but I added two new aliases making the mask explicit.
f09_f09_mg16
f09_f09_mg17
I also added the new mapping and domain files for gx1v7.
Eventually we may deprecate the aliases with undefined ocean masks but for now I left the implicit gx1v6 versions for backwards compatibility.

Code review: Jim and Mariana
Had to break down and make a new phase for the submit phase.

More progress on consistent exception handling.
…s.xml and put error check that there are no duplicate entries in the drv drv_flds_in that have different values
remove a misleading print statement from tests
Better way to handle batch errors
Had to break down and make a new phase for the submit phase.

More progress on consistent exception handling.

Test suite: scripts_regression_tests
Test baseline:
Test namelist changes:
Test status: bit for bit

Fixes #1215

User interface changes?: New SUBMIT phase!

Code review: @jedwards4b
…ctive

Test suite: SMS.f09_g16.B1850.yellowstone_intel.allactive-defaultio
Test baseline:
Test namelist changes:
Test status: bit for bit

Fixes [CIME Github issue #]

User interface changes?:

Code review:
Update config_files.xml to point to new location for config/cesm/alla…
Setup cs.status as the first action instead of last.

When a case is completed, add a little extra text for the user so they can estimate progress
… upcoming pythonization of rtm and mosart buildnml
Improve create_test output
Setup cs.status as the first action instead of last.

When a case is completed, add a little extra text for the user so they can estimate progress

Test suite: scripts_regression_tests --fast
Test baseline:
Test namelist changes:
Test status: bit for bit

Fixes #1176

User interface changes?: cs.status produced early, minor create_test output changes

Code review: @jedwards4b
need to set RTM to NULL in both cases in order to have this work with…
Fix needed for upcoming pythonization of rtm and mosart buildnml

RTM is being used incorrectly in the ssp test - and this fix ensures that both phases of NULL.
This enables the new RTM and MOSART pythonized buildnml scripts to pass the SSP test.

Only ran the ran SSP_Ld10.f19_g16.I1850CLM45BGC.yellowstone_pgi.clm-default test. Verified that the test passed and the only differences with respect to the baseline were the RTM fields.

Test suite: None
Test baseline:
Test namelist changes:
Test status: bit for bit - except for any test using ssp.py

Fixes

User interface changes?: None

Code review:jedwards
Cannot allow resubmit to lose RUN phase info of previous run.
Couple fixes to recent PR that added SUBMIT phase.
Cannot allow resubmit to lose RUN phase info of previous run.

Test suite: by-hand
Test baseline:
Test namelist changes:
Test status: bit for bit

Fixes [CIME Github issue #]

User interface changes?: None

Code review: @jedwards4b
jgfouca added a commit that referenced this pull request Apr 16, 2017
Update ACME to use CIME 5.3.x up to ESMCI hash 6156e0a from Thursday 4/13.

scripts_regression_tests and acme_developer tests pass on penn workstation.

This CIME change involves a large cosmetic change in CIME. Several directories have been renamed.

    The main interface to CIME, the scripts dir remains unchanged.
    cime/cime_config is renamed to cime/config
    The Fortran source code has been consolidated in src directory: externals, components, share, and drivers
    The driver_cpl directory has been moved to src/drivers/mct to prepare for multiple coupler options
    The share/csm_share/share directory has been renamed src/share/util.
    The cime script infrastructure source, utils/python/CIME, has moved to scripts/lib/CIME.

@singhbalwinder : please make sure PNNL cluster merge look correct
@mfdeakin-sandia : please look at cprnc/CMakeLists.txt and also confirm no run_acme changes.

[BFB]

* agsalin/update-to-cime5.3: (5645 commits)
  Restore ACME version of shr_orb_cosz
  Fixed whitespace errors in Makefile killing COSP
  HOMME test typo fix
  Fixes to get tests to pass.
  Update ACME for new CIME directory structure
  More renaming.
  Rename ACME/cime directories in prep for CIME merge
  HOMME Improvement
  More edits to README
  Suggest a more portable usage of mktemp
  Tweak a comment
  Add comment on acme side
  Fix case for new unit_testing attribute to get_mpirun
  Allow run_tests.py to auto-determine the machine name
  fix an error
  make user-compset a seperate test
  Update license of GPTL
  Determine more unit testing defaults automatically
  readd netcdf-mpi for gnu
  add a test for --user-compset (cesm only)
  ...
@jgfouca
Copy link
Member

jgfouca commented Apr 16, 2017

This is now on next.

@rljacob
Copy link
Member

rljacob commented Apr 16, 2017

@jgfouca please add the "Fixes" for the appropriate issues.

@jgfouca jgfouca added the BFB PR leaves answers BFB label Apr 16, 2017
@singhbalwinder
Copy link
Contributor

@jgfouca : I saw your message when you merged this branch to next. Should I checkout next and ensure that it runs on PNNL clusters?

@jgfouca
Copy link
Member

jgfouca commented Apr 17, 2017

@singhbalwinder , up to you. Probably a good idea if a number of people are using PNNL machines as their primary dev platform.

@singhbalwinder
Copy link
Contributor

Ok. Thanks! I will checkout next and run a short test.

@mfdeakin-sandia
Copy link
Contributor

@agsalin The run_acme script is able to build and submit it to the queue now. Sorry for the delay in response

@rljacob rljacob changed the title Merge agsalin/update to cime5.3 Update CIME to cime5.3 Apr 17, 2017
@rljacob
Copy link
Member

rljacob commented Apr 17, 2017

Are we sure the extremely large commit number is from the directory moving? I don't want us to import the entire history of CIME.

Without this change if the stride is valid but numiotasks is
invalid, pio_numiotasks is not reset. The default value of
pio_numiotasks (-99) in component namelists is not reset
as expected.

The corresponding issue in ESMCI/cime is Issue #1372

[NML]
@jgfouca
Copy link
Member

jgfouca commented Apr 17, 2017

@rljacob the commits look legit to me (has only the CIME commits since 5.2)

@rljacob
Copy link
Member

rljacob commented Apr 18, 2017

@agsalin the tag on the ESMCI side is cime5.3.0-alpha.06-toacme01

Incorrect merging of spare nodes and aprun optimized nodes features
@jgfouca jgfouca merged commit c85b84b into master Apr 19, 2017
jgfouca added a commit that referenced this pull request Apr 19, 2017
Update CIME to cime5.3

Update ACME to use CIME 5.3.x up to ESMCI hash 6156e0a from Thursday 4/13.

scripts_regression_tests and acme_developer tests pass on penn workstation.

This CIME change involves a large cosmetic change in CIME. Several directories have been renamed.

    The main interface to CIME, the scripts dir remains unchanged.
    cime/cime_config is renamed to cime/config
    The Fortran source code has been consolidated in src directory: externals, components, share, and drivers
    The driver_cpl directory has been moved to src/drivers/mct to prepare for multiple coupler options
    The share/csm_share/share directory has been renamed src/share/util.
    The cime script infrastructure source, utils/python/CIME, has moved to scripts/lib/CIME.

@singhbalwinder : please make sure PNNL cluster merge look correct
@mfdeakin-sandia : please look at cprnc/CMakeLists.txt and also confirm no run_acme changes.

Fixes #1311
Fixes #1380
Fixes #1382
Fixes #1383
Fixes #1396
Fixes #1402
Fixes #1416

[BFB]

* agsalin/update-to-cime5.3: (5649 commits)
  Fix titan problem
  Reset invalid pio_numiotasks
  Fix merge mistake
  Re-add eca testmod, was somehow lost in big merge
  Restore ACME version of shr_orb_cosz
  Fixed whitespace errors in Makefile killing COSP
  HOMME test typo fix
  Fixes to get tests to pass.
  Update ACME for new CIME directory structure
  More renaming.
  Rename ACME/cime directories in prep for CIME merge
  HOMME Improvement
  More edits to README
  Suggest a more portable usage of mktemp
  Tweak a comment
  Add comment on acme side
  Fix case for new unit_testing attribute to get_mpirun
  Allow run_tests.py to auto-determine the machine name
  fix an error
  make user-compset a seperate test
  ...
agsalin pushed a commit that referenced this pull request May 1, 2017
Pass annual-average fields to GLC

These changes are from Mariana Vertenstein (primarily) and myself

Until now, the CESM coupler has been sending CISM daily-average fields,
and then CISM has been averaging these fields to annual-averages in
order to do its mass balance time step using annual-average SMB (and
temperature). This has a number of problems:

(1) We could not restart mid-year, because CISM doesn't write the
    necessary partial accumulation information to its restart files.

(2) With Bill Lipscomb's new remapping (bilinear + conservation
    correction; coming soon), there were too-large corrections needed
    when doing the remapping from CLM to CISM on daily fields.

(3) This led to a discrepancy between TG and BG/IG compsets: In BG/IG,
    CISM received the annual average of remapped daily fields; in TG,
    CISM received the remapped annual average fields. The remapping is
    not a linear operation, so there would typically be differences in
    these two runs.

This tag, together with cism2_1_30, allows the coupler to make annual
averages before remapping fields to CISM. This was a bit tricky: CISM
still needs to be called once per day in order to support mid-year
restarts (CESM can only restart at a frequency when all components are
called). So now the GLC calling frequency has been separated from the
GLC averaging frequency. Then GLC/CISM is passed a flag saying whether
the inputs are currently valid; CISM only accumulates averages of the
inputs when they are valid. (In the standard case, this means that CISM
accumulates a single value each year, leaving all of the averaging up to
the coupler. But this supports the ability to still do the averaging in
CISM if this is desired - however, note that mid-year restarts won't
work in that case [CISM now aborts if you try to do a mid-year restart
in that configuration].)

This is implemented in such a way that ACME runs with MPAS-LI should be
unaffected: the default GLC_AVG_PERIOD for ACME is
'glc_coupling_period', which makes things collapse to the old behavior.

There are some mostly-unrelated changes in
src/drivers/mct/cime_config/buildnml and
src/drivers/mct/cime_config/namelist_definition_drv.xml. These use
add_default rather than set_value for the various *_cpl_dt entries,
because in general we should not be calling set_value directly. And,
since we're using add_default, we needed to add
skip_default_entry="true" to the relevant xml variables.

In CESM, this change must be coordinated with cism2_1_30 and
CESM-Development/cime_config#6

Test suite: scripts_regression_tests on yellowstone
   Also, aux_glc test suite with cism2_1_30:
   - out-of-the-box: tests pass, and bit-for-bit except for IG tests
     without test_coupling
   - with GLC_AVG_PERIOD = 'glc_coupling_period': tests pass and
     bit-for-bit, except for expected failures in tests that restart
     mid-year
Test baseline: For aux_glc tests, baseline was cism2_1_29
Test namelist changes: YES - adds new glc_avg_period
Test status: greater than roundoff-level changes for multi-year runs
   with CISM, other than TG

Fixes none

User interface changes?: new xml variable, GLC_AVG_PERIOD

Code review: Tony Craig, Jim Edwards, Rob Jacob, Matt Hoffman
jgfouca added a commit that referenced this pull request Jun 2, 2017
Update CIME to cime5.3

Update ACME to use CIME 5.3.x up to ESMCI hash 6156e0a from Thursday 4/13.

scripts_regression_tests and acme_developer tests pass on penn workstation.

This CIME change involves a large cosmetic change in CIME. Several directories have been renamed.

    The main interface to CIME, the scripts dir remains unchanged.
    cime/cime_config is renamed to cime/config
    The Fortran source code has been consolidated in src directory: externals, components, share, and drivers
    The driver_cpl directory has been moved to src/drivers/mct to prepare for multiple coupler options
    The share/csm_share/share directory has been renamed src/share/util.
    The cime script infrastructure source, utils/python/CIME, has moved to scripts/lib/CIME.

@singhbalwinder : please make sure PNNL cluster merge look correct
@mfdeakin-sandia : please look at cprnc/CMakeLists.txt and also confirm no run_acme changes.

Fixes #1311
Fixes #1380
Fixes #1382
Fixes #1383
Fixes #1396
Fixes #1402
Fixes #1416

[BFB]

* agsalin/update-to-cime5.3: (5649 commits)
  Fix titan problem
  Reset invalid pio_numiotasks
  Fix merge mistake
  Re-add eca testmod, was somehow lost in big merge
  Restore ACME version of shr_orb_cosz
  Fixed whitespace errors in Makefile killing COSP
  HOMME test typo fix
  Fixes to get tests to pass.
  Update ACME for new CIME directory structure
  More renaming.
  Rename ACME/cime directories in prep for CIME merge
  HOMME Improvement
  More edits to README
  Suggest a more portable usage of mktemp
  Tweak a comment
  Add comment on acme side
  Fix case for new unit_testing attribute to get_mpirun
  Allow run_tests.py to auto-determine the machine name
  fix an error
  make user-compset a seperate test
  ...
@jgfouca jgfouca deleted the agsalin/update-to-cime5.3 branch June 7, 2017 14:28
jgfouca added a commit that referenced this pull request Feb 27, 2018
Update CIME to cime5.3

Update ACME to use CIME 5.3.x up to ESMCI hash 6156e0a from Thursday 4/13.

scripts_regression_tests and acme_developer tests pass on penn workstation.

This CIME change involves a large cosmetic change in CIME. Several directories have been renamed.

    The main interface to CIME, the scripts dir remains unchanged.
    cime/cime_config is renamed to cime/config
    The Fortran source code has been consolidated in src directory: externals, components, share, and drivers
    The driver_cpl directory has been moved to src/drivers/mct to prepare for multiple coupler options
    The share/csm_share/share directory has been renamed src/share/util.
    The cime script infrastructure source, utils/python/CIME, has moved to scripts/lib/CIME.

@singhbalwinder : please make sure PNNL cluster merge look correct
@mfdeakin-sandia : please look at cprnc/CMakeLists.txt and also confirm no run_acme changes.

Fixes #1311
Fixes #1380
Fixes #1382
Fixes #1383
Fixes #1396
Fixes #1402
Fixes #1416

[BFB]

* agsalin/update-to-cime5.3: (5649 commits)
  Fix titan problem
  Reset invalid pio_numiotasks
  Fix merge mistake
  Re-add eca testmod, was somehow lost in big merge
  Restore ACME version of shr_orb_cosz
  Fixed whitespace errors in Makefile killing COSP
  HOMME test typo fix
  Fixes to get tests to pass.
  Update ACME for new CIME directory structure
  More renaming.
  Rename ACME/cime directories in prep for CIME merge
  HOMME Improvement
  More edits to README
  Suggest a more portable usage of mktemp
  Tweak a comment
  Add comment on acme side
  Fix case for new unit_testing attribute to get_mpirun
  Allow run_tests.py to auto-determine the machine name
  fix an error
  make user-compset a seperate test
  ...
jgfouca added a commit that referenced this pull request Mar 14, 2018
Update CIME to cime5.3

Update ACME to use CIME 5.3.x up to ESMCI hash 6156e0a from Thursday 4/13.

scripts_regression_tests and acme_developer tests pass on penn workstation.

This CIME change involves a large cosmetic change in CIME. Several directories have been renamed.

    The main interface to CIME, the scripts dir remains unchanged.
    cime/cime_config is renamed to cime/config
    The Fortran source code has been consolidated in src directory: externals, components, share, and drivers
    The driver_cpl directory has been moved to src/drivers/mct to prepare for multiple coupler options
    The share/csm_share/share directory has been renamed src/share/util.
    The cime script infrastructure source, utils/python/CIME, has moved to scripts/lib/CIME.

@singhbalwinder : please make sure PNNL cluster merge look correct
@mfdeakin-sandia : please look at cprnc/CMakeLists.txt and also confirm no run_acme changes.

Fixes #1311
Fixes #1380
Fixes #1382
Fixes #1383
Fixes #1396
Fixes #1402
Fixes #1416

[BFB]

* agsalin/update-to-cime5.3: (5649 commits)
  Fix titan problem
  Reset invalid pio_numiotasks
  Fix merge mistake
  Re-add eca testmod, was somehow lost in big merge
  Restore ACME version of shr_orb_cosz
  Fixed whitespace errors in Makefile killing COSP
  HOMME test typo fix
  Fixes to get tests to pass.
  Update ACME for new CIME directory structure
  More renaming.
  Rename ACME/cime directories in prep for CIME merge
  HOMME Improvement
  More edits to README
  Suggest a more portable usage of mktemp
  Tweak a comment
  Add comment on acme side
  Fix case for new unit_testing attribute to get_mpirun
  Allow run_tests.py to auto-determine the machine name
  fix an error
  make user-compset a seperate test
  ...
rljacob pushed a commit that referenced this pull request Apr 12, 2021
Pass annual-average fields to GLC

These changes are from Mariana Vertenstein (primarily) and myself

Until now, the CESM coupler has been sending CISM daily-average fields,
and then CISM has been averaging these fields to annual-averages in
order to do its mass balance time step using annual-average SMB (and
temperature). This has a number of problems:

(1) We could not restart mid-year, because CISM doesn't write the
    necessary partial accumulation information to its restart files.

(2) With Bill Lipscomb's new remapping (bilinear + conservation
    correction; coming soon), there were too-large corrections needed
    when doing the remapping from CLM to CISM on daily fields.

(3) This led to a discrepancy between TG and BG/IG compsets: In BG/IG,
    CISM received the annual average of remapped daily fields; in TG,
    CISM received the remapped annual average fields. The remapping is
    not a linear operation, so there would typically be differences in
    these two runs.

This tag, together with cism2_1_30, allows the coupler to make annual
averages before remapping fields to CISM. This was a bit tricky: CISM
still needs to be called once per day in order to support mid-year
restarts (CESM can only restart at a frequency when all components are
called). So now the GLC calling frequency has been separated from the
GLC averaging frequency. Then GLC/CISM is passed a flag saying whether
the inputs are currently valid; CISM only accumulates averages of the
inputs when they are valid. (In the standard case, this means that CISM
accumulates a single value each year, leaving all of the averaging up to
the coupler. But this supports the ability to still do the averaging in
CISM if this is desired - however, note that mid-year restarts won't
work in that case [CISM now aborts if you try to do a mid-year restart
in that configuration].)

This is implemented in such a way that ACME runs with MPAS-LI should be
unaffected: the default GLC_AVG_PERIOD for ACME is
'glc_coupling_period', which makes things collapse to the old behavior.

There are some mostly-unrelated changes in
src/drivers/mct/cime_config/buildnml and
src/drivers/mct/cime_config/namelist_definition_drv.xml. These use
add_default rather than set_value for the various *_cpl_dt entries,
because in general we should not be calling set_value directly. And,
since we're using add_default, we needed to add
skip_default_entry="true" to the relevant xml variables.

In CESM, this change must be coordinated with cism2_1_30 and
CESM-Development/cime_config#6

Test suite: scripts_regression_tests on yellowstone
   Also, aux_glc test suite with cism2_1_30:
   - out-of-the-box: tests pass, and bit-for-bit except for IG tests
     without test_coupling
   - with GLC_AVG_PERIOD = 'glc_coupling_period': tests pass and
     bit-for-bit, except for expected failures in tests that restart
     mid-year
Test baseline: For aux_glc tests, baseline was cism2_1_29
Test namelist changes: YES - adds new glc_avg_period
Test status: greater than roundoff-level changes for multi-year runs
   with CISM, other than TG

Fixes none

User interface changes?: new xml variable, GLC_AVG_PERIOD

Code review: Tony Craig, Jim Edwards, Rob Jacob, Matt Hoffman
rljacob pushed a commit that referenced this pull request Apr 16, 2021
Update CIME to cime5.3

Update ACME to use CIME 5.3.x up to ESMCI hash 6156e0a from Thursday 4/13.

scripts_regression_tests and acme_developer tests pass on penn workstation.

This CIME change involves a large cosmetic change in CIME. Several directories have been renamed.

    The main interface to CIME, the scripts dir remains unchanged.
    cime/cime_config is renamed to cime/config
    The Fortran source code has been consolidated in src directory: externals, components, share, and drivers
    The driver_cpl directory has been moved to src/drivers/mct to prepare for multiple coupler options
    The share/csm_share/share directory has been renamed src/share/util.
    The cime script infrastructure source, utils/python/CIME, has moved to scripts/lib/CIME.

@singhbalwinder : please make sure PNNL cluster merge look correct
@mfdeakin-sandia : please look at cprnc/CMakeLists.txt and also confirm no run_acme changes.

Fixes #1311
Fixes #1380
Fixes #1382
Fixes #1383
Fixes #1396
Fixes #1402
Fixes #1416

[BFB]

* agsalin/update-to-cime5.3: (5649 commits)
  Fix titan problem
  Reset invalid pio_numiotasks
  Fix merge mistake
  Re-add eca testmod, was somehow lost in big merge
  Restore ACME version of shr_orb_cosz
  Fixed whitespace errors in Makefile killing COSP
  HOMME test typo fix
  Fixes to get tests to pass.
  Update ACME for new CIME directory structure
  More renaming.
  Rename ACME/cime directories in prep for CIME merge
  HOMME Improvement
  More edits to README
  Suggest a more portable usage of mktemp
  Tweak a comment
  Add comment on acme side
  Fix case for new unit_testing attribute to get_mpirun
  Allow run_tests.py to auto-determine the machine name
  fix an error
  make user-compset a seperate test
  ...
rljacob pushed a commit that referenced this pull request Apr 16, 2021
Update CIME to cime5.3

Update ACME to use CIME 5.3.x up to ESMCI hash 6156e0a from Thursday 4/13.

scripts_regression_tests and acme_developer tests pass on penn workstation.

This CIME change involves a large cosmetic change in CIME. Several directories have been renamed.

    The main interface to CIME, the scripts dir remains unchanged.
    cime/cime_config is renamed to cime/config
    The Fortran source code has been consolidated in src directory: externals, components, share, and drivers
    The driver_cpl directory has been moved to src/drivers/mct to prepare for multiple coupler options
    The share/csm_share/share directory has been renamed src/share/util.
    The cime script infrastructure source, utils/python/CIME, has moved to scripts/lib/CIME.

@singhbalwinder : please make sure PNNL cluster merge look correct
@mfdeakin-sandia : please look at cprnc/CMakeLists.txt and also confirm no run_acme changes.

Fixes #1311
Fixes #1380
Fixes #1382
Fixes #1383
Fixes #1396
Fixes #1402
Fixes #1416

[BFB]

* agsalin/update-to-cime5.3: (5649 commits)
  Fix titan problem
  Reset invalid pio_numiotasks
  Fix merge mistake
  Re-add eca testmod, was somehow lost in big merge
  Restore ACME version of shr_orb_cosz
  Fixed whitespace errors in Makefile killing COSP
  HOMME test typo fix
  Fixes to get tests to pass.
  Update ACME for new CIME directory structure
  More renaming.
  Rename ACME/cime directories in prep for CIME merge
  HOMME Improvement
  More edits to README
  Suggest a more portable usage of mktemp
  Tweak a comment
  Add comment on acme side
  Fix case for new unit_testing attribute to get_mpirun
  Allow run_tests.py to auto-determine the machine name
  fix an error
  make user-compset a seperate test
  ...
rljacob pushed a commit that referenced this pull request May 6, 2021
Update CIME to cime5.3

Update ACME to use CIME 5.3.x up to ESMCI hash 9802d59 from Thursday 4/13.

scripts_regression_tests and acme_developer tests pass on penn workstation.

This CIME change involves a large cosmetic change in CIME. Several directories have been renamed.

    The main interface to CIME, the scripts dir remains unchanged.
    cime/cime_config is renamed to cime/config
    The Fortran source code has been consolidated in src directory: externals, components, share, and drivers
    The driver_cpl directory has been moved to src/drivers/mct to prepare for multiple coupler options
    The share/csm_share/share directory has been renamed src/share/util.
    The cime script infrastructure source, utils/python/CIME, has moved to scripts/lib/CIME.

@singhbalwinder : please make sure PNNL cluster merge look correct
@mfdeakin-sandia : please look at cprnc/CMakeLists.txt and also confirm no run_acme changes.

Fixes #1311
Fixes #1380
Fixes #1382
Fixes #1383
Fixes #1396
Fixes #1402
Fixes #1416

[BFB]

* agsalin/update-to-cime5.3: (5649 commits)
  Fix titan problem
  Reset invalid pio_numiotasks
  Fix merge mistake
  Re-add eca testmod, was somehow lost in big merge
  Restore ACME version of shr_orb_cosz
  Fixed whitespace errors in Makefile killing COSP
  HOMME test typo fix
  Fixes to get tests to pass.
  Update ACME for new CIME directory structure
  More renaming.
  Rename ACME/cime directories in prep for CIME merge
  HOMME Improvement
  More edits to README
  Suggest a more portable usage of mktemp
  Tweak a comment
  Add comment on acme side
  Fix case for new unit_testing attribute to get_mpirun
  Allow run_tests.py to auto-determine the machine name
  fix an error
  make user-compset a seperate test
  ...
rljacob pushed a commit that referenced this pull request May 6, 2021
Update CIME to cime5.3

Update ACME to use CIME 5.3.x up to ESMCI hash 9802d59 from Thursday 4/13.

scripts_regression_tests and acme_developer tests pass on penn workstation.

This CIME change involves a large cosmetic change in CIME. Several directories have been renamed.

    The main interface to CIME, the scripts dir remains unchanged.
    cime/cime_config is renamed to cime/config
    The Fortran source code has been consolidated in src directory: externals, components, share, and drivers
    The driver_cpl directory has been moved to src/drivers/mct to prepare for multiple coupler options
    The share/csm_share/share directory has been renamed src/share/util.
    The cime script infrastructure source, utils/python/CIME, has moved to scripts/lib/CIME.

@singhbalwinder : please make sure PNNL cluster merge look correct
@mfdeakin-sandia : please look at cprnc/CMakeLists.txt and also confirm no run_acme changes.

Fixes #1311
Fixes #1380
Fixes #1382
Fixes #1383
Fixes #1396
Fixes #1402
Fixes #1416

[BFB]

* agsalin/update-to-cime5.3: (5649 commits)
  Fix titan problem
  Reset invalid pio_numiotasks
  Fix merge mistake
  Re-add eca testmod, was somehow lost in big merge
  Restore ACME version of shr_orb_cosz
  Fixed whitespace errors in Makefile killing COSP
  HOMME test typo fix
  Fixes to get tests to pass.
  Update ACME for new CIME directory structure
  More renaming.
  Rename ACME/cime directories in prep for CIME merge
  HOMME Improvement
  More edits to README
  Suggest a more portable usage of mktemp
  Tweak a comment
  Add comment on acme side
  Fix case for new unit_testing attribute to get_mpirun
  Allow run_tests.py to auto-determine the machine name
  fix an error
  make user-compset a seperate test
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
BFB PR leaves answers BFB CIME
Projects
None yet
Development

Successfully merging this pull request may close these issues.