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

config_pes.xml updates #215

Merged
merged 3 commits into from
Jan 11, 2025
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
20 changes: 20 additions & 0 deletions cime_config/config_component.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,26 @@
</desc>
</entry>

<entry id="MOM6_WW3_CPL_METHOD">
<type>char</type>
<valid_values>none,legacy,most</valid_values>
<default_value>most</default_value>
<values>
<value grid="w%ww3a">legacy</value>
<value compset="_SWAV|_DWAV">none</value>
</values>
<group>run_component_mom</group>
<file>env_run.xml</file>
<desc> This variable determines the method used to couple MOM6 to WW3.
The method "most" corresponds to the newest coupling method
that turns on FPMix parameterization, Stokes_Bands coupling,
and Stokes similarity package. The method "legacy" corresponds to
the older coupling method based on receiving a Langmuir number from
WW3 and passing it to CVMix. When set to "none", no wave
parameterization is used.
</desc>
</entry>

<entry id="OCN_DIAG_MODE">
<type>char</type>
<valid_values>spinup,production,development,none</valid_values>
Expand Down
287 changes: 6 additions & 281 deletions cime_config/config_pes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
</mach>
</grid>

<grid name="a%T62.+oi%(tx0.66v1|tx2_3v2)">
<grid name="a%(TL319|T62).+oi%tx2_3v2">
<mach name="any">
<pes pesize="any" compset="any">
<comment>none</comment>
Expand Down Expand Up @@ -184,7 +184,7 @@
<ntasks_rof>128</ntasks_rof>
<ntasks_cpl>128</ntasks_cpl>
<ntasks_ice>128</ntasks_ice>
<ntasks_ocn>384</ntasks_ocn>
<ntasks_ocn>896</ntasks_ocn>
<ntasks_lnd>1</ntasks_lnd>
<ntasks_wav>256</ntasks_wav>
<ntasks_glc>1</ntasks_glc>
Expand All @@ -204,9 +204,9 @@
<rootpe_rof>0</rootpe_rof>
<rootpe_cpl>0</rootpe_cpl>
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>256</rootpe_ocn>
<rootpe_ocn>384</rootpe_ocn>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_wav>0</rootpe_wav>
<rootpe_wav>128</rootpe_wav>
<rootpe_glc>0</rootpe_glc>
</rootpe>
</pes>
Expand Down Expand Up @@ -380,245 +380,7 @@
</mach>
</grid>

