From 3f4493eca7c7889c0e4bdcd43bb55d7f5d497421 Mon Sep 17 00:00:00 2001 From: DirkOlivie Date: Mon, 12 Dec 2022 17:17:42 +0100 Subject: [PATCH 01/16] modification in documentation on noresm2.0.6 release --- doc/access/releases_noresm20.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; From 4d2aecfa2be15e7f10e6bec53ee8d75edc6e5e7b Mon Sep 17 00:00:00 2001 From: Tomas Torsvik <43031053+TomasTorsvik@users.noreply.github.com> Date: Wed, 8 Feb 2023 10:01:08 +0100 Subject: [PATCH 02/16] Update CONTRIBUTING.md from `master` branch. (#422) --- CONTRIBUTING.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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/ - From 518389e3f21c2d23e0353b61b1d854001eb48974 Mon Sep 17 00:00:00 2001 From: Michael Schulz Date: Thu, 30 Mar 2023 14:20:45 +0200 Subject: [PATCH 03/16] Update cmip6_data.rst --- doc/data/cmip6_data.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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. From 18b0863b17e86f02908efbbb354d675edf31b07a Mon Sep 17 00:00:00 2001 From: Alok Gupta Date: Thu, 30 Mar 2023 14:25:44 +0200 Subject: [PATCH 04/16] changing processors configuration for f09_tn01254 --- cime_config/config_pes.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 @@ none 1536 - 96 + 1536 256 - 1440 - 1532 + 1536 + 2867 256 256 - 1024 + 1536 1 @@ -2142,7 +2142,7 @@ 0 0 0 - 96 + 0 1536 0 0 From 6d9dce0989df3a76affdc8cf6d1d0fa4ab857d24 Mon Sep 17 00:00:00 2001 From: Tomas Torsvik <43031053+TomasTorsvik@users.noreply.github.com> Date: Thu, 10 Aug 2023 09:34:51 +0200 Subject: [PATCH 05/16] Fix link in README.md in `noresm2` branch. (#458) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ebdb27eb..c4abaf20 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,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. From 2acdc0c32e1c75c1b8044fdfa45686c4bf913ebd Mon Sep 17 00:00:00 2001 From: Tomas Torsvik <43031053+TomasTorsvik@users.noreply.github.com> Date: Fri, 22 Mar 2024 09:50:30 +0100 Subject: [PATCH 06/16] Update noresm2 README.md after noresm2.0.7 release (#506) --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index c4abaf20..9ac27f30 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,11 @@ 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.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 From 66fdc69f010adab8c0a79db0e61e69a37c247599 Mon Sep 17 00:00:00 2001 From: Tomas Torsvik Date: Thu, 15 Aug 2024 13:06:37 +0200 Subject: [PATCH 07/16] Copy testlist_allactive.xml from noresm2_3_develop branch. --- cime_config/testlist_allactive.xml | 372 +++-------------------------- 1 file changed, 37 insertions(+), 335 deletions(-) diff --git a/cime_config/testlist_allactive.xml b/cime_config/testlist_allactive.xml index 7a80b463..0af85874 100644 --- a/cime_config/testlist_allactive.xml +++ b/cime_config/testlist_allactive.xml @@ -1,425 +1,127 @@ - + + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - + - + - - + - + + - - + - + - + - + - - + - + - - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - - - - - - - - - - - - - - - - - - - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + From be96a54d765df95919baa10c8d929a32fe6d831c Mon Sep 17 00:00:00 2001 From: Tomas Torsvik Date: Thu, 15 Aug 2024 13:09:41 +0200 Subject: [PATCH 08/16] Update cime using new modules for Betzy --- Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index 77e9c7f7..55a96ced 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_r3 protocol = git repo_url = https://github.com/NorESMhub/cime local_path = cime From 20952d3291e72278155dbad60597ce52053b58c0 Mon Sep 17 00:00:00 2001 From: Tomas Torsvik Date: Fri, 16 Aug 2024 15:37:20 +0200 Subject: [PATCH 09/16] Bump cime tag to cime5.6.10_NorESM2_3_r4 --- Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index 55a96ced..20c27a5d 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -13,7 +13,7 @@ local_path = components/cice required = True [cime] -tag = cime5.6.10_NorESM2_3_r3 +tag = cime5.6.10_NorESM2_3_r4 protocol = git repo_url = https://github.com/NorESMhub/cime local_path = cime From c85ebbb6a472dfd225f8ff47cd8bd3472c62b15c Mon Sep 17 00:00:00 2001 From: Tomas Torsvik Date: Tue, 20 Aug 2024 11:19:50 +0200 Subject: [PATCH 10/16] Rename test suite noresm_prealpha -> prealpha_noresm --- cime_config/testlist_allactive.xml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/cime_config/testlist_allactive.xml b/cime_config/testlist_allactive.xml index 0af85874..36c30bdf 100644 --- a/cime_config/testlist_allactive.xml +++ b/cime_config/testlist_allactive.xml @@ -3,7 +3,7 @@ - + @@ -11,7 +11,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -35,7 +35,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -60,7 +60,7 @@ - + @@ -68,7 +68,7 @@ - + @@ -76,7 +76,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -92,7 +92,7 @@ - + @@ -101,7 +101,7 @@ - + From 539ea1b7b243b052331781c152a500e4ff2e86ca Mon Sep 17 00:00:00 2001 From: Tomas Torsvik <43031053+TomasTorsvik@users.noreply.github.com> Date: Wed, 21 Aug 2024 14:07:21 +0200 Subject: [PATCH 11/16] Noresm2 - change BLOM tag to v1.4.2 (#547) * Add info about noresm2.0.8 in README.md file * Change BLOM tag to v1.4.2 --- Externals.cfg | 2 +- README.md | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index 20c27a5d..3b95cfe1 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -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 diff --git a/README.md b/README.md index 9ac27f30..cde45ad3 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,11 @@ 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 From a44a5b26f061d2af0076a732a19422ea7b96ebfa Mon Sep 17 00:00:00 2001 From: Ping-Gin Chiu Date: Thu, 26 Sep 2024 14:50:21 +0200 Subject: [PATCH 12/16] Add NorCPM compset --- cime_config/config_compsets.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index 8196a310..53d5c483 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -326,6 +326,12 @@ + + NHISTNCPM + HIST_CAM60%NORESM_CLM50%BGC-CROP_CICE%NORESM-CMIP6_BLOM%ECO_MOSART_SGLC_SWAV_NORCPM_BGC%BDRDDMS + + + @@ -335,6 +341,13 @@ + + NHISTNCPMfrc2 + HIST_CAM60%NORESM%FRC2_CLM50%BGC-CROP_CICE%NORESM-CMIP6_BLOM%ECO_MOSART_SGLC_SWAV_NORCPM_BGC%BDRDDMS + + + + NHISTesm HIST_CAM60%NORESM_CLM50%BGC-CROP_CICE%NORESM-CMIP6_BLOM%ECO_MOSART_SGLC_SWAV_BGC%BPRPDMS From 46ae9c67837804571f0ce42ca9df0df949f44a30 Mon Sep 17 00:00:00 2001 From: Ping-Gin Chiu Date: Thu, 26 Sep 2024 15:18:27 +0200 Subject: [PATCH 13/16] Add norcpm_esp --- Externals.cfg | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Externals.cfg b/Externals.cfg index 3b95cfe1..bc212276 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -72,5 +72,12 @@ repo_url = https://svn-ccsm-models.cgd.ucar.edu/ww3/release_tags local_path = components/ww3 required = False +[norcpm] +tag = 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 From 74d4d84f20bd641f1b5d976b5111dea47bf10214 Mon Sep 17 00:00:00 2001 From: Ping-Gin Chiu Date: Fri, 27 Sep 2024 13:15:25 +0200 Subject: [PATCH 14/16] Add norcpm to Externals.cfg --- Externals.cfg | 2 +- Externals_continuous_development.cfg | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index bc212276..13b1521f 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -73,7 +73,7 @@ local_path = components/ww3 required = False [norcpm] -tag = noresm2.0.x +tag = n2.0.8 protocol = git repo_url = https://github.com/NorESMhub/norcpm_esp local_path = components/norcpm diff --git a/Externals_continuous_development.cfg b/Externals_continuous_development.cfg index 0253ff2d..ebc12571 100644 --- a/Externals_continuous_development.cfg +++ b/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 From 4be9b9be20b78f2cd2228e5253e1d276411294ab Mon Sep 17 00:00:00 2001 From: Ping-Gin Chiu Date: Mon, 30 Sep 2024 14:37:36 +0200 Subject: [PATCH 15/16] Fix BLOM tag and remove sci. support of grids --- Externals.cfg | 4 ++-- Externals_continuous_development.cfg | 2 +- cime_config/config_compsets.xml | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 13b1521f..408ff5f1 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -51,7 +51,7 @@ externals = Externals_POP.cfg required = False [blom] -tag = v1.4.2 +tag = v1.4.3 protocol = git repo_url = https://github.com/NorESMhub/BLOM local_path = components/blom @@ -75,7 +75,7 @@ required = False [norcpm] tag = n2.0.8 protocol = git -repo_url = https://github.com/NorESMhub/norcpm_esp +repo_url = https://github.com/NorESMhub/NorCPM_ESP local_path = components/norcpm required = False diff --git a/Externals_continuous_development.cfg b/Externals_continuous_development.cfg index ebc12571..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 diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index 53d5c483..05316bea 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -329,8 +329,6 @@ NHISTNCPM HIST_CAM60%NORESM_CLM50%BGC-CROP_CICE%NORESM-CMIP6_BLOM%ECO_MOSART_SGLC_SWAV_NORCPM_BGC%BDRDDMS - - @@ -344,8 +342,6 @@ NHISTNCPMfrc2 HIST_CAM60%NORESM%FRC2_CLM50%BGC-CROP_CICE%NORESM-CMIP6_BLOM%ECO_MOSART_SGLC_SWAV_NORCPM_BGC%BDRDDMS - - From 41ae497a510d906f854867a79804f0ab5b955ecc Mon Sep 17 00:00:00 2001 From: Ping-Gin Chiu Date: Fri, 11 Oct 2024 15:47:16 +0200 Subject: [PATCH 16/16] Hotfix typo --- Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index 408ff5f1..5b2deb51 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -73,7 +73,7 @@ local_path = components/ww3 required = False [norcpm] -tag = n2.0.8 +tag = n2.0.8.1 protocol = git repo_url = https://github.com/NorESMhub/NorCPM_ESP local_path = components/norcpm