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

Modified compsets with JRA interannual forcing to use year range 1958-2018 #437

Merged
merged 2 commits into from
Nov 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 5 additions & 5 deletions cime_config/config_compsets.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@

<compset>
<alias>NOIIAJRA</alias>
<lname>2000_DATM%JRA_SLND_CICE_BLOM_DROF%JRA_SGLC_SWAV</lname>
<lname>2000_DATM%JRA-1p4-2018_SLND_CICE_BLOM_DROF%JRA-1p4-2018_SGLC_SWAV</lname>
</compset>
<compset>
<!-- not valid for noresm2.5 -->
Expand All @@ -88,7 +88,7 @@

<compset>
<alias>NOIIAJRAOC</alias>
<lname>2000_DATM%JRA_SLND_CICE_BLOM%ECO_DROF%JRA_SGLC_SWAV</lname>
<lname>2000_DATM%JRA-1p4-2018_SLND_CICE_BLOM%ECO_DROF%JRA-1p4-2018_SGLC_SWAV</lname>
</compset>
<compset>
<!-- not valid for noresm2.5 -->
Expand All @@ -98,7 +98,7 @@

<compset>
<alias>NOIIAJRAOC1850</alias>
<lname>1850_DATM%JRA_SLND_CICE_BLOM%ECO_DROF%JRA_SGLC_SWAV</lname>
<lname>1850_DATM%JRA-1p4-2018_SLND_CICE_BLOM%ECO_DROF%JRA-1p4-2018_SGLC_SWAV</lname>
</compset>
<compset>
<!-- not valid for noresm2.5 -->
Expand All @@ -108,7 +108,7 @@

<compset>
<alias>NOIIAJRAOC20TR</alias>
<lname>20TR_DATM%JRA_SLND_CICE_BLOM%ECO_DROF%JRA_SGLC_SWAV</lname>
<lname>20TR_DATM%JRA-1p4-2018_SLND_CICE_BLOM%ECO_DROF%JRA-1p4-2018_SGLC_SWAV</lname>
</compset>
<compset>
<!-- not valid for noresm2.5 -->
Expand Down Expand Up @@ -143,7 +143,7 @@
<value compset="20TR_DATM%IAF_SLND_CICE%NORESM-CMIP6_BLOM%ECO_DROF%IAF_SGLC_SWAV">1700-01-01</value>
<value compset="20TR_DATM%JRA_SLND_CICE%NORESM-CMIP6_BLOM%ECO_DROF%JRA_SGLC_SWAV">1653-01-01</value>
<value compset="20TR_DATM%IAF_SLND_CICE_BLOM%ECO_DROF%IAF_SGLC_SWAV">1700-01-01</value>
<value compset="20TR_DATM%JRA_SLND_CICE_BLOM%ECO_DROF%JRA_SGLC_SWAV">1653-01-01</value>
<value compset="20TR_DATM%JRA-1p4-2018_SLND_CICE_BLOM%ECO_DROF%JRA-1p4-2018_SGLC_SWAV">1653-01-01</value>
</values>
</entry>
</entries>
Expand Down
56 changes: 9 additions & 47 deletions cime_config/config_pes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -246,9 +246,9 @@
<comment>none</comment>
<ntasks>
<ntasks_atm>128</ntasks_atm>
<ntasks_rof>16</ntasks_rof>
<ntasks_ice>96</ntasks_ice>
<ntasks_ocn>156</ntasks_ocn>
<ntasks_rof>128</ntasks_rof>
<ntasks_ice>128</ntasks_ice>
<ntasks_ocn>354</ntasks_ocn>
<ntasks_cpl>128</ntasks_cpl>
<ntasks_lnd>128</ntasks_lnd>
<ntasks_glc>128</ntasks_glc>
Expand All @@ -267,8 +267,8 @@
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_rof>16</rootpe_rof>
<rootpe_ice>32</rootpe_ice>
<rootpe_rof>0</rootpe_rof>
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>128</rootpe_ocn>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
Expand All @@ -278,10 +278,11 @@
</mach>
</grid>

<!-- 512 pes is minimum setting for normal job size on betzy !-->
<grid name="a%TL319.+oi%tnx1v4">
<mach name="any">
<pes pesize="M" compset="_DATM.*_BLOM%ECO">
<comment>none</comment>
<mach name="betzy">
<pes pesize="L" compset="any">
<comment>Large pe-layout with 512 pes in total</comment>
<ntasks>
<ntasks_atm>128</ntasks_atm>
<ntasks_rof>128</ntasks_rof>
Expand Down Expand Up @@ -315,45 +316,6 @@
</pes>
</mach>
</grid>

<!-- 512 pes is minimum setting for normal job size on betzy !-->
<grid name="a%TL319.+oi%tnx1v4">
<mach name="betzy">
<pes pesize="L" compset="_DATM.*_BLOM">
<comment>Large pe-layout with 512 pes in total</comment>
<ntasks>
<ntasks_atm>1</ntasks_atm>
<ntasks_rof>1</ntasks_rof>
<ntasks_ice>154</ntasks_ice>
<ntasks_ocn>354</ntasks_ocn>
<ntasks_cpl>158</ntasks_cpl>
<ntasks_lnd>1</ntasks_lnd>
<ntasks_glc>1</ntasks_glc>
<ntasks_wav>1</ntasks_wav>
</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>155</rootpe_atm>
<rootpe_lnd>156</rootpe_lnd>
<rootpe_rof>157</rootpe_rof>
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>158</rootpe_ocn>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<!-- GRID: TL319_tn14 : end !-->

<grid name="a%0.9x1.25.+oi%tnx1v4|a%1.9x2.5.+oi%tnx1v4">
Expand Down