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.

Sign up for GitHub

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
+851 −516
Open

Merge of NorESM into cesm2.2 release branch #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
286d446
#1 : Added cesm1_5_beta02 codes
AlfGrini Nov 24, 2015
5c2f3b9
metno/noresm-dev#1: Added files from cesm1_5_beta03
AlfGrini Dec 3, 2015
f47729c
metno/noresm-dev#4: Checked in code identical to https://svn-ccsm-mod…
AlfGrini Mar 4, 2016
a2e1d52
metno/nores-dev#4: Checked in code identical to https://svn-ccsm-mode…
AlfGrini Mar 11, 2016
6532da5
metno/nores-dev#5: Checked in code identical to https://svn-ccsm-mode…
AlfGrini May 10, 2016
3db90e9
configuring MICOM
Jun 14, 2016
ce22e37
added code identical to https://svn-ccsm-models.cgd.ucar.edu/cesm1/ta…
oyvindseland Aug 23, 2016
f4b1137
metno/noresm-dev#3: Merged with featureCESMNCARBeta_trunk2.0-7 to get…
AlfGrini Sep 2, 2016
fe2499b
added code identical to https://svn-ccsm-models.cgd.ucar.edu/cesm2/be…
AlfGrini Sep 12, 2016
0811e66
added code identical to https://svn-ccsm-models.cgd.ucar.edu/cesm2/be…
AlfGrini Oct 11, 2016
1c0323e
metno/noresm#3: Merged with featureCESMNCARBeta_trunk2.0-7 to be up-t…
AlfGrini Oct 20, 2016
36a0a98
merging from master
Oct 28, 2016
4c91a6b
merging MICOM from master
Nov 7, 2016
401dc0d
added code identical to https://svn-ccsm-models.cgd.ucar.edu/cesm2/be…
AlfGrini Nov 9, 2016
3c8b398
metno/noresm-dev#3: Merged with featureCESM2-micomdevelopment
AlfGrini Nov 24, 2016
dbce81e
added code identical to https://svn-ccsm-models.cgd.ucar.edu/cesm2/be…
DirkOlivie Jan 20, 2017
fa7f7d0
merged with featureCESMNCARBeta_trunk2.0-7, upto date with cesm2_0_be…
DirkOlivie Feb 1, 2017
abf4089
For NorESM specific ocean/sea ice grids tnx1v1 and tnx0.25v1, support…
Feb 14, 2017
edc21e5
configuring MICOM
Feb 19, 2017
ad270f6
configuring MAP factors for tnx1v3 grid for data atmosphere
May 29, 2017
0f81543
configuring grid tnx1v4
Jun 6, 2017
facc769
configuring grid tnx1v4 in coupled setup
Jun 12, 2017
cb1e556
fixing flag update_ocn_f
Jun 14, 2017
cf28815
fixing flag update_ocn_f
Jun 14, 2017
b8f2014
configuring/generating map files for f09_tn13 f19_tn13 T62_tn13
Jun 23, 2017
60cffa5
updated with beta06 from NCAR; modified config_machines.xml, config_b…
DirkOlivie Jul 3, 2017
1fb4497
configuring/generating map files for f09_tn0253 f09_tn0254 T62_tn025…
Jul 4, 2017
7240b0f
Merge branch 'featureCESM2-micomdevelopment-2'
Jul 5, 2017
e5bafca
merged with featureCESMNCARBeta_trunk2.0-7, upto date with cesm2_0_be…
DirkOlivie Jul 20, 2017
cd99dba
Harmonised CESM/NorESM for energy & surf.fluxes; finished albedo cosz…
tto061 Jul 26, 2017
6da18d7
fixed missing def in ice_orbital
tto061 Jul 31, 2017
77288b0
updated with beta07-sandbox227 from NCAR
DirkOlivie Dec 20, 2017
9d7e12c
merged with featureCESMNCARBeta_trunk2.0-7, upto date wiht cesm2_0_ru…
DirkOlivie Jan 17, 2018
7633f94
deleteing queue devel
Feb 15, 2018
4aff67f
configuring for vilje
Feb 20, 2018
577a963
changing processor count for WAV model
Feb 27, 2018
99569d0
updating compiler to intel/2018a and Changing file micom_cpl_indices.…
Mar 21, 2018
154885d
better processors count for f19_tn14
Apr 5, 2018
cafd430
updated with featureCESM2gitmaster_thomas
DirkOlivie May 24, 2018
c67b372
Merged with featureCESMNCARBeta_trunk2.0-7, which is up to date with …
DirkOlivie Jun 4, 2018
ea576ce
Inclusion of Lecomte 2013 blowing snow modification over sea ice
JensBDebernard Jun 6, 2018
f0ddd25
update for HAMOCC
May 28, 2018
c0aa855
increase size of string length assosicated with input/output filenames
Jun 29, 2018
e131763
Added history output for blowing snow to ocean
JensBDebernard Jul 4, 2018
1853183
Merge with blowing snow-branch
JensBDebernard Jul 4, 2018
f39c805
CICE: snow denisty and conductivity activated as possible tuning vari…
JensBDebernard Aug 8, 2018
ae8403b
CICE: snow denisty and conductivity activated as possible tuning vari…
JensBDebernard Aug 8, 2018
a0dcfed
CICE: snow density and conductivity tuning, update
JensBDebernard Aug 9, 2018
4c8b6ac
Support for running DATM compsets with tnx2v1 ocn/ice grid
Sep 25, 2018
cff9e66
Blowing snow is default in CICE setup
JensBDebernard Oct 31, 2018
2a18d40
updated with CESM2.1.0 including non-camoslo modifications
DirkOlivie Jan 10, 2019
6c2a8c8
update with cesm2.1.0
DirkOlivie Feb 5, 2019
eec641c
added missing files for update with cesm2.1.0
DirkOlivie Mar 1, 2019
3b5e8a0
Increased the error-tolerance in the ice thermo conservation test to …
JensBDebernard Apr 12, 2019
21ee605
Added noresm-cmip6 usermodes directory to CICE, and introduced the CI…
JensBDebernard Jun 15, 2019
8e991c6
Merge branch 'featureCESM2.1.0-OsloDevelopment-FixPrints' of /home/mo…
Feb 5, 2020
4c5ac59
clean unecessary orig files
Feb 5, 2020
c436361
Merge pull request #1 from annefou/cice5_20181109-Nor
DirkOlivie Mar 18, 2020
c81272a
Replaced MICOM with BLOM in namelist definitions.
matsbn May 5, 2020
472bbb5
Merge pull request #2 from matsbn/feature-replace-MICOM
JensBDebernard May 12, 2020
76700f3
corrections for intialization
Jun 2, 2020
f3bdd62
Merge pull request #3 from monsieuralok/cice5_20181109-Nor
JensBDebernard Jun 12, 2020
a9dc9bf
Modified paths to supported BLOM grid files.
matsbn Jun 15, 2020
695d06d
Merge pull request #4 from matsbn/cice5_20181109-Nor
JensBDebernard Jun 16, 2020
9fcf7f1
Configuration allowing for the global 0.125 grid setup
Feb 16, 2021
d2de345
Merge pull request #5 from AleksiNummelin/feature_highresBLOM
JensBDebernard Apr 6, 2021
9f1ab86
Merge branch 'cice5_20181109-Nor' into release-cesm2.2-Nor
MichaelSchulzMETNO Aug 23, 2021
4d5b612
Update config_component.xml to keep CICE4 option
MichaelSchulzMETNO Aug 27, 2021
0e54878
Update to keep CICE4 option
MichaelSchulzMETNO Sep 1, 2021
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
2 changes: 1 addition & 1 deletion bld/check_decomp.csh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/csh

