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

Add NorCPM as an ESP component #565

Open
wants to merge 21 commits into
base: noresm2_1_develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3f4493e
modification in documentation on noresm2.0.6 release
DirkOlivie Dec 12, 2022
c324466
Merge pull request #413 from DirkOlivie/noresm2
DirkOlivie Dec 12, 2022
4d2aecf
Update CONTRIBUTING.md from `master` branch. (#422)
TomasTorsvik Feb 8, 2023
518389e
Update cmip6_data.rst
MichaelSchulzMETNO Mar 30, 2023
18b0863
changing processors configuration for f09_tn01254
monsieuralok Mar 30, 2023
cd1c832
Merge pull request #434 from NorESMhub/MichaelSchulzMETNO-patch-2
MichaelSchulzMETNO Mar 30, 2023
6d9dce0
Fix link in README.md in `noresm2` branch. (#458)
TomasTorsvik Aug 10, 2023
5168e13
Merge pull request #435 from monsieuralok/noresm2
mvertens Oct 3, 2023
2acdc0c
Update noresm2 README.md after noresm2.0.7 release (#506)
TomasTorsvik Mar 22, 2024
66fdc69
Copy testlist_allactive.xml from noresm2_3_develop branch.
TomasTorsvik Aug 15, 2024
be96a54
Update cime using new modules for Betzy
TomasTorsvik Aug 15, 2024
20952d3
Bump cime tag to cime5.6.10_NorESM2_3_r4
TomasTorsvik Aug 16, 2024
734f900
Merge pull request #541 from TomasTorsvik/noresm2.0.8
TomasTorsvik Aug 16, 2024
c85ebbb
Rename test suite noresm_prealpha -> prealpha_noresm
TomasTorsvik Aug 20, 2024
bae903c
Merge pull request #546 from TomasTorsvik/noresm2_update_testlist_all…
TomasTorsvik Aug 20, 2024
539ea1b
Noresm2 - change BLOM tag to v1.4.2 (#547)
TomasTorsvik Aug 21, 2024
a44a5b2
Add NorCPM compset
blcc Sep 26, 2024
46ae9c6
Add norcpm_esp
blcc Sep 26, 2024
74d4d84
Add norcpm to Externals.cfg
blcc Sep 27, 2024
4be9b9b
Fix BLOM tag and remove sci. support of grids
blcc Sep 30, 2024
41ae497
Hotfix typo
blcc Oct 11, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand All @@ -36,4 +39,3 @@ https://noresm-docs.readthedocs.io/en/noresm2/index.html

### NorESM home page
https://www.noresm.org/

11 changes: 9 additions & 2 deletions Externals.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
9 changes: 8 additions & 1 deletion Externals_continuous_development.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
12 changes: 11 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down
9 changes: 9 additions & 0 deletions cime_config/config_compsets.xml
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,10 @@
<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>
</compset>

<!--uses differently organized emission files : FRC2 -->
<compset>
Expand All @@ -335,6 +339,11 @@
<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>
</compset>

<compset>
<alias>NHISTesm</alias>
<lname>HIST_CAM60%NORESM_CLM50%BGC-CROP_CICE%NORESM-CMIP6_BLOM%ECO_MOSART_SGLC_SWAV_BGC%BPRPDMS</lname>
Expand Down
10 changes: 5 additions & 5 deletions cime_config/config_pes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
Loading