NorESM2.1: Add NorCPM as an ESP component

CONTRIBUTING.md

@@ -8,15 +8,18 @@ A short presentation introducing the NorESM github repository, the issue and pul
 https://github.com/NorESMhub/INES_workshop_2020/blob/gh-pages/files/Torsvik_gitcollaborate.pdf 
 
 # How to contribute
-We recommend that you open an issue (https://github.com/NorESMhub/NorESM/issues) to discuss the changes or additions you want to include. This is done by selecting **New issue** in the top right corner of the issues page, and selecting one of the suggested issue types in the following menu. Through the issue discussion, you can work with the NorESM developers to implement the code changes in the correct repository and in the correct branch. 
+We recommend that you open a new [discussion item](https://github.com/NorESMhub/NorESM/issues) if you have questions about code contribution, or an [issue](https://github.com/NorESMhub/NorESM/issues) to discuss specific changes or additions you want to include. This is done by selecting **New issue** in the top right corner of the issues page, and selecting one of the suggested issue types in the following menu. Through the issue discussion, you can work with the NorESM developers to implement the code changes in the correct repository and in the correct branch. 
+
+# Who can contribute
+Everybody with a github account can fork the repository, change a file and create a pull request, suggesting a change to the code or the documentation. The changes will, upon being merged by a member with write access, be visible to all. If you wish to have more access rights to any of the NorESMhub repositories, write to the NorESM team via email to noresm-ncc(at)met.no .
 
 ## Reporting bugs
 Please, ensure that the bug was not already reported by searching on https://github.com/NorESMhub/NorESM/issues
 
 If you find bugs, strange output or something puzzling, please raise an issue. No issue is too big nor too small. If you wrote code that fixes the bug, please see the description below.
 
 ## Suggesting Enhancements
-If you want to submit an enhancement suggestion for NorESM, including completely new features, minor improvements to existing functionality or bug fixes, please read the NorESM documentation on how to contribute: https://noresm-docs.readthedocs.io/en/noresm2/contribute/contribute.html
+If you want to submit an enhancement suggestion for NorESM, including completely new features, minor improvements to existing functionality or bug fixes, please read the [NorESM documentation on how to contribute](https://noresm-docs.readthedocs.io/en/noresm2/contribute/contribute.html):
 You need to:
 - Setup your personal NorESM fork in GitHub to put your developments
 - Keep up to date with the NorESMhub. 
@@ -25,7 +28,7 @@ You need to:
 
 If your pull request causes conflicts which you are not able to resolve, please ask one of the NorESMhub maintainers for help.
 
-If you introduce code changes or new features into NorESM, these need to be documented. Please remember to update the documentation as well.
+If you introduce code changes or new features into NorESM, these need to be documented. Please remember to [update the documentation](https://github.com/NorESMhub/NorESM/blob/master/doc/README.md) as well.
 
 ## Do you have questions about the source code?
 We recommend that you subscribe to the NorESM user mailing list: https://www.noresm.org/mailman/listinfo/users_noresm.org
@@ -36,4 +39,3 @@ https://noresm-docs.readthedocs.io/en/noresm2/index.html
 
 ### NorESM home page
 https://www.noresm.org/
-

Externals.cfg

@@ -13,7 +13,7 @@ local_path = components/cice
 required = True
 
 [cime]
-tag = cime5.6.10_cesm2_1_rel_06-Nor_v1.0.6
+tag = cime5.6.10_NorESM2_3_r4
 protocol = git
 repo_url = https://github.com/NorESMhub/cime
 local_path = cime
@@ -51,7 +51,7 @@ externals = Externals_POP.cfg
 required = False
 
 [blom]
-tag = v1.3.0
+tag = v1.4.2
 protocol = git
 repo_url = https://github.com/NorESMhub/BLOM
 local_path = components/blom
@@ -72,5 +72,12 @@ repo_url = https://svn-ccsm-models.cgd.ucar.edu/ww3/release_tags
 local_path = components/ww3
 required = False
 
+[norcpm]
+tag = n2.0.8
+protocol = git
+repo_url = https://github.com/NorESMhub/norcpm_esp
+local_path = components/norcpm
+required = False
+
 [externals_description]
 schema_version = 1.0.0

Externals_continuous_development.cfg

@@ -72,5 +72,12 @@ repo_url = https://svn-ccsm-models.cgd.ucar.edu/ww3/release_tags
 local_path = components/ww3
 required = False
 
+[norcpm]
+branch = noresm2.0.x
+protocol = git
+repo_url = https://github.com/NorESMhub/norcpm_esp
+local_path = components/norcpm
+required = False
+
 [externals_description]
 schema_version = 1.0.0

README.md

@@ -11,6 +11,16 @@ NorESM2-LM and NorESM2-MM CMIP6 simulations
 The NorESM-2.0 documentation: https://noresm-docs.readthedocs.io/en/noresm2/
 
 ## Releases in noresm2
+- [release-noresm2.0.8](https://github.com/NorESMhub/NorESM/releases/tag/release-noresm2.0.8)
+    - Release of NorESM2.0.8, August 2024
+    - Available to reproduce CMIP6 results of NorESM2
+    - Updated CIME with new tool chain modules on Betzy
+
+- [release-noresm2.0.7](https://github.com/NorESMhub/NorESM/releases/tag/release-noresm2.0.7)
+    - Release of NorESM2.0.7, 15th of November 2023
+    - Available to reproduce CMIP6 results of NorESM2
+    - Updated CIME for better queue management on Betzy
+
 - [release-noresm2.0.6](https://github.com/NorESMhub/NorESM/releases/tag/release-noresm2.0.6)
     - Release of NorESM2.0.6, 12th of December 2022
     - Available to reproduce CMIP6 results of NorESM2
@@ -44,7 +54,7 @@ The NorESM-2.0 documentation: https://noresm-docs.readthedocs.io/en/noresm2/
     - NorESM2 version,  April  2020 
     - Initial preliminary release of CMIP6 version.
 
-For a detailed description of all NorESM2.0.X releases, please see https://noresm-docs.readthedocs.io/en/noresm2/releases/
+For a detailed description of all NorESM2.0.X releases, please see https://noresm-docs.readthedocs.io/en/noresm2/access/releases_noresm20.html
 
 ### NorESM1 and CMIP5
 For the NorESM code base used in CMIP5, please see the **noresm1** branch.

cime_config/config_compsets.xml

@@ -326,6 +326,12 @@
     <science_support grid="f09_tn14"/>
     <science_support grid="f19_tn14"/>
   </compset>
+  <compset>
+    <alias>NHISTNCPM</alias>
+    <lname>HIST_CAM60%NORESM_CLM50%BGC-CROP_CICE%NORESM-CMIP6_BLOM%ECO_MOSART_SGLC_SWAV_NORCPM_BGC%BDRDDMS</lname>
+    <science_support grid="f09_tn14"/>
+    <science_support grid="f19_tn14"/>
+  </compset>
 
   <!--uses differently organized emission files : FRC2 -->
   <compset>
@@ -335,6 +341,13 @@
     <science_support grid="f19_tn14"/>
   </compset>
 
+  <compset>
+    <alias>NHISTNCPMfrc2</alias>
+    <lname>HIST_CAM60%NORESM%FRC2_CLM50%BGC-CROP_CICE%NORESM-CMIP6_BLOM%ECO_MOSART_SGLC_SWAV_NORCPM_BGC%BDRDDMS</lname>
+    <science_support grid="f09_tn14"/>
+    <science_support grid="f19_tn14"/>
+  </compset>
+
    <compset>
     <alias>NHISTesm</alias>
     <lname>HIST_CAM60%NORESM_CLM50%BGC-CROP_CICE%NORESM-CMIP6_BLOM%ECO_MOSART_SGLC_SWAV_BGC%BPRPDMS</lname>

cime_config/config_pes.xml

@@ -2120,13 +2120,13 @@
         <comment>none</comment>
         <ntasks>
           <ntasks_atm>1536</ntasks_atm>
-          <ntasks_lnd>96</ntasks_lnd>
+          <ntasks_lnd>1536</ntasks_lnd>
           <ntasks_rof>256</ntasks_rof>
-          <ntasks_ice>1440</ntasks_ice>
-          <ntasks_ocn>1532</ntasks_ocn>
+          <ntasks_ice>1536</ntasks_ice>
+          <ntasks_ocn>2867</ntasks_ocn>
           <ntasks_glc>256</ntasks_glc>
           <ntasks_wav>256</ntasks_wav>
-          <ntasks_cpl>1024</ntasks_cpl>
+          <ntasks_cpl>1536</ntasks_cpl>
         </ntasks>
         <nthrds>
           <nthrds_atm>1</nthrds_atm>
@@ -2142,7 +2142,7 @@
           <rootpe_atm>0</rootpe_atm>
           <rootpe_lnd>0</rootpe_lnd>
           <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>96</rootpe_ice>
+          <rootpe_ice>0</rootpe_ice>
           <rootpe_ocn>1536</rootpe_ocn>
           <rootpe_glc>0</rootpe_glc>
           <rootpe_wav>0</rootpe_wav>