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

New compsets for JRA forcing and fix for PE layout #431

Merged
merged 1 commit into from
Nov 27, 2024
Merged

New compsets for JRA forcing and fix for PE layout #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 29 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 @@ -92,10 +92,20 @@
</compset>
<compset>
<!-- not valid for noresm2.5 -->
<alias>NOIIAJRAOC</alias>
<alias>N2NOIIAJRAOC</alias>
<lname>2000_DATM%JRA_SLND_CICE%NORESM-CMIP6_BLOM%ECO_DROF%JRA_SGLC_SWAV</lname>
</compset>

<compset>
<alias>NOIIAJRAOC1850</alias>
<lname>1850_DATM%JRA_SLND_CICE_BLOM%ECO_DROF%JRA_SGLC_SWAV</lname>
</compset>
<compset>
<!-- not valid for noresm2.5 -->
<alias>N2NOIIAJRAOC1850</alias>
<lname>1850_DATM%JRA_SLND_CICE%NORESM-CMIP6_BLOM%ECO_DROF%JRA_SGLC_SWAV</lname>
</compset>

<compset>
<alias>NOIIAJRAOC20TR</alias>
<lname>20TR_DATM%JRA_SLND_CICE_BLOM%ECO_DROF%JRA_SGLC_SWAV</lname>
Expand All @@ -106,6 +116,22 @@
<lname>20TR_DATM%JRA_SLND_CICE%NORESM-CMIP6_BLOM%ECO_DROF%JRA_SGLC_SWAV</lname>
</compset>


<!-- JRA repeat year forcing - no prognostic wave -->

<compset>
<alias>NOINYJRARYF1961OC</alias>
<lname>1850_DATM%JRARYF1961_SLND_CICE_BLOM%ECO_DROF%JRARYF1961_SGLC_SWAV</lname>
</compset>
<compset>
<!-- not valid for noresm2.5 -->
<alias>N2NOINYJRARYF1961OC</alias>
<lname>1850_DATM%JRARYF1961_SLND_CICE%NORESM-CMIP6_BLOM%ECO_DROF%JRARYF_SGLC_SWAV</lname>
</compset>


<!-- CPLHIST forcing - no prognostic wave -->

<compset>
<alias>NOICPLHISTOC</alias>
<lname>1850_DATM%CPLHIST_SLND_CICE_BLOM%ECO_DROF%CPLHIST_SGLC_SWAV</lname>
Expand All @@ -116,6 +142,8 @@
<values match="last">
<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>
</values>
</entry>
</entries>
Expand Down
8 changes: 4 additions & 4 deletions cime_config/config_pes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,10 @@
<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_atm>80</rootpe_atm>
<rootpe_lnd>80</rootpe_lnd>
<rootpe_rof>80</rootpe_rof>
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>81</rootpe_ocn>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
Expand Down