Skip to content
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
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
path = MOM6
url = https://github.com/NCAR/MOM6.git
fxDONOTUSEurl = https://github.com/NCAR/MOM6.git
fxtag = dev/ncar_260504
fxtag = dev/ncar_260624
fxrequired = AlwaysRequired

[submodule "stochastic_physics"]
Expand Down
1 change: 1 addition & 0 deletions cime_config/config_component.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
<values>
<value grid="oi%tx2_3v2">hycom1</value>
<value grid="oi%tx2_3v3">hycom1</value>
<value grid="oi%tx2_0v1">hycom1</value>
<value grid="oi%tx0.25v1">hycom1</value>
<value grid="oi%MISOMIP">sigma_shelf_zstar</value>
</values>
Expand Down
38 changes: 38 additions & 0 deletions cime_config/config_pes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,44 @@
</mach>
</grid>

<grid name="a%(TL319|T62).+oi%tx2_0v1">
<mach name="derecho">
<pes pesize="any" compset="any">
<comment>tx2_0v1 (2-deg): ocn and ice on 128 PEs; ocean concurrent</comment>
<ntasks>
<ntasks_atm>128</ntasks_atm>
<ntasks_rof>128</ntasks_rof>
<ntasks_cpl>128</ntasks_cpl>
<ntasks_ice>128</ntasks_ice>
<ntasks_ocn>128</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>128</rootpe_ocn>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_wav>0</rootpe_wav>
<rootpe_glc>0</rootpe_glc>
</rootpe>
</pes>
</mach>
</grid>

<grid name="a%(TL319|T62).+oi%tx0.25v1">
<mach name="derecho">
<pes pesize="any" compset="any">
Expand Down
11 changes: 11 additions & 0 deletions cime_config/testdefs/testlist_mom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,17 @@
<option name="wallclock">01:00:00</option>
</options>
</test>
<test name="ERS_Ld5" grid="TL319_t201" compset="GW_JRA">
<machines>
<machine name="derecho" compiler="intel" category="aux_mom"/>
<machine name="derecho" compiler="intel" category="pr_mom"/>
<machine name="derecho" compiler="intel" category="prealpha"/>
<machine name="derecho" compiler="intel" category="prebeta"/>
</machines>
<options>
<option name="wallclock">01:30:00</option>
</options>
</test>
<!-- fast_mom: a test suite with coarse grids for fast feedback. -->
<test name="SMS_D" grid="TL319_t232" compset="G_JRA_RYF" testmods="mom/tx3deg">
<machines>
Expand Down
Loading
Loading