From bbf206a98be62cc5c6d8e8774ee8ed24f00af2a3 Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Tue, 15 Sep 2020 13:12:17 -0600 Subject: [PATCH 01/22] Remove out-of-date LICENSE file --- LICENSE.txt | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index 69d97201e3..0000000000 --- a/LICENSE.txt +++ /dev/null @@ -1,34 +0,0 @@ -Copyright (c) 2017, University Corporation for Atmospheric Research (UCAR) -All rights reserved. - -Developed by: - University Corporation for Atmospheric Research - National Center for Atmospheric Research - https://www2.cesm.ucar.edu/working-groups/sewg - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the "Software"), -to deal with the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom -the Software is furnished to do so, subject to the following conditions: - - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimers. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimers in the documentation - and/or other materials provided with the distribution. - - Neither the names of [Name of Development Group, UCAR], - nor the names of its contributors may be used to endorse or promote - products derived from this Software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. From 36548016bb25802bf1a6058f096702198db108d1 Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Tue, 15 Sep 2020 13:12:23 -0600 Subject: [PATCH 02/22] Rename Copyright to LICENSE.txt --- Copyright => LICENSE.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Copyright => LICENSE.txt (100%) diff --git a/Copyright b/LICENSE.txt similarity index 100% rename from Copyright rename to LICENSE.txt From 263f5f4116f8f08f01b5aa7bf76d255f64637eb5 Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Tue, 15 Sep 2020 13:47:09 -0600 Subject: [PATCH 03/22] Update documentation for CESM2.2 release --- doc/source/conf.py | 4 ++-- doc/source/downloading_cesm.rst | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 0ac55316d6..c8cb3079f5 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -64,9 +64,9 @@ # built documents. # # The short X.Y version. -version = u'Latest Development Code' +version = u'CESM2.2' # The full version, including alpha/beta/rc tags. -release = u'Latest Development Code' +release = u'CESM2.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/source/downloading_cesm.rst b/doc/source/downloading_cesm.rst index 1c7586df0f..51742f1dcd 100644 --- a/doc/source/downloading_cesm.rst +++ b/doc/source/downloading_cesm.rst @@ -25,7 +25,7 @@ code: .. code-block:: console - git clone https://github.com/ESCOMP/CESM.git my_cesm_sandbox + git clone -b release-cesm2.2.0 https://github.com/ESCOMP/CESM.git my_cesm_sandbox cd my_cesm_sandbox To checkout a previous version of CESM, first view the available versions: From 0adf46e09593f302e3ef8108f7384250b770947a Mon Sep 17 00:00:00 2001 From: Chris Fischer Date: Tue, 15 Sep 2020 16:50:57 -0600 Subject: [PATCH 04/22] Update for cesm2.2-rc01 --- ChangeLog | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ Externals.cfg | 4 ++-- 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 084f082a5b..bbfcdccb58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,51 @@ +=============================================================== +Tag name: cesm2.2.0-rc.01 +Originator(s): CSEG +Date: 15 September 2020 +One-line Summary: cesm2.2.0 release. + + +Component tags used for this CESM release candidate tag : + +components/cam https://github.com/ESCOMP/CAM/tree/cam_cesm2_2_rel_02 +components/cice https://github.com/ESCOMP/CESM_CICE5/tree/cice5_20200430 +cime https://github.com/ESMCI/cime/tree/cime5.8.32 +components/cism https://github.com/ESCOMP/CISM-wrapper/tree/cism2_1_69 +components/clm https://github.com/ESCOMP/CTSM/tree/release-cesm2.2.01 +components/fms https://github.com/ESCOMP/FMS_interface/tree/fi_20200609 +components/mom https://github.com/ESCOMP/MOM_interface/mi_20200908 +components/mosart https://github.com/ESCOMP/MOSART/tree/mosart1_0_37 +components/pop https://github.com/ESCOMP/POP2-CESM/cesm_pop_2_1_20200730 +components/rtm https://github.com/ESCOMP/RTM/tree/rtm1_0_72 +components/ww3 https://github.com/ESCOMP/WW3-CESM/tree/ww3_190710 + +cam + Cheryl Craig 2020-09-08 - cam_cesm2_2_rel_02 - components/cam (cesm2.2.0-rc.01) + https://github.com/ESCOMP/CAM/tags/cam_cesm2_2_rel_?? + + For Steve Goldhaber + + Fix failing FSCAM test with bug introduced in cam6_2_046 + + Fix FCHIST failing test + + Bug in WACCM-SE when molecular diffusion is > 0. Add an endrun so users can't run this configuration. + + + Francis Vitt 2020-07-15 - cam_cesm2_2_rel_01 - components/cam (cesm2.2.0-rc.01) + https://github.com/ESCOMP/CAM/tags/cam6_2_0?? + + Set up branch run refcases for FCnudged (and maybe FCHIST) compsets on CONUS refined grid. + + ** This is a tag on the CESM2.2 branch only + + +mom + Alper Altuntas 2020-09-10 - mi_20200908 - components/mom (cesm2.2.0-rc.01) + https://github.com/ESCOMP/MOM_interface/tags/mi_20200908 + + Update mom.input_data_list + =============================================================== Tag name: cesm2_2_beta06 Originator(s): CSEG diff --git a/Externals.cfg b/Externals.cfg index 4fbbeca456..9d67b0f729 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,5 +1,5 @@ [cam] -tag = cam_cesm2_2_rel_00 +tag = cam_cesm2_2_rel_02 protocol = git repo_url = https://github.com/ESCOMP/CAM local_path = components/cam @@ -53,7 +53,7 @@ externals = Externals_FMS.cfg required = False [mom] -tag = mi_20200826 +tag = mi_20200908 protocol = git repo_url = https://github.com/ESCOMP/MOM_interface local_path = components/mom From b57aa8d93442fb8592f13a1dfcffa4d2b0901b14 Mon Sep 17 00:00:00 2001 From: Chris Fischer Date: Wed, 23 Sep 2020 11:05:54 -0600 Subject: [PATCH 05/22] Update docs for CESM2.2 --- doc/source/cesm_configurations.rst | 39 ++++++++++++++-------------- doc/source/downloading_cesm.rst | 41 +++++++++++++++++++++++++----- doc/source/quickstart.rst | 2 +- 3 files changed, 55 insertions(+), 27 deletions(-) diff --git a/doc/source/cesm_configurations.rst b/doc/source/cesm_configurations.rst index e859914fca..b4e5583b3c 100644 --- a/doc/source/cesm_configurations.rst +++ b/doc/source/cesm_configurations.rst @@ -1,11 +1,11 @@ .. _configurations: =============================== -CESM Configurations (|version|) +CESM2 Configurations (|version|) =============================== -The CESM system can be configured a number of different ways from both -a science and technical perspective. CESM supports numerous +The CESM2 system can be configured a number of different ways from both +a science and technical perspective. CESM2 supports numerous `resolutions `_, and `component sets @@ -42,13 +42,13 @@ of several modes: "active," "data," "dead," or "stub" that permits the whole system to activate and deactive component feedbacks by allowing for a variety of "plug and play" combinations. -During the course of a CESM run, the model components integrate forward +During the course of a CESM2 run, the model components integrate forward in time, periodically exchanging information with the coupler. The coupler meanwhile receives fields from the component models, computes, maps, and merges this information, then sends the fields back to the component models. The coupler brokers this sequence of communication interchanges and manages the overall time progression of -the coupled system. A CESM component set is comprised of eight +the coupled system. A CESM2 component set is comprised of eight components: one component from each model (atm, lnd, rof, ocn, ice, glc, wav, and esp) plus the coupler. Model components are written primarily in Fortran. @@ -68,7 +68,7 @@ so ice, ocn, and glc stubs are used). The CESM2 components can be summarized as follows: -.. csv-table:: "CESM model components" +.. csv-table:: "CESM2 model components" :header: "Component Generic Type", "Component Generic Name", "Component Name", "Component Type", "Description" :widths: 12, 10, 10, 10, 60 @@ -86,6 +86,7 @@ The CESM2 components can be summarized as follows: "river", "rof", "xrof", "dead", "Used only for testing the driver/coupler" "river", "rof", "srof", "stub", "Used only to satisy the interface requirements" "ocean", "ocn", "pop", "active", "The ocean model is an extension of the `Parallel Ocean Program (POP) `_ Version 2 from Los Alamos National Laboratory (LANL)." + "ocean", "ocn", "mom6", "active", "Based on the `Modular Ocean Model version 6 `_; an early functional release is available starting in CESM2.2. Note that MOM6 is not obtained by default; for instructions on obtaining it, see https://github.com/ESCOMP/MOM_interface/wiki/Detailed-Instructions." "ocean", "ocn", "docn", "data", "The `data ocean `_ component has two distinct modes of operation. It can run as a pure data model, reading ocean SSTs (normally climatological) from input datasets, interpolating in space and time, and then passing these to the coupler. Alternatively, docn can compute updated SSTs based on a slab ocean model where bottom ocean heat flux convergence and boundary layer depths are read in and used with the atmosphere/ocean and ice/ocean fluxes obtained from the coupler." "ocean", "ocn", "xocn", "dead" "ocean", "ocn", "socn", "stub" @@ -120,7 +121,7 @@ See `supported component sets `_ for a complete list of supported compset options. Running **query_config** with the ``--compsets`` option will also provide a listing of the -supported out-of-the-box component sets for the local version of CESM. +supported out-of-the-box component sets for the local version of CESM2. CESM2 Grids @@ -128,11 +129,11 @@ CESM2 Grids The `supported grid resolutions `_ are -specified in CESM by setting an overall model resolution. Once the +specified in CESM2 by setting an overall model resolution. Once the overall model resolution is set, components will read in appropriate grid files and the coupler will read in appropriate mapping weights files. Coupler mapping weights are always generated externally in -CESM. The components will send the grid data to the coupler at +CESM2. The components will send the grid data to the coupler at initialization, and the coupler will check that the component grids are consistent with each other and with the mapping weights files. @@ -141,7 +142,7 @@ atmosphere, land, river runoff and land ice can each be on different grids. Each component determines its own unique grid decomposition based upon the total number of pes or processing elements assigned to that component. -CESM supports several types of grids out-of-the-box including single +CESM2 supports several types of grids out-of-the-box including single point, finite volume, cubed sphere, displaced pole, and tripole. These grids are used internally by the models. Input datasets are usually on the same grid but in some cases, @@ -168,13 +169,13 @@ CESM2 Machines Scripts for `supported machines `_ and -userdefined machines are provided with the CESM release. Supported -machines have machine specific files and settings added to the CESM -scripts and are machines that should run CESM cases -out-of-the-box. Machines are supported in CESM on an individual basis +userdefined machines are provided with the CESM2 release. Supported +machines have machine specific files and settings added to the CESM2 +scripts and are machines that should run CESM2 cases +out-of-the-box. Machines are supported in CESM2 on an individual basis and are usually listed by their common site-specific name. To get a -machine ported and functionally supported in CESM, local batch, run, -environment, and compiler information must be configured in the CESM +machine ported and functionally supported in CESM2, local batch, run, +environment, and compiler information must be configured in the CESM2 scripts. The machine name "userdefined" machines refer to any machine that the user defines and requires that a user edit the resulting xml files to fill in information required for the target platform. This @@ -182,11 +183,11 @@ functionality is handy in accelerating the porting process and quickly getting a case running on a new platform. For more information on porting, see the `CIME porting guide `_. The -list of available machines are documented in `CESM supported machines +list of available machines are documented in `CESM2 supported machines `_. Running **query_config** with the ``--machines`` option will also show the list of all machines for the current local version of -CESM. Supported machines have undergone the full CESM porting +CESM. Supported machines have undergone the full CESM2 porting process. The machines available in each of these categories changes as access to machines change over time. @@ -194,7 +195,7 @@ access to machines change over time. CESM2 Validation ---------------- -Although CESM can be run out-of-the-box for a variety of resolutions, +Although CESM2 can be run out-of-the-box for a variety of resolutions, component combinations, and machines, MOST combinations of component sets, resolutions, and machines have not undergone rigorous scientific climate validation. Control runs accompany `scientifically supported diff --git a/doc/source/downloading_cesm.rst b/doc/source/downloading_cesm.rst index 51742f1dcd..5dc59bc193 100644 --- a/doc/source/downloading_cesm.rst +++ b/doc/source/downloading_cesm.rst @@ -1,7 +1,7 @@ .. _downloading: ============================ -Downloading CESM (|version|) +Downloading CESM2 (|version|) ============================ Downloading the code and scripts @@ -19,7 +19,7 @@ software is at version 1.8.17. For more information or to download open source tools, visit `Subversion `_ and `git downloads `_. -With valid git and svn clients installed on the machine where CESM will be +With valid git and svn clients installed on the machine where CESM2 will be built and run, the user may download the latest version of the release code: @@ -28,13 +28,13 @@ code: git clone -b release-cesm2.2.0 https://github.com/ESCOMP/CESM.git my_cesm_sandbox cd my_cesm_sandbox -To checkout a previous version of CESM, first view the available versions: +To checkout a previous version of CESM2, first view the available versions: .. code-block:: console git tag --list 'release-cesm2*' -To checkout a specific CESM release tag type, for example CESM2.0.1: +To checkout a specific CESM2 release tag type, for example CESM2.0.1: .. code-block:: console @@ -50,7 +50,7 @@ run the **checkout_externals** script from /path/to/my_cesm_sandbox. The **checkout_externals** script will read the configuration file called ``Externals.cfg`` and will download all the external component models and CIME into /path/to/my_cesm_sandbox. -Details regarding the CESM checkout process are available in the CESM GitHub repo +Details regarding the CESM2 checkout process are available in the CESM GitHub repo `README `_ To see more details regarding the checkout_externals script from the command line, type: @@ -82,25 +82,52 @@ columns of output, as in this example: Processing externals description file : Externals.cfg Processing externals description file : Externals_CLM.cfg + Processing externals description file : ../Externals_cime.cfg Processing externals description file : Externals_POP.cfg Processing externals description file : Externals_CISM.cfg - Checking status of externals: clm, fates, ptclm, mosart, ww3, cime, cice, pop, cvmix, marbl, cism, source_cism, rtm, cam, + Processing externals description file : .gitmodules + Processing submodules description file : .gitmodules + Processing externals description file : Externals_CAM.cfg + Checking status of externals: clm, fates, ptclm, mosart, cime, cmeps, ww3, cice, fms, pop, cvmix, marbl, cism, source_cism, rtm, cdeps, fox, mom, cam, silhs, clubb, pumas, atmos_phys, cosp2, chem_proc, atmos_cubed_sphere, carma, ./cime + e-o ./cime/src/drivers/nuopc/ ./components/cam + ./components/cam/chem_proc + ./components/cam/src/atmos_phys + ./components/cam/src/dynamics/fv3/atmos_cubed_sphere + ./components/cam/src/physics/carma/base + ./components/cam/src/physics/clubb + ./components/cam/src/physics/cosp2/src + ./components/cam/src/physics/pumas + ./components/cam/src/physics/silhs + ./components/cdeps + ./components/cdeps/fox ./components/cice ./components/cism ./components/cism/source_cism ./components/clm ./components/clm/src/fates ./components/clm/tools/PTCLM + e-o ./components/mom ./components/mosart ./components/pop ./components/pop/externals/CVMix ./components/pop/externals/MARBL ./components/rtm ./components/ww3 + e-o ./libraries/FMS + + +You should now have a default copy of the CESM2 source code in your /path/to/my_cesm_sandbox. + +These components are optional and are not needed to run CESM2. + +.. code-block:: console + + e-o ./cime/src/drivers/nuopc/ + e-o ./components/mom + e-o ./libraries/FMS -You should now have a complete copy of the CESM2 source code in your /path/to/my_cesm_sandbox. If there were problems obtaining an external, you might instead see something like: diff --git a/doc/source/quickstart.rst b/doc/source/quickstart.rst index a1cd59dc7e..98b156530b 100644 --- a/doc/source/quickstart.rst +++ b/doc/source/quickstart.rst @@ -15,7 +15,7 @@ If you are new to CESM2, please consider reading the This is the procedure for quickly setting up and running a CESM2 case. -Download CESM2 (see `Downloading CESM2 `_). +Download CESM2 (see `Downloading CESM2 `_). Select a component set, and a resolution for your case. Details of available component sets and resolutions are available from the `query_config`_ tool located From 332937bcb5293d956088471df64a622bf1d57279 Mon Sep 17 00:00:00 2001 From: Chris Fischer Date: Wed, 23 Sep 2020 12:14:15 -0600 Subject: [PATCH 06/22] Fix CORI pes --- cime_config/config_pes.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml index 240a94c5b5..81da6b4860 100644 --- a/cime_config/config_pes.xml +++ b/cime_config/config_pes.xml @@ -210,7 +210,7 @@ -9 -9 -7 - -1 + -4 -1 -1 -16 @@ -1369,7 +1369,7 @@ -9 -9 -7 - -1 + -4 -1 -1 -16 From 64d66bfb5ccf0d821d12d024429f7616b910d23f Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Wed, 23 Sep 2020 14:34:33 -0600 Subject: [PATCH 07/22] Fix title overlines in documentation --- doc/source/cesm_configurations.rst | 4 ++-- doc/source/downloading_cesm.rst | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/source/cesm_configurations.rst b/doc/source/cesm_configurations.rst index b4e5583b3c..8c52cb7501 100644 --- a/doc/source/cesm_configurations.rst +++ b/doc/source/cesm_configurations.rst @@ -1,8 +1,8 @@ .. _configurations: -=============================== +================================ CESM2 Configurations (|version|) -=============================== +================================ The CESM2 system can be configured a number of different ways from both a science and technical perspective. CESM2 supports numerous diff --git a/doc/source/downloading_cesm.rst b/doc/source/downloading_cesm.rst index 5dc59bc193..f4b62b7808 100644 --- a/doc/source/downloading_cesm.rst +++ b/doc/source/downloading_cesm.rst @@ -1,8 +1,8 @@ .. _downloading: -============================ +============================= Downloading CESM2 (|version|) -============================ +============================= Downloading the code and scripts -------------------------------- From 436eea3977b318b400b4b3fbacd79cd45117eeed Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Tue, 12 Oct 2021 20:08:03 -0600 Subject: [PATCH 08/22] Document the meaning of the first letter in compset aliases --- doc/source/cesm_configurations.rst | 48 ++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/doc/source/cesm_configurations.rst b/doc/source/cesm_configurations.rst index 8c52cb7501..f743ad9f04 100644 --- a/doc/source/cesm_configurations.rst +++ b/doc/source/cesm_configurations.rst @@ -117,6 +117,54 @@ The compset name usually has a well defined first letter followed by some characters that are indicative of the configuration setup. Each compset name has a corresponding short name. +The first letter generally indicates which of the components are fully +active (prognostic), which are data components, and which are completely +absent (or stub). For the most part, this first letter refers only to +the atmosphere (atm), land (lnd), sea ice (ice) and ocean (ocn) +components. The type of component used for river (rof), land ice (glc) +and ocean wave (wav) is either specified in some other way in the alias +or is not specified explicitly. For example, an evolving land ice (glc) +model is denoted by a capital G near the end of the compset alias (e.g., +B1850G is similar to B1850 but with an evolving Greenland ice sheet). In +some cases, the distinction between prognostic and data components is +not clear-cut -- for example, when using a data ocean model in slab +ocean model (SOM) mode, or when using a prognostic sea ice model (CICE) +in prescribed mode. + +.. table:: + + +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ + | Designation | Active Components | Data Components | Notes | + +=============+====================+=================+==============================================================================================================+ + | A | -- | VARIES | All data components (exact set of data components differs for different compsets); used for software testing | + +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ + | B | atm, lnd, ice, ocn | -- | Fully active components | + +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ + | C | ocn | atm, ice, rof | \ | + +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ + | D | ice | atm, ocn, rof | Slab ocean model (SOM) | + +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ + | E | atm, lnd, ice | ocn | Slab ocean model (SOM) | + +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ + | F | atm, lnd | ice, ocn | Sea ice in prescribed mode; some F compsets use fewer surface components | + +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ + | G | ice, ocn | atm, rof | \ | + +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ + | I | lnd | atm | \ | + +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ + | J | lnd, ice, ocn | atm | Can be used to spin up the surface components | + +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ + | P | atm | -- | CAM PORT compsets | + +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ + | Q | atm | ocn | Aquaplanet compsets | + +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ + | S | -- | -- | Driver only; used for software testing | + +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ + | T | glc | lnd | \ | + +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ + | X | -- | -- | Coupler-test components; used for software testing | + +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ + See `supported component sets `_ for a complete list of supported compset options. Running **query_config** From 7f1d191cf4ddfac814b87e0e28d4713bd808916d Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Tue, 12 Oct 2021 20:20:39 -0600 Subject: [PATCH 09/22] Minor edits --- doc/source/cesm_configurations.rst | 47 +++++++++++++++--------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/doc/source/cesm_configurations.rst b/doc/source/cesm_configurations.rst index f743ad9f04..aaaf5089c8 100644 --- a/doc/source/cesm_configurations.rst +++ b/doc/source/cesm_configurations.rst @@ -109,34 +109,35 @@ The CESM2 components can be combined in numerous ways to carry out various scientific or software experiments. A particular mix of components, *along with* component-specific configuration and/or namelist settings is called a `component set or compset -`_. CESM -has a shorthand naming convention for component sets that are -supported out-of-the-box. - -The compset name usually has a well defined first letter followed by -some characters that are indicative of the configuration setup. Each -compset name has a corresponding short name. - -The first letter generally indicates which of the components are fully -active (prognostic), which are data components, and which are completely -absent (or stub). For the most part, this first letter refers only to -the atmosphere (atm), land (lnd), sea ice (ice) and ocean (ocn) -components. The type of component used for river (rof), land ice (glc) -and ocean wave (wav) is either specified in some other way in the alias -or is not specified explicitly. For example, an evolving land ice (glc) -model is denoted by a capital G near the end of the compset alias (e.g., -B1850G is similar to B1850 but with an evolving Greenland ice sheet). In -some cases, the distinction between prognostic and data components is -not clear-cut -- for example, when using a data ocean model in slab -ocean model (SOM) mode, or when using a prognostic sea ice model (CICE) -in prescribed mode. +`_. CESM has a +shorthand naming convention (known as an alias) for component sets that +are supported out-of-the-box. The compset alias usually has a +well-defined first letter followed by some characters that are +indicative of the configuration setup. + +The first letter in a compset alias generally indicates which of the +components are fully active (prognostic), which are data components, and +which are completely absent (or stub). For the most part, this first +letter refers only to the atmosphere (atm), land (lnd), sea ice (ice) +and ocean (ocn) components. The type of component used for river (rof), +land ice (glc) and ocean wave (wav) is either specified in some other +way in the alias or is not specified explicitly. For example, an +evolving land ice (glc) model is denoted by a capital G near the end of +the compset alias (e.g., B1850G is similar to B1850 but with an evolving +Greenland ice sheet). In some cases, the distinction between prognostic +and data components is not clear-cut -- for example, when using a data +ocean model in slab ocean model (SOM) mode, or when using a prognostic +sea ice model (CICE) in prescribed mode. + +The following table summarizes these first-letter designations in +compset aliases: .. table:: +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ | Designation | Active Components | Data Components | Notes | +=============+====================+=================+==============================================================================================================+ - | A | -- | VARIES | All data components (exact set of data components differs for different compsets); used for software testing | + | A | -- | various | All data components (exact set of data components differs for different compsets); used for software testing | +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ | B | atm, lnd, ice, ocn | -- | Fully active components | +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ @@ -158,7 +159,7 @@ in prescribed mode. +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ | Q | atm | ocn | Aquaplanet compsets | +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ - | S | -- | -- | Driver only; used for software testing | + | S | -- | -- | No components present; used for software testing | +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ | T | glc | lnd | \ | +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ From 2626d98489168d29da34f5aebeeaaca062e8874d Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Tue, 12 Oct 2021 20:24:56 -0600 Subject: [PATCH 10/22] More minor edits --- doc/source/cesm_configurations.rst | 62 +++++++++++++++--------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/doc/source/cesm_configurations.rst b/doc/source/cesm_configurations.rst index aaaf5089c8..ad9a7e5024 100644 --- a/doc/source/cesm_configurations.rst +++ b/doc/source/cesm_configurations.rst @@ -134,37 +134,37 @@ compset aliases: .. table:: - +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ - | Designation | Active Components | Data Components | Notes | - +=============+====================+=================+==============================================================================================================+ - | A | -- | various | All data components (exact set of data components differs for different compsets); used for software testing | - +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ - | B | atm, lnd, ice, ocn | -- | Fully active components | - +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ - | C | ocn | atm, ice, rof | \ | - +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ - | D | ice | atm, ocn, rof | Slab ocean model (SOM) | - +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ - | E | atm, lnd, ice | ocn | Slab ocean model (SOM) | - +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ - | F | atm, lnd | ice, ocn | Sea ice in prescribed mode; some F compsets use fewer surface components | - +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ - | G | ice, ocn | atm, rof | \ | - +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ - | I | lnd | atm | \ | - +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ - | J | lnd, ice, ocn | atm | Can be used to spin up the surface components | - +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ - | P | atm | -- | CAM PORT compsets | - +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ - | Q | atm | ocn | Aquaplanet compsets | - +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ - | S | -- | -- | No components present; used for software testing | - +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ - | T | glc | lnd | \ | - +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ - | X | -- | -- | Coupler-test components; used for software testing | - +-------------+--------------------+-----------------+--------------------------------------------------------------------------------------------------------------+ + +-------------+--------------------+-----------------+--------------------------------------------------------------------------+ + | Designation | Active Components | Data Components | Notes | + +=============+====================+=================+==========================================================================+ + | A | -- | various | All data components; used for software testing | + +-------------+--------------------+-----------------+--------------------------------------------------------------------------+ + | B | atm, lnd, ice, ocn | -- | Fully active components | + +-------------+--------------------+-----------------+--------------------------------------------------------------------------+ + | C | ocn | atm, ice, rof | \ | + +-------------+--------------------+-----------------+--------------------------------------------------------------------------+ + | D | ice | atm, ocn, rof | Slab ocean model (SOM) | + +-------------+--------------------+-----------------+--------------------------------------------------------------------------+ + | E | atm, lnd, ice | ocn | Slab ocean model (SOM) | + +-------------+--------------------+-----------------+--------------------------------------------------------------------------+ + | F | atm, lnd | ice, ocn | Sea ice in prescribed mode; some F compsets use fewer surface components | + +-------------+--------------------+-----------------+--------------------------------------------------------------------------+ + | G | ice, ocn | atm, rof | \ | + +-------------+--------------------+-----------------+--------------------------------------------------------------------------+ + | I | lnd | atm | \ | + +-------------+--------------------+-----------------+--------------------------------------------------------------------------+ + | J | lnd, ice, ocn | atm | Can be used to spin up the surface components | + +-------------+--------------------+-----------------+--------------------------------------------------------------------------+ + | P | atm | -- | CAM PORT compsets | + +-------------+--------------------+-----------------+--------------------------------------------------------------------------+ + | Q | atm | ocn | Aquaplanet compsets | + +-------------+--------------------+-----------------+--------------------------------------------------------------------------+ + | S | -- | -- | No components present; used for software testing | + +-------------+--------------------+-----------------+--------------------------------------------------------------------------+ + | T | glc | lnd | \ | + +-------------+--------------------+-----------------+--------------------------------------------------------------------------+ + | X | -- | -- | Coupler-test components; used for software testing | + +-------------+--------------------+-----------------+--------------------------------------------------------------------------+ See `supported component sets `_ for a From bee88876b187c10d3a427f565e03e2c9293e9868 Mon Sep 17 00:00:00 2001 From: Chris Fischer Date: Mon, 6 Mar 2023 12:25:03 -0700 Subject: [PATCH 11/22] Update for cesm2.2.1-rc.01 --- Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index 9d67b0f729..a38bc11dff 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,5 +1,5 @@ [cam] -tag = cam_cesm2_2_rel_02 +tag = cam_cesm2_2_rel_07 protocol = git repo_url = https://github.com/ESCOMP/CAM local_path = components/cam From 15cb3592d888e8a8250b6a7cb8ae99e3c87831b6 Mon Sep 17 00:00:00 2001 From: Chris Fischer Date: Tue, 28 Mar 2023 15:20:08 -0600 Subject: [PATCH 12/22] Update for cesm2.2.1-rc.01 --- Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index a38bc11dff..bf34f758dd 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -21,7 +21,7 @@ local_path = components/cdeps required = True [cime] -tag = cime5.8.32 +tag = cime5.8.32.1 protocol = git repo_url = https://github.com/ESMCI/cime local_path = cime From b6b1fd32139ce70d290dacec30a6ffa265a03e6d Mon Sep 17 00:00:00 2001 From: Chris Fischer Date: Tue, 4 Apr 2023 15:42:20 -0600 Subject: [PATCH 13/22] Update for cesm2.2.1-rc.01 --- ChangeLog | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/ChangeLog b/ChangeLog index bbfcdccb58..5e6b4c570f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,72 @@ +=============================================================== +Tag name: cesm2.2.1-rc.01 +Originator(s): CSEG +Date: 4th April 2023 +One-line Summary: cesm2.2.1 release. + + +Component tags used for this CESM release candidate tag : + +components/cam https://github.com/ESCOMP/CAM/tree/cam_cesm2_2_rel_07 +components/cice https://github.com/ESCOMP/CESM_CICE5/tree/cice5_20200430 +cime https://github.com/ESMCI/cime/tree/cime5.8.32.1 +components/cism https://github.com/ESCOMP/CISM-wrapper/tree/cism2_1_69 +components/clm https://github.com/ESCOMP/CTSM/tree/release-cesm2.2.01 +components/fms https://github.com/ESCOMP/FMS_interface/tree/fi_20200609 +components/mom https://github.com/ESCOMP/MOM_interface/mi_20200908 +components/mosart https://github.com/ESCOMP/MOSART/tree/mosart1_0_37 +components/pop https://github.com/ESCOMP/POP2-CESM/cesm_pop_2_1_20200730 +components/rtm https://github.com/ESCOMP/RTM/tree/rtm1_0_72 +components/ww3 https://github.com/ESCOMP/WW3-CESM/tree/ww3_190710 + +cam + Cheryl Craig 2023-03-02 - cam_cesm2_2_rel_07 - components/cam (cesm2.2.1-rc.01) + https://github.com/ESCOMP/CAM/tags/cam_cesm2_2_rel_07 + + For Francis Vitt + + Functional support for FHIST on refined SE grids + + + Cheryl Craig 2023-03-02 - cam_cesm2_2_rel_06 - components/cam (cesm2.2.1-rc.01) + https://github.com/ESCOMP/CAM/tags/cam_cesm2_2_rel_06 + + For Francis Vitt + + Transport CL and BR in WACCM-MA chemistry mechanisms + + Answer changing for WACCM-MA chemistry mechanisms + + + Cheryl Craig 2023-03-02 - cam_cesm2_2_rel_05 - components/cam (cesm2.2.1-rc.01) + https://github.com/ESCOMP/CAM/tags/cam_cesm2_2_rel_05 + + For Courtney Peverley + Secondary advection bug fix for CESM2.2 release + + Answer changing for all SE dycore runs + + + Cheryl Craig 2022-08-22 - cam_cesm2_2_rel_04 - components/cam (cesm2.2.1-rc.01) + https://github.com/ESCOMP/CAM/tags/cam_cesm2_2_rel_04 + + Fix three CAM-SE bugs + + some answer changes for SE runs + + + Chris Fischer 2020-09-24 - cam_cesm2_2_rel_03 - components/cam (cesm2.2.1-rc.01) + https://github.com/ESCOMP/CAM/tags/cam_cesm2_2_rel_03 + + Remove FCSCAM compset. + + +cime + Chris Fischer 2023-04-04 - cime5.8.32.1 - cime (cesm2.2.1-rc.01) + https://github.com/ESMCI/cime/tags/cime5.8.32.1 + + Update izumi domain name. + =============================================================== Tag name: cesm2.2.0-rc.01 Originator(s): CSEG From fc039ed49fffeeedca040439e39ad6e24d952c7c Mon Sep 17 00:00:00 2001 From: James Edwards Date: Tue, 1 Aug 2023 08:49:05 -0600 Subject: [PATCH 14/22] update mosart external --- Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index bf34f758dd..66835c7f95 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -61,7 +61,7 @@ externals = Externals.cfg required = False [mosart] -tag = mosart1_0_37 +tag = mosart1_0_37_1 protocol = git repo_url = https://github.com/ESCOMP/MOSART local_path = components/mosart From 0da7cf4f1cbbbcd5328f81af70bf69399557e22e Mon Sep 17 00:00:00 2001 From: James Edwards Date: Fri, 18 Aug 2023 08:28:50 -0600 Subject: [PATCH 15/22] 2023 asd experiment branch --- Externals.cfg | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 66835c7f95..c450649fe2 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,7 +1,7 @@ [cam] -tag = cam_cesm2_2_rel_07 +tag = cam_cesm2_2_rel_07_asd23/01 protocol = git -repo_url = https://github.com/ESCOMP/CAM +repo_url = https://github.com/jedwards4b/CAM local_path = components/cam externals = Externals_CAM.cfg required = True @@ -21,7 +21,7 @@ local_path = components/cdeps required = True [cime] -tag = cime5.8.32.1 +tag = cime5.8.32.2 protocol = git repo_url = https://github.com/ESMCI/cime local_path = cime @@ -37,9 +37,9 @@ externals = Externals_CISM.cfg required = True [clm] -tag = release-cesm2.2.01 +tag = release-cesm2.2.01.asd01 protocol = git -repo_url = https://github.com/ESCOMP/CTSM +repo_url = https://github.com/jedwards4b/CTSM local_path = components/clm externals = Externals_CLM.cfg required = True From 3b2d7579f69bf27416bd6713f20de2dc08bfacfc Mon Sep 17 00:00:00 2001 From: rpfernan Date: Fri, 31 May 2024 14:45:50 -0600 Subject: [PATCH 16/22] update cam and cime versions used for SLH developments --- Externals.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index c450649fe2..25c68e2574 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,7 +1,7 @@ [cam] -tag = cam_cesm2_2_rel_07_asd23/01 +tag = cam_cesm2_2_rel_07_asd23_01_zero protocol = git -repo_url = https://github.com/jedwards4b/CAM +repo_url = https://github.com/RafaPedroFernandez/CAM local_path = components/cam externals = Externals_CAM.cfg required = True @@ -21,7 +21,7 @@ local_path = components/cdeps required = True [cime] -tag = cime5.8.32.2 +tag = cime5.8.32.9 protocol = git repo_url = https://github.com/ESMCI/cime local_path = cime From 4533646e5a1aae5ce2addb01a414ee43690954f9 Mon Sep 17 00:00:00 2001 From: rpfernan Date: Sat, 1 Jun 2024 06:09:13 -0600 Subject: [PATCH 17/22] testing if I can now clone the CAM components pointing to another branch --- Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index 25c68e2574..01049b70a0 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,5 +1,5 @@ [cam] -tag = cam_cesm2_2_rel_07_asd23_01_zero +tag = cam_cesm2_2_rel_02_zero protocol = git repo_url = https://github.com/RafaPedroFernandez/CAM local_path = components/cam From a2cb75d2e4ec341c735ef885372425ff0c68a3ad Mon Sep 17 00:00:00 2001 From: rpfernan Date: Sun, 2 Jun 2024 16:20:45 -0300 Subject: [PATCH 18/22] update cam version to implement SLH chemistry over cam_cesm2_2_rel_09_rpf --- Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index 01049b70a0..b0564aafd0 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,5 +1,5 @@ [cam] -tag = cam_cesm2_2_rel_02_zero +tag = cam_cesm2_2_rel_09_rpf protocol = git repo_url = https://github.com/RafaPedroFernandez/CAM local_path = components/cam From c48a460d772817ab37ffd581ca5217964a481587 Mon Sep 17 00:00:00 2001 From: rpfernan Date: Fri, 7 Jun 2024 00:00:30 -0300 Subject: [PATCH 19/22] update Externals.cfg and config_compsets for SLH chemistry (rpf) --- Externals.cfg | 14 +++--- cime_config/config_compsets.xml | 84 +++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 7 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index b0564aafd0..af0fd3fdb6 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,5 +1,5 @@ [cam] -tag = cam_cesm2_2_rel_09_rpf +tag = cam_cesm2_2_rel_09_slh protocol = git repo_url = https://github.com/RafaPedroFernandez/CAM local_path = components/cam @@ -21,25 +21,25 @@ local_path = components/cdeps required = True [cime] -tag = cime5.8.32.9 +tag = cime5.8.32.9_rpf protocol = git -repo_url = https://github.com/ESMCI/cime +repo_url = https://github.com/RafaPedroFernandez/cime local_path = cime externals = ../Externals_cime.cfg required = True [cism] -tag = cism2_1_69 +tag = cism2_1_69_rpf protocol = git -repo_url = https://github.com/ESCOMP/CISM-wrapper +repo_url = https://github.com/RafaPedroFernandez/CISM-wrapper local_path = components/cism externals = Externals_CISM.cfg required = True [clm] -tag = release-cesm2.2.01.asd01 +tag = release-cesm2.2.01.asd01_rpf protocol = git -repo_url = https://github.com/jedwards4b/CTSM +repo_url = https://github.com/RafaPedroFernandez/ctsm local_path = components/clm externals = Externals_CLM.cfg required = True diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index 9a685f516c..c6fbf9b39d 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -52,11 +52,95 @@ 1850_CAM60%WCCM_CLM50%BGC-CROP_CICE_POP2%ECO%NDEP_MOSART_CISM2%NOEVOLVE_WW3 + + + + BWSSP126cmip6 + SSP126_CAM60%WCTS_CLM50%BGC-CROP-CMIP6WACCMDECK_CICE%CMIP6_POP2%ECO%NDEP_MOSART_CISM2%NOEVOLVE_WW3 + + + + BWSSP245cmip6 + SSP245_CAM60%WCTS_CLM50%BGC-CROP-CMIP6WACCMDECK_CICE%CMIP6_POP2%ECO%NDEP_MOSART_CISM2%NOEVOLVE_WW3 + + + + + BWSSP370cmip6 + SSP370_CAM60%WCTS_CLM50%BGC-CROP-CMIP6WACCMDECK_CICE%CMIP6_POP2%ECO%NDEP_MOSART_CISM2%NOEVOLVE_WW3 + + + BWSSP585cmip6 + SSP585_CAM60%WCTS_CLM50%BGC-CROP-CMIP6WACCMDECK_CICE%CMIP6_POP2%ECO%NDEP_MOSART_CISM2%NOEVOLVE_WW3 + + + BWSSP534oscmip6 + SSP534_CAM60%WCTS_CLM50%BGC-CROP-CMIP6WACCMDECK_CICE%CMIP6_POP2%ECO%NDEP_MOSART_CISM2%NOEVOLVE_WW3 + + + + + + + + + + + + + + BHIST HIST_CAM60_CLM50%BGC-CROP_CICE_POP2%ECO_MOSART_CISM2%NOEVOLVE_WW3_BGC%BDRD + + + + + BSSP126cmip6 + SSP126_CAM60_CLM50%BGC-CROP-CMIP6DECK_CICE%CMIP6_POP2%ECO%ABIO-DIC_MOSART_CISM2%NOEVOLVE_WW3_BGC%BDRD + + + + + + BSSP245cmip6 + SSP245_CAM60_CLM50%BGC-CROP-CMIP6DECK_CICE%CMIP6_POP2%ECO%ABIO-DIC_MOSART_CISM2%NOEVOLVE_WW3_BGC%BDRD + + + + + + BCSSP245cmip6 + SSP245_CAM60%CCTS1_CLM50%BGC-CROP-CMIP6DECK_CICE%CMIP6_POP2%ECO%ABIO-DIC_MOSART_CISM2%NOEVOLVE_WW3_BGC%BDRD + + + + + + + BSSP370cmip6 + SSP370_CAM60_CLM50%BGC-CROP-CMIP6DECK_CICE%CMIP6_POP2%ECO%ABIO-DIC_MOSART_CISM2%NOEVOLVE_WW3_BGC%BDRD + + + + + + + + + + + + + + + + + + From 677c53d12e9781cb3e3258b877b6ebb43f7832f0 Mon Sep 17 00:00:00 2001 From: rpfernan Date: Thu, 25 Jul 2024 10:42:12 -0300 Subject: [PATCH 20/22] Update Manage_external for SLH chemistry (rpf) --- Externals.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index af0fd3fdb6..cc3ab3922f 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -21,7 +21,7 @@ local_path = components/cdeps required = True [cime] -tag = cime5.8.32.9_rpf +tag = cime5.8.32.9_slh protocol = git repo_url = https://github.com/RafaPedroFernandez/cime local_path = cime @@ -29,7 +29,7 @@ externals = ../Externals_cime.cfg required = True [cism] -tag = cism2_1_69_rpf +tag = cism2_1_69_slh protocol = git repo_url = https://github.com/RafaPedroFernandez/CISM-wrapper local_path = components/cism @@ -37,7 +37,7 @@ externals = Externals_CISM.cfg required = True [clm] -tag = release-cesm2.2.01.asd01_rpf +tag = release-cesm2.2.01.asd01_slh protocol = git repo_url = https://github.com/RafaPedroFernandez/ctsm local_path = components/clm From 63fd1a1840258a6ac02fd7a31e168d747c6b5434 Mon Sep 17 00:00:00 2001 From: rpfernan Date: Thu, 25 Jul 2024 10:45:50 -0300 Subject: [PATCH 21/22] Include generic (GEN) B* compsets (SSPs) for SLH chemistry (rpf) --- cime_config/config_compsets.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index c6fbf9b39d..c1fd0fe688 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -86,6 +86,11 @@ + + BWSSPGENcmip6slh + SSPGEN_CAM60%WCTSSLH_CLM50%BGC-CROP-CMIP6WACCMDECK_CICE%CMIP6_POP2%ECO%NDEP_MOSART_CISM2%NOEVOLVE_WW3 + + @@ -136,6 +141,13 @@ + + BCSSPGENcmip6slhvbs + + SSPGEN_CAM60%CCTS1SLH_CLM50%BGC-CROP-CMIP6DECK_CICE%CMIP6_POP2%ECO%ABIO-DIC_MOSART_CISM2%NOEVOLVE_WW3_BGC%BDRD + + + From 0f659c67b3c72f5f8764bd44008c92debe7b61b3 Mon Sep 17 00:00:00 2001 From: rpfernan Date: Fri, 26 Jul 2024 03:35:54 -0300 Subject: [PATCH 22/22] Unify slhVBS and slhEXT compsets for SLH chemistry (rpf) --- cime_config/config_compsets.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index c1fd0fe688..731e6e23cd 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -82,12 +82,12 @@ - + - BWSSPGENcmip6slh + BWSSPGENcmip6_slh SSPGEN_CAM60%WCTSSLH_CLM50%BGC-CROP-CMIP6WACCMDECK_CICE%CMIP6_POP2%ECO%NDEP_MOSART_CISM2%NOEVOLVE_WW3 @@ -135,14 +135,14 @@ - + - BCSSPGENcmip6slhvbs + BCSSPGENcmip6_slh SSPGEN_CAM60%CCTS1SLH_CLM50%BGC-CROP-CMIP6DECK_CICE%CMIP6_POP2%ECO%ABIO-DIC_MOSART_CISM2%NOEVOLVE_WW3_BGC%BDRD