set res = (gx3v7 gx1v6 tx0.1v2 ne240np4)
set res = (gx3v7 gx1v6 tx0.1v2 ne240np4 tnx1v1 tnx0.25v1 tnx1v3 tnx1v4)
set pe1 = (1 1 1 1)
set pex = (500 4000 60000 60000)

Expand Down
3 changes: 3 additions & 0 deletions cime_config/buildnml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,10 @@ def _create_namelists(case, confdir, infile, nmlgen):

cice_mode = case.get_value("CICE_MODE")
hgrid = case.get_value('ICE_GRID')
ocn_model = case.get_value('COMP_OCN')
config['hgrid'] = hgrid
config['cice_mode'] = cice_mode
config['ocn_model'] = ocn_model

cice_config_opts = case.get_value('CICE_CONFIG_OPTS')
if "cice5" in cice_config_opts:
Expand Down Expand Up @@ -155,6 +157,7 @@ def _create_namelists(case, confdir, infile, nmlgen):
'dynamics_nml',
'shortwave_nml',
'ponds_nml',
'snowphys_nml',
'forcing_nml',
'domain_nml',
'zbgc_nml',
Expand Down
25 changes: 14 additions & 11 deletions cime_config/config_component.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
<entry_id version="3.0">

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

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

Copy link

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 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>
Copy link

Choose a reason for hiding this comment

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

Keep line

<desc option="NORESM-CMIP6"> :with NORESM modifications appropriate for CMIP6 experiments</desc>
</description>

<entry id="COMP_ICE">
Expand All @@ -35,7 +36,7 @@
<entry id="CICE_CONFIG_OPTS">
<type>char</type>
<default_value></default_value>
<values match="last">
<values>
<value compset="_CICE[_%]"> -phys cice5 </value>
<value compset="_CICE%[^_]*CICE4"> -phys cice4 </value>
Copy link

Choose a reason for hiding this comment

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

Keep line

</values>
Expand All @@ -51,18 +52,18 @@
This is an advanced flag and should only be used by expert users.
</desc>
</entry>

<entry id="CICE_NAMELIST_OPTS">
Copy link

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?

<type>char</type>
<default_value></default_value>
<values>
<value compset="_CAM4">cam4=.true.</value>
</values>
<group>run_component_cice</group>
<file>env_run.xml</file>
<desc>CICE specific namelist settings for -namelist option</desc>
<default_value></default_value>
<values>
<value compset="_CAM4">cam4=.true.</value>
</values>
<group>run_component_cice</group>
<file>env_run.xml</file>
<desc>CICE specific namelist settings for -namelist option</desc>
</entry>

<entry id="CICE_AUTO_DECOMP">
<type>logical</type>
<valid_values>true,false</valid_values>
Expand Down Expand Up @@ -158,6 +159,8 @@
<values match="last">
<value
compset="_CICE[^_]*%CMIP6">$SRCROOT/components/cice/cime_config/usermods_dirs/cmip6</value>
<value
compset="_CICE[^_]*%NORESM-CMIP6">$SRCROOT/components/cice/cime_config/usermods_dirs/noresm-cmip6</value>
</values>
<group>run_component_cice</group>
<file>env_case.xml</file>
Expand Down
Loading