diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d47fe418..182a01e3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,7 +8,10 @@ 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
@@ -16,7 +19,7 @@ Please, ensure that the bug was not already reported by searching on https://git
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/
-
diff --git a/Externals.cfg b/Externals.cfg
index 77e9c7f7..5b2deb51 100644
--- a/Externals.cfg
+++ b/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.3
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.1
+protocol = git
+repo_url = https://github.com/NorESMhub/NorCPM_ESP
+local_path = components/norcpm
+required = False
+
[externals_description]
schema_version = 1.0.0
diff --git a/Externals_continuous_development.cfg b/Externals_continuous_development.cfg
index 0253ff2d..17b225b9 100644
--- a/Externals_continuous_development.cfg
+++ b/Externals_continuous_development.cfg
@@ -51,7 +51,7 @@ externals = Externals_POP.cfg
required = False
[blom]
-branch = release-1.3
+branch = release-1.4
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]
+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
diff --git a/README.md b/README.md
index ebdb27eb..cde45ad3 100644
--- a/README.md
+++ b/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.
diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
index 8196a310..05316bea 100644
--- a/cime_config/config_compsets.xml
+++ b/cime_config/config_compsets.xml
@@ -326,6 +326,10 @@
+
+ NHISTNCPM
+ HIST_CAM60%NORESM_CLM50%BGC-CROP_CICE%NORESM-CMIP6_BLOM%ECO_MOSART_SGLC_SWAV_NORCPM_BGC%BDRDDMS
+
@@ -335,6 +339,11 @@
+
+ NHISTNCPMfrc2
+ HIST_CAM60%NORESM%FRC2_CLM50%BGC-CROP_CICE%NORESM-CMIP6_BLOM%ECO_MOSART_SGLC_SWAV_NORCPM_BGC%BDRDDMS
+
+
NHISTesmHIST_CAM60%NORESM_CLM50%BGC-CROP_CICE%NORESM-CMIP6_BLOM%ECO_MOSART_SGLC_SWAV_BGC%BPRPDMS
diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml
index 0fc7a1b2..743bf92b 100644
--- a/cime_config/config_pes.xml
+++ b/cime_config/config_pes.xml
@@ -2120,13 +2120,13 @@
none1536
- 96
+ 1536256
- 1440
- 1532
+ 1536
+ 2867256256
- 1024
+ 15361
@@ -2142,7 +2142,7 @@
000
- 96
+ 0153600
diff --git a/cime_config/testlist_allactive.xml b/cime_config/testlist_allactive.xml
index 7a80b463..36c30bdf 100644
--- a/cime_config/testlist_allactive.xml
+++ b/cime_config/testlist_allactive.xml
@@ -1,425 +1,127 @@
-
+
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
+
-
+
+
-
-
+
-
+
-
+
-
+
-
-
+
-
+
-
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/doc/access/releases_noresm20.rst b/doc/access/releases_noresm20.rst
index ec8faad8..bab118cc 100644
--- a/doc/access/releases_noresm20.rst
+++ b/doc/access/releases_noresm20.rst
@@ -21,7 +21,7 @@ This release contains:
(1) technical (non answer-changing) modifications in CAM-Nor : correction in CCN and COSP diagnostics;
(2) correction in H2O emission file link for f09 for the extended (year 2100-2300) SSP1-2.6 and SSP5-8.5 compsets;
(3) addition for the above-mentioned extra compsets.
-* CAM-CLM
+* CLM
(1) addition for the above-mentioned extra compsets.
* CIME
(1) modification in archiving script noresm2netcdf4.sh : uses ncks instead of nccopy;
diff --git a/doc/data/cmip6_data.rst b/doc/data/cmip6_data.rst
index abcc4d57..8cb2a3b0 100644
--- a/doc/data/cmip6_data.rst
+++ b/doc/data/cmip6_data.rst
@@ -36,11 +36,11 @@ The (Norwegian) National Infrastructure for Research Data (NIRD)
This is the same data that you can access through the ESGF. Note data is organized by the different contributions/MIPs. The DECK and historical simulations are located under "CMIP".
-**All NIRD users can access CMOR-ized CMIP6 data from multiple models under:** ::
+**All NIRD (nird-lmd) users can access CMOR-ized CMIP6 data from multiple models under:** ::
- /projects/NS9252K/ESGF_betzy/
+ /nird/datalake/NS9560K/ESGF/
-, which has the same structure as data in /projects/NS9034K/CMIP6. Note only members of NS9252K, a NFR storage project for KeyCLIM have write permission.
+, which has the same structure as data in /projects/NS9034K/CMIP6. Note only members of NS9560K, a NFR storage project for KeyCLIM have write permission. See README in the directory.
Refer to Section: :ref:`cmip_other` for more information on how to access and download new data.