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

Merge of NorESM into cesm2.2 release branch #6

Open
wants to merge 69 commits into
base: release-cesm2.2-Nor
Choose a base branch
from

Conversation

MichaelSchulzMETNO
Copy link

Resolved conflicts in favor of NorESM, where they existed. Merged NorESM in latest release CESM CIC5 tag .

AlfGrini and others added 30 commits November 24, 2015 11:28
…ta/tags/cesm2_0_beta03. Compiles/runs on hexagon & vilje. WARNING: COMPSET FC55CLUBB CRASHES AFTER 1 MONTH IN 2x2 RESOLUTION DUE TO SEGMENTATION FAULT ON LINE 2686 in ice_history.F90 USE THIS VERSION AT OWN RISK
… was modified in cime/cime_config/cesm/config_grids.xml and added in components/cice/cime_config/namelist_definition_cice.xml.
…atch.xml, and config_compilers.xml; however problem with building case F2000_DEV
…t05. Only tested for cases F2000_DEV and NFPTAERO on hexagon on 1x1.
Alok Kumar Gupta and others added 25 commits June 29, 2018 13:34
…avoid an unfrequent condition where the heat loss error due to update of thicknesses and internal energy is larger than allowed. This problem seems only to happend during the mass change phase, not in the internal heat conduction solver. We do still not know exactly why this condition arise, but the overall impact of increasing the tolerance in this test should be minor on the total solution.
…CE%NORESM-CMIP6 option in compset long name for N1850
…baxterm/CESM_CICE5-oslo into cice5_20181109-Nor
Replaced MICOM with BLOM in namelist definitions.
Modified paths to supported BLOM grid files.
Copy link

@JensBDebernard JensBDebernard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks that most of this has gone very well.
I have suggested to keep some lines to keep new functionality from cesm2.2.

<value compset="_CICE[_%]"> -phys cice5 </value>
<value compset="_CICE%[^_]*CICE4"> -phys cice4 </value>

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keep line

@@ -52,17 +51,6 @@
</desc>
</entry>

<entry id="CICE_NAMELIST_OPTS">

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This block should be kept if running cam4 based experiments is an option in NorESM?

@@ -5,10 +5,10 @@
<entry_id version="3.0">

<description>
<desc ice="CICE[%PRES][%CMIP6][%CICE4]">Sea ICE (cice) model version 5</desc>

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keep this line to keep CICE4 option

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change the line 8 to:

<desc ice="CICE[%PRES][%CMIP6][%NORESM-CMIP6][%CICE4]">Sea ICE (cice) model version 5</desc> 

<desc option="PRES" > :prescribed cice</desc>
<desc option="CMIP6"> :with modifications appropriate for CMIP6 experiments</desc>
<desc option="CICE4"> :running with cice4 physics</desc>

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keep line

@@ -76,7 +76,6 @@
<value hgrid='tx0.1v3'>$DIN_LOC_ROOT/ice/cice/g.e11.G.T62_t12.002.cice.r.0016-01-01-00000.nc</value>
<value hgrid='ar9v3'>$DIN_LOC_ROOT/ice/cice/cice5ic/r26RBRCICE5g0.cice.r.1990-09-01-00000.nc</value>
<value hgrid='ar9v4'>$DIN_LOC_ROOT/ice/cice/cice5ic/r26RBRCICE5g0.cice.r.1990-09-01-00000.nc</value>
<value hgrid='tx0.25v1'>$DIN_LOC_ROOT/ice/cice/cice5_model_0.25.res_2016100300.nc</value>

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keep all lines with the tx0.25v1 information. Could be important for running cesm-setups and tests with NorESM

@@ -3098,7 +2848,6 @@
<value>mxxxx</value>
<value hgrid="ar9v4">mdhxx</value>
<value cice_mode='prescribed'>xxxxx</value>
<value hgrid ='tx0.25v1'>xxxxx</value>

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

keep line

@@ -3112,7 +2861,6 @@
<value>mxxxx</value>
<value hgrid="ar9v4">mdhxx</value>
<value cice_mode='prescribed'>xxxxx</value>
<value hgrid ='tx0.25v1'>mdhxx</value>

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

keep line

@@ -3126,7 +2874,6 @@
<value>mxxxx</value>
<value hgrid="ar9v4">mdhxx</value>
<value cice_mode='prescribed'>xxxxx</value>
<value hgrid ='tx0.25v1'>xxxxx</value>

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

keep line

@@ -3140,7 +2887,6 @@
<value>mxxxx</value>
<value hgrid="ar9v4">mdhxx</value>
<value cice_mode='prescribed'>xxxxx</value>
<value hgrid ='tx0.25v1'>mdhxx</value>

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

keep line

@@ -3154,7 +2900,6 @@
<value>xxxxx</value>
<value hgrid="ar9v4">mdhxx</value>
<value cice_mode='prescribed'>xxxxx</value>
<value hgrid ='tx0.25v1'>xxxxx</value>

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

keep line

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants