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

Jump to bottom

Merging master into feature-hamocc_beyond-CMIP6 #268

Merged
merged 11 commits into from
Aug 28, 2023
Merged

Merging master into feature-hamocc_beyond-CMIP6 #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ce17af0
fixed problems encountered when using blom with CIME testing
mvertens Jul 14, 2023
d2fe35b
added wavice user mods for testing
mvertens Jul 14, 2023
ab9a98e
updates to add ocn_in.readme and remove from buildnml
mvertens Jul 25, 2023
e8205fb
rename of aux tests
mvertens Jul 26, 2023
de96479
update to PE layout to resolve issue #258
mvertens Jul 26, 2023
537fb01
fixed history file name when daily output is needed for cesm testing
mvertens Jul 28, 2023
2bb8e7c
Merge pull request #262 from mvertens/feature/add_tests
TomasTorsvik Aug 1, 2023
a7ad589
Add file mo_boxatm.F90 making it possible to run HAMOCC with a well-m…
JorgSchwinger Aug 2, 2023
4930ba4
Updated meson.build
JorgSchwinger Aug 3, 2023
aa737aa
Add capability to run C-isotopes with sediment code switched on (test…
JorgSchwinger Aug 3, 2023
26ea524
Feature iHAMOCC nml (#261)
jmaerz Aug 9, 2023
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
734 changes: 130 additions & 604 deletions cime_config/buildnml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion cime_config/config_component.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@
<valid_values>TRUE,FALSE</valid_values>
<default_value>FALSE</default_value>
<values>
<value compset="%VSLSC">TRUE</value>
<value compset="BGC%.*BRF.*">TRUE</value>
</values>
<group>build_component_blom</group>
<file>env_build.xml</file>
Expand Down
27 changes: 17 additions & 10 deletions cime_config/config_compsets.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

<help>
=========================================
compset naming convention
compset naming convention
=========================================
The compset longname below has the specified order
The compset longname below has the specified order
atm, lnd, ice, ocn, river, glc wave cesm-options

The notation for the compset longname is
Expand All @@ -20,24 +20,33 @@
ROF = [RTM, SROF]
GLC = [CISM1, CISM2, SGLC]
WAV = [SWAV]
BGC = optional BGC scenario
BGC = optional BGC scenario

The OPTIONAL %phys attributes specify submodes of the given system
For example DOCN%DOM is the data ocean model for DOCN
ALL the possible %phys choices for each component are listed
ALL the possible %phys choices for each component are listed
with the -list command for create_newcase
ALL data models must have a %phys option that corresponds to the data model mode
ALL data models must have a %phys option that corresponds to the data model mode

Each compset node is associated with the following elements
- lname
- alias
- lname
- alias
- support (optional description of the support level for this compset)
Each compset node can also have the following attributes
- grid (optional regular expression match for grid to work with the compset)
</help>

<compset>
<alias>NOINY</alias>
<alias>NOINY_WW3</alias>
<lname>2000_DATM%NYF_SLND_CICE_BLOM_DROF%NYF_SGLC_WW3DEV</lname>
</compset>
<compset>
<alias>NOINYOC_WW3</alias>
<lname>2000_DATM%NYF_SLND_CICE_BLOM%ECO_DROF%NYF_SGLC_WW3DEV</lname>
</compset>

<compset>
<alias>NOINY</alias>
<lname>2000_DATM%NYF_SLND_CICE_BLOM_DROF%NYF_SGLC_SWAV</lname>
<science_support grid="T62_tn14"/>
<science_support grid="T62_tn21"/>
Expand Down Expand Up @@ -107,5 +116,3 @@
</entries>

</compsets>


38 changes: 19 additions & 19 deletions cime_config/config_pes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,14 @@
<pes pesize="M" compset="_DATM.*_BLOM%ECO">
<comment>none</comment>
<ntasks>
<ntasks_atm>1</ntasks_atm>
<ntasks_rof>1</ntasks_rof>
<ntasks_ice>96</ntasks_ice>
<ntasks_atm>128</ntasks_atm>
<ntasks_rof>128</ntasks_rof>
<ntasks_ice>128</ntasks_ice>
<ntasks_ocn>354</ntasks_ocn>
<ntasks_cpl>126</ntasks_cpl>
<ntasks_lnd>1</ntasks_lnd>
<ntasks_glc>1</ntasks_glc>
<ntasks_wav>1</ntasks_wav>
<ntasks_cpl>128</ntasks_cpl>
<ntasks_lnd>128</ntasks_lnd>
<ntasks_glc>128</ntasks_glc>
<ntasks_wav>128</ntasks_wav>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
Expand All @@ -138,11 +138,11 @@
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>96</rootpe_atm>
<rootpe_lnd>97</rootpe_lnd>
<rootpe_rof>98</rootpe_rof>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_rof>0</rootpe_rof>
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>126</rootpe_ocn>
<rootpe_ocn>128</rootpe_ocn>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
<rootpe_cpl>0</rootpe_cpl>
Expand All @@ -155,14 +155,14 @@
<pes pesize="M" compset="_DATM.*_BLOM%ECO">
<comment>none</comment>
<ntasks>
<ntasks_atm>192</ntasks_atm>
<ntasks_rof>192</ntasks_rof>
<ntasks_ice>192</ntasks_ice>
<ntasks_atm>128</ntasks_atm>
<ntasks_rof>128</ntasks_rof>
<ntasks_ice>128</ntasks_ice>
<ntasks_ocn>354</ntasks_ocn>
<ntasks_cpl>192</ntasks_cpl>
<ntasks_lnd>1</ntasks_lnd>
<ntasks_glc>1</ntasks_glc>
<ntasks_wav>1</ntasks_wav>
<ntasks_cpl>128</ntasks_cpl>
<ntasks_lnd>128</ntasks_lnd>
<ntasks_glc>128</ntasks_glc>
<ntasks_wav>128</ntasks_wav>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
Expand All @@ -179,7 +179,7 @@
<rootpe_lnd>0</rootpe_lnd>
<rootpe_rof>0</rootpe_rof>
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>192</rootpe_ocn>
<rootpe_ocn>128</rootpe_ocn>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
<rootpe_cpl>0</rootpe_cpl>
Expand Down
Loading
Loading