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

addition of nb1850proto compset, test, and pes #502

Open
wants to merge 4 commits into
base: noresm_develop
Choose a base branch
from
Open

addition of nb1850proto compset, test, and pes #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f69c22
addition of nb1850proto compset
mvertens Feb 1, 2024
cf4aa11
updates for CAM external
mvertens Feb 5, 2024
ba67ccb
update for ccs_config
mvertens Feb 23, 2024
77c6d28
udpated CAM tag in Externals.cfg
mvertens Feb 23, 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
4 changes: 2 additions & 2 deletions Externals.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ required = True

[ccs_config]
protocol = git
tag = ccs_config_noresm0.0.23
tag = ccs_config_noresm0.0.24
repo_url = https://github.com/NorESMhub/ccs_config_noresm.git
local_path = ccs_config
required = True
Expand Down Expand Up @@ -59,7 +59,7 @@ required = True

[cam]
protocol = git
tag = noresm_v8_cam6_3_123
tag = noresm_v9_cam6_3_123
repo_url = https://github.com/NorESMhub/CAM
local_path = components/cam
externals = Externals_CAM.cfg
Expand Down
10 changes: 9 additions & 1 deletion cime_config/config_compsets.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,15 @@
- grid (optional regular expression match for grid to work with the compset)
</help>

<!-- 1850 compsets Default, Mosart, Wave for CESM2 -->
<!-- N Compsets -->
<!-- convert CAM to FV output -->

<compset>
<alias>NB1850proto</alias>
<lname>1850_CAM%DEV%LT%NORESM%CAMoslo_CLM51%SP_CICE_BLOM_MOSART_SGLC_SWAV</lname>
</compset>

<!-- B compsets -->

<compset>
<alias>B1850</alias>
Expand Down
250 changes: 125 additions & 125 deletions cime_config/config_pes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,151 +5,151 @@
<grid name="any">
<mach name="any">
<pes pesize="any" compset="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>-3</ntasks_atm>
<ntasks_lnd>-1</ntasks_lnd>
<ntasks_rof>-1</ntasks_rof>
<ntasks_ice>-2</ntasks_ice>
<ntasks_ocn>-1</ntasks_ocn>
<ntasks_glc>-1</ntasks_glc>
<ntasks_wav>-1</ntasks_wav>
<ntasks_cpl>-3</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_rof>0</rootpe_rof>
<rootpe_ice>-1</rootpe_ice>
<rootpe_ocn>-3</rootpe_ocn>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
<comment>none</comment>
<ntasks>
<ntasks_atm>-3</ntasks_atm>
<ntasks_lnd>-1</ntasks_lnd>
<ntasks_rof>-1</ntasks_rof>
<ntasks_ice>-2</ntasks_ice>
<ntasks_ocn>-1</ntasks_ocn>
<ntasks_glc>-1</ntasks_glc>
<ntasks_wav>-1</ntasks_wav>
<ntasks_cpl>-3</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_rof>0</rootpe_rof>
<rootpe_ice>-1</rootpe_ice>
<rootpe_ocn>-3</rootpe_ocn>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>

<grid name="a%1.9x2.5.+l%1.9x2.5.+oi%gx1">
<mach name="any">
<pes pesize="any" compset="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>-4</ntasks_atm>
<ntasks_lnd>-2</ntasks_lnd>
<ntasks_rof>-2</ntasks_rof>
<ntasks_ice>-2</ntasks_ice>
<ntasks_ocn>-2</ntasks_ocn>
<ntasks_glc>-1</ntasks_glc>
<ntasks_wav>-4</ntasks_wav>
<ntasks_cpl>-4</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_rof>0</rootpe_rof>
<rootpe_ice>-2</rootpe_ice>
<rootpe_ocn>-4</rootpe_ocn>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
<comment>none</comment>
<ntasks>
<ntasks_atm>-4</ntasks_atm>
<ntasks_lnd>-2</ntasks_lnd>
<ntasks_rof>-2</ntasks_rof>
<ntasks_ice>-2</ntasks_ice>
<ntasks_ocn>-2</ntasks_ocn>
<ntasks_glc>-1</ntasks_glc>
<ntasks_wav>-4</ntasks_wav>
<ntasks_cpl>-4</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_rof>0</rootpe_rof>
<rootpe_ice>-2</rootpe_ice>
<rootpe_ocn>-4</rootpe_ocn>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>

