Skip to content

Commit

Permalink
config_pes.xml updates (#215)
Browse files Browse the repository at this point in the history 
* config_pes.xml updates:

remove unnecessary blocks: no need to distinguish T62 and TL319
increase NTASKS_OCN for cases with WW3.
'

* Miscellaneous runtime parameter changes:

- Introduce MOM6_WW3_CPL_METHOD xml variable controlling which wave
  coupling method gets used: most, legacy, or none
- For B cases, set MIN_SALINITY to 1.0e-6
- For t232, set Laplacian to False
- For t232, remove MEKE_ALPHA_RHINES, MEKE_ALPHA_DEFORM,
  MEKE_ALPHA_FRICT, MEKE_ALPHA_GRID, MEKE_CT

* set NTASKS_OCN to 896
  • Loading branch information
@alperaltuntas
alperaltuntas authored Jan 11, 2025
1 parent 9d0d916 commit a7e1611
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 283 deletions.
287 changes: 6 additions & 281 deletions cime_config/config_pes.xml
View file
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>
4 changes: 3 additions & 1 deletion param_templates/MOM_input.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -990,7 +990,9 @@ Global:
If true, use a Laplacian horizontal viscosity."
datatype: logical
units: Boolean
value: True
value:
$OCN_GRID == "tx2_3v2": False
else: True
KH:
description: |
"[m2 s-1] default = 0.0
Expand Down
5 changes: 4 additions & 1 deletion param_templates/json/MOM_input.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,10 @@
"description": "\"[Boolean] default = False\nIf true, use a Laplacian horizontal viscosity.\"\n",
"datatype": "logical",
"units": "Boolean",
"value": true
"value": {
"$OCN_GRID == \"tx2_3v2\"": false,
"else": true
}
},
"KH": {
"description": "\"[m2 s-1] default = 0.0\nThe background Laplacian horizontal viscosity.\"\n",
Expand Down

0 comments on commit a7e1611

Please sign in to comment.