<grid name="a%TL319.+oi%(tx0.66v1|tx2_3v2)">
<mach name="any">
<pes pesize="any" compset="_DATM.+_DICE.+_SWAV">
<comment>none</comment>
<ntasks>
<ntasks_atm>48</ntasks_atm>
<ntasks_rof>48</ntasks_rof>
<ntasks_cpl>48</ntasks_cpl>
<ntasks_ice>48</ntasks_ice>
<ntasks_ocn>144</ntasks_ocn>
<ntasks_lnd>1</ntasks_lnd>
<ntasks_wav>1</ntasks_wav>
<ntasks_glc>1</ntasks_glc>
</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_rof>0</rootpe_rof>
<rootpe_cpl>0</rootpe_cpl>
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>48</rootpe_ocn>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_wav>0</rootpe_wav>
<rootpe_glc>0</rootpe_glc>
</rootpe>
</pes>
<pes pesize="any" compset="_DATM.+_CICE.*_MOM6(?!.*%MARBL-BIO).+_SWAV">
<comment>none</comment>
<ntasks>
<ntasks_atm>96</ntasks_atm>
<ntasks_rof>96</ntasks_rof>
<ntasks_cpl>96</ntasks_cpl>
<ntasks_ice>96</ntasks_ice>
<ntasks_ocn>144</ntasks_ocn>
<ntasks_lnd>1</ntasks_lnd>
<ntasks_wav>1</ntasks_wav>
<ntasks_glc>1</ntasks_glc>
</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_rof>0</rootpe_rof>
<rootpe_cpl>0</rootpe_cpl>
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>96</rootpe_ocn>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_wav>0</rootpe_wav>
<rootpe_glc>0</rootpe_glc>
</rootpe>
</pes>
</mach>
<mach name="derecho">
<pes pesize="any" compset="_DATM.+_DICE.*_MOM6(?!.*%MARBL-BIO).+_SWAV">
<comment>none</comment>
<ntasks>
<ntasks_atm>128</ntasks_atm>
<ntasks_rof>128</ntasks_rof>
<ntasks_cpl>128</ntasks_cpl>
<ntasks_ice>128</ntasks_ice>
<ntasks_ocn>896</ntasks_ocn>
<ntasks_lnd>1</ntasks_lnd>
<ntasks_wav>1</ntasks_wav>
<ntasks_glc>1</ntasks_glc>
</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_rof>0</rootpe_rof>
<rootpe_cpl>0</rootpe_cpl>
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>128</rootpe_ocn>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_wav>0</rootpe_wav>
<rootpe_glc>0</rootpe_glc>
</rootpe>
</pes>
<pes pesize="any" compset="_DATM.+_DICE.*_MOM6%[^_]*MARBL-BIO.+_SWAV">
<comment>none</comment>
<ntasks>
<ntasks_atm>128</ntasks_atm>
<ntasks_rof>128</ntasks_rof>
<ntasks_cpl>128</ntasks_cpl>
<ntasks_ice>128</ntasks_ice>
<ntasks_ocn>2560</ntasks_ocn>
<ntasks_lnd>1</ntasks_lnd>
<ntasks_wav>1</ntasks_wav>
<ntasks_glc>1</ntasks_glc>
</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_rof>0</rootpe_rof>
<rootpe_cpl>0</rootpe_cpl>
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>128</rootpe_ocn>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_wav>0</rootpe_wav>
<rootpe_glc>0</rootpe_glc>
</rootpe>
</pes>
<pes pesize="any" compset="_DATM.+_CICE.*_MOM6(?!.*%MARBL-BIO).+_SWAV">
<comment>none</comment>
<ntasks>
<ntasks_atm>128</ntasks_atm>
<ntasks_rof>128</ntasks_rof>
<ntasks_cpl>128</ntasks_cpl>
<ntasks_ice>128</ntasks_ice>
<ntasks_ocn>896</ntasks_ocn>
<ntasks_lnd>1</ntasks_lnd>
<ntasks_wav>1</ntasks_wav>
<ntasks_glc>1</ntasks_glc>
</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_rof>0</rootpe_rof>
<rootpe_cpl>0</rootpe_cpl>
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>128</rootpe_ocn>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_wav>0</rootpe_wav>
<rootpe_glc>0</rootpe_glc>
</rootpe>
</pes>
<pes pesize="any" compset="_DATM.+_CICE.*_MOM6%[^_]*MARBL-BIO.+_SWAV">
<comment>none</comment>
<ntasks>
<ntasks_atm>128</ntasks_atm>
<ntasks_rof>128</ntasks_rof>
<ntasks_cpl>128</ntasks_cpl>
<ntasks_ice>128</ntasks_ice>
<ntasks_ocn>2560</ntasks_ocn>
<ntasks_lnd>1</ntasks_lnd>
<ntasks_wav>1</ntasks_wav>
<ntasks_glc>1</ntasks_glc>
</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_rof>0</rootpe_rof>
<rootpe_cpl>0</rootpe_cpl>
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>128</rootpe_ocn>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_wav>0</rootpe_wav>
<rootpe_glc>0</rootpe_glc>
</rootpe>
</pes>
<pes pesize="any" compset="DATM.+CICE.+WW3">
<comment>none</comment>
<ntasks>
<ntasks_atm>128</ntasks_atm>
<ntasks_rof>128</ntasks_rof>
<ntasks_cpl>128</ntasks_cpl>
<ntasks_ice>128</ntasks_ice>
<ntasks_ocn>384</ntasks_ocn>
<ntasks_lnd>1</ntasks_lnd>
<ntasks_wav>256</ntasks_wav>
<ntasks_glc>1</ntasks_glc>
</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_rof>0</rootpe_rof>
<rootpe_cpl>0</rootpe_cpl>
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>256</rootpe_ocn>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_wav>0</rootpe_wav>
<rootpe_glc>0</rootpe_glc>
</rootpe>
</pes>
</mach>
</grid>

<grid name="a%T62.+oi%tx0.25v1">
<grid name="a%(TL319|T62).+oi%tx0.25v1">
<mach name="derecho">
<pes pesize="any" compset="any">
<comment>none</comment>
Expand Down Expand Up @@ -660,7 +422,7 @@
<ntasks_rof>128</ntasks_rof>
<ntasks_cpl>128</ntasks_cpl>
<ntasks_ice>256</ntasks_ice>
<ntasks_ocn>512</ntasks_ocn>
<ntasks_ocn>896</ntasks_ocn>
<ntasks_lnd>1</ntasks_lnd>
<ntasks_wav>1</ntasks_wav>
<ntasks_glc>1</ntasks_glc>
Expand Down Expand Up @@ -689,41 +451,4 @@
</mach>
</grid>

<grid name="oi%tx0.66v1.+w%wtx0.66v1">
<mach name="derecho">
<pes pesize="any" compset="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>128</ntasks_atm>
<ntasks_rof>128</ntasks_rof>
<ntasks_cpl>128</ntasks_cpl>
<ntasks_ice>128</ntasks_ice>
<ntasks_ocn>512</ntasks_ocn>
<ntasks_lnd>1</ntasks_lnd>
<ntasks_wav>128</ntasks_wav>
<ntasks_glc>1</ntasks_glc>
</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_rof>0</rootpe_rof>
<rootpe_cpl>0</rootpe_cpl>
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>256</rootpe_ocn>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_wav>128</rootpe_wav>
<rootpe_glc>0</rootpe_glc>
</rootpe>
</pes>
</mach>
</grid>
</config_pes>
Loading
Loading