<grid name="a%ne30np4.+l%ne30np4.+oi%gx1" >
<grid name="a%ne30np4.pg3.+oi%tnx1v4" >
<mach name="any">
<pes pesize="any" compset="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>-8</ntasks_atm>
<ntasks_lnd>-8</ntasks_lnd>
<ntasks_rof>-8</ntasks_rof>
<ntasks_ice>-8</ntasks_ice>
<ntasks_ocn>-8</ntasks_ocn>
<ntasks_glc>-8</ntasks_glc>
<ntasks_wav>-4</ntasks_wav>
<ntasks_cpl>-8</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_rof>0</rootpe_rof>
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>0</rootpe_ocn>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
<comment>none</comment>
<ntasks>
<ntasks_atm>-8</ntasks_atm>
<ntasks_lnd>-8</ntasks_lnd>
<ntasks_rof>-8</ntasks_rof>
<ntasks_ice>-8</ntasks_ice>
<ntasks_ocn>-1</ntasks_ocn>
<ntasks_glc>-8</ntasks_glc>
<ntasks_wav>-4</ntasks_wav>
<ntasks_cpl>-8</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_rof>0</rootpe_rof>
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>-8</rootpe_ocn>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>

<grid name="a%0.9x1.25.+l%0.9x1.25.+oi%gx1" >
<mach name='any'>
<pes pesize="any" compset="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>-8</ntasks_atm>
<ntasks_lnd>-4</ntasks_lnd>
<ntasks_rof>-4</ntasks_rof>
<ntasks_ice>-4</ntasks_ice>
<ntasks_ocn>-1</ntasks_ocn>
<ntasks_glc>-8</ntasks_glc>
<ntasks_wav>-4</ntasks_wav>
<ntasks_cpl>-8</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_rof>0</rootpe_rof>
<rootpe_ice>-4</rootpe_ice>
<rootpe_ocn>-8</rootpe_ocn>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
<comment>none</comment>
<ntasks>
<ntasks_atm>-8</ntasks_atm>
<ntasks_lnd>-4</ntasks_lnd>
<ntasks_rof>-4</ntasks_rof>
<ntasks_ice>-4</ntasks_ice>
<ntasks_ocn>-1</ntasks_ocn>
<ntasks_glc>-8</ntasks_glc>
<ntasks_wav>-4</ntasks_wav>
<ntasks_cpl>-8</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_rof>0</rootpe_rof>
<rootpe_ice>-4</rootpe_ice>
<rootpe_ocn>-8</rootpe_ocn>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
Expand Down
11 changes: 11 additions & 0 deletions cime_config/testlist_allactive.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
<?xml version="1.0"?>
<testlist version="2.0">

<!-- begin noresm tests -->

<test name="ERP_Ld3" grid="ne30pg3_tn14" compset="NB1850proto" testmods="allactive/defaultio--allactive/nb1850proto">
<machines>
<machine name="betzy" compiler="intel" category="aux_noresm"/>
</machines>
<options>
<option name="wallclock"> 00:30:00 </option>
</options>
</test>

<test name="ERS_Ld3" grid="f19_tn14_wtn14" compset="2000_CAM60_CLM50%SP_CICE_BLOM_MOSART_SGLC_WW3DEV_SESP" testmods="allactive/defaultio--allactive/wavice">
<machines>
<machine name="betzy" compiler="intel" category="aux_noresm"/>
Expand Down
6 changes: 0 additions & 6 deletions cime_config/testmods_dirs/allactive/defaultio/user_nl_pop
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions cime_config/testmods_dirs/allactive/nb1850proto/shell_commands
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
./xmlchange BLOM_VCOORD=cntiso_hybrid
./xmlchange BLOM_TURBULENT_CLOSURE=
4 changes: 4 additions & 0 deletions cime_config/testmods_dirs/allactive/nb1850proto/user_nl_cam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
interpolate_output = .true.
interpolate_gridtype = 1
interpolate_nlon = 288
interpolate_nlat = 192
1 change: 1 addition & 0 deletions cime_config/testmods_dirs/allactive/nb1850proto/user_nl_cice
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
distribution_type="sectrobin"
2 changes: 2 additions & 0 deletions cime_config/usermods_dirs/nb1850proto/shell_commands
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
./xmlchange BLOM_VCOORD=cntiso_hybrid
./xmlchange BLOM_TURBULENT_CLOSURE=
4 changes: 4 additions & 0 deletions cime_config/usermods_dirs/nb1850proto/user_nl_cam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
interpolate_output = .true.
interpolate_gridtype = 1
interpolate_nlon = 288
interpolate_nlat = 192
1 change: 1 addition & 0 deletions cime_config/usermods_dirs/nb1850proto/user_nl_cice
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
distribution_type="sectrobin"