Skip to content

Commit 4ec21f8

Browse files
manishvenumanishvenu
committed
MOM_interface changes for regional, only todo is the mom6_domian tupe mom_input changes
1 parent aa948d4 commit 4ec21f8

3 files changed

Lines changed: 193 additions & 1 deletion

File tree

‎cime_config/config_component.xml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
<entry_id version="3.0">
66

77
<description>
8-
<desc ocn="MOM6[%MARBL-BIO][%MARBL-ABIO]">MOM6 OCEAN </desc>
8+
<desc ocn="MOM6[%REGIONAL][%MARBL-BIO][%MARBL-ABIO]">MOM6 OCEAN </desc>
99
<desc option="MARBL-BIO">MARBL Biogeochemistry Tracer Library base biotic tracers</desc>
1010
<desc option="MARBL-ABIO">MARBL Biogeochemistry Tracer Library abiotic DIC tracers</desc>
11+
<desc option="REGIONAL">Regional Setup</desc>
1112
</description>
1213

1314
<entry id="COMP_OCN">
@@ -204,6 +205,19 @@
204205
</desc>
205206
</entry>
206207

208+
<entry id="MOM6_DOMAIN_TYPE">
209+
<type>char</type>
210+
<valid_values>REGIONAL,GLOBAL</valid_values>
211+
<default_value>GLOBAL</default_value>
212+
<values>
213+
<value compset="_MOM6%REGIONAL">REGIONAL</value>
214+
</values>
215+
<group>case_comp</group>
216+
<file>env_run.xml</file>
217+
<desc> Flag to turn on/off the regional/global defaults for MOM_input
218+
</desc>
219+
</entry>
220+
207221
<help>
208222
=========================================
209223
MOM6 naming conventions

‎cime_config/config_compsets.xml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,28 @@
7373
<lname>1850_DATM%JRA_SLND_DICE%SSMI_MOM6%MARBL-ABIO_DROF%JRA_SGLC_SWAV</lname>
7474
</compset>
7575

76+
<!-- C Regional compsets -->
77+
78+
<compset>
79+
<alias>CR_JRA</alias>
80+
<lname>1850_DATM%JRA_SLND_SICE_MOM6%REGIONAL_SROF_SGLC_SWAV</lname>
81+
</compset>
82+
83+
<compset>
84+
<alias>CR1850MARBL_JRA</alias>
85+
<lname>1850_DATM%JRA_SLND_SICE_MOM6%REGIONAL%MARBL-BIO_SROF_SGLC_SWAV</lname>
86+
</compset>
87+
88+
<compset>
89+
<alias>CR_JRA_GLOFAS</alias>
90+
<lname>1850_DATM%JRA_SLND_SICE_MOM6%REGIONAL_DROF%GLOFAS_SGLC_SWAV</lname>
91+
</compset>
92+
93+
<compset>
94+
<alias>CR1850MARBL_JRA_GLOFAS</alias>
95+
<lname>1850_DATM%JRA_SLND_SICE_MOM6%REGIONAL%MARBL-BIO_DROF%GLOFAS_SGLC_SWAV</lname>
96+
</compset>
97+
7698
<!-- G compsets -->
7799

78100
<compset>
@@ -120,4 +142,26 @@
120142
<lname>1850_DATM%JRA-1p5-2023_SLND_CICE_MOM6%MARBL-ABIO_DROF%JRA-1p5-2023_SGLC_WW3</lname>
121143
</compset>
122144

145+
<!-- G Regional compsets -->
146+
147+
<compset>
148+
<alias>GR_JRA</alias>
149+
<lname>1850_DATM%JRA_SLND_CICE_MOM6%REGIONAL_SROF_SGLC_SWAV</lname>
150+
</compset>
151+
152+
<compset>
153+
<alias>GR1850MARBL_JRA</alias>
154+
<lname>1850_DATM%JRA_SLND_CICE_MOM6%REGIONAL%MARBL-BIO_SROF_SGLC_SWAV</lname>
155+
</compset>
156+
157+
<compset>
158+
<alias>GR_JRA_GLOFAS</alias>
159+
<lname>1850_DATM%JRA_SLND_CICE_MOM6%REGIONAL_DROF%GLOFAS_SGLC_SWAV</lname>
160+
</compset>
161+
162+
<compset>
163+
<alias>GR1850MARBL_JRA_GLOFAS</alias>
164+
<lname>1850_DATM%JRA_SLND_CICE_MOM6%REGIONAL%MARBL-BIO_DROF%GLOFAS_SGLC_SWAV</lname>
165+
</compset>
166+
123167
</compsets>

‎cime_config/config_pes.xml‎

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,140 @@
3939
</rootpe>
4040
</pes>
4141
</mach>
42+
<mach name="derecho">
43+
<pes pesize="any" compset="_DATM.+_SICE.*_MOM6%REGIONAL(?!.*%MARBL-BIO).+_SWAV">
44+
<comment>Regional modeling configuration with SICE</comment>
45+
<ntasks>
46+
<ntasks_atm>128</ntasks_atm>
47+
<ntasks_rof>128</ntasks_rof>
48+
<ntasks_cpl>128</ntasks_cpl>
49+
<ntasks_ice>128</ntasks_ice>
50+
<ntasks_ocn>128</ntasks_ocn>
51+
<ntasks_lnd>128</ntasks_lnd>
52+
<ntasks_wav>128</ntasks_wav>
53+
<ntasks_glc>128</ntasks_glc>
54+
</ntasks>
55+
<nthrds>
56+
<nthrds_atm>1</nthrds_atm>
57+
<nthrds_lnd>1</nthrds_lnd>
58+
<nthrds_rof>1</nthrds_rof>
59+
<nthrds_ice>1</nthrds_ice>
60+
<nthrds_ocn>1</nthrds_ocn>
61+
<nthrds_glc>1</nthrds_glc>
62+
<nthrds_wav>1</nthrds_wav>
63+
<nthrds_cpl>1</nthrds_cpl>
64+
</nthrds>
65+
<rootpe>
66+
<rootpe_atm>0</rootpe_atm>
67+
<rootpe_rof>0</rootpe_rof>
68+
<rootpe_cpl>0</rootpe_cpl>
69+
<rootpe_ice>0</rootpe_ice>
70+
<rootpe_ocn>128</rootpe_ocn>
71+
<rootpe_lnd>0</rootpe_lnd>
72+
<rootpe_wav>0</rootpe_wav>
73+
<rootpe_glc>0</rootpe_glc>
74+
</rootpe>
75+
</pes>
76+
<pes pesize="any" compset="_DATM.+_SICE.*_MOM6%REGIONAL[^_]*MARBL-BIO.+_SWAV">
77+
<comment>Regional modeling configuration with SICE and MARBL-BIO</comment>
78+
<ntasks>
79+
<ntasks_atm>128</ntasks_atm>
80+
<ntasks_rof>128</ntasks_rof>
81+
<ntasks_cpl>128</ntasks_cpl>
82+
<ntasks_ice>128</ntasks_ice>
83+
<ntasks_ocn>384</ntasks_ocn>
84+
<ntasks_lnd>128</ntasks_lnd>
85+
<ntasks_wav>128</ntasks_wav>
86+
<ntasks_glc>128</ntasks_glc>
87+
</ntasks>
88+
<nthrds>
89+
<nthrds_atm>1</nthrds_atm>
90+
<nthrds_lnd>1</nthrds_lnd>
91+
<nthrds_rof>1</nthrds_rof>
92+
<nthrds_ice>1</nthrds_ice>
93+
<nthrds_ocn>1</nthrds_ocn>
94+
<nthrds_glc>1</nthrds_glc>
95+
<nthrds_wav>1</nthrds_wav>
96+
<nthrds_cpl>1</nthrds_cpl>
97+
</nthrds>
98+
<rootpe>
99+
<rootpe_atm>0</rootpe_atm>
100+
<rootpe_rof>0</rootpe_rof>
101+
<rootpe_cpl>0</rootpe_cpl>
102+
<rootpe_ice>0</rootpe_ice>
103+
<rootpe_ocn>128</rootpe_ocn>
104+
<rootpe_lnd>0</rootpe_lnd>
105+
<rootpe_wav>0</rootpe_wav>
106+
<rootpe_glc>0</rootpe_glc>
107+
</rootpe>
108+
</pes>
109+
<pes pesize="any" compset="_DATM.+_CICE.*_MOM6%REGIONAL(?!.*%MARBL-BIO).+_SWAV">
110+
<comment>Regional modeling configuration with CICE</comment>
111+
<ntasks>
112+
<ntasks_atm>128</ntasks_atm>
113+
<ntasks_rof>128</ntasks_rof>
114+
<ntasks_cpl>128</ntasks_cpl>
115+
<ntasks_ice>128</ntasks_ice>
116+
<ntasks_ocn>128</ntasks_ocn>
117+
<ntasks_lnd>128</ntasks_lnd>
118+
<ntasks_wav>128</ntasks_wav>
119+
<ntasks_glc>128</ntasks_glc>
120+
</ntasks>
121+
<nthrds>
122+
<nthrds_atm>1</nthrds_atm>
123+
<nthrds_lnd>1</nthrds_lnd>
124+
<nthrds_rof>1</nthrds_rof>
125+
<nthrds_ice>1</nthrds_ice>
126+
<nthrds_ocn>1</nthrds_ocn>
127+
<nthrds_glc>1</nthrds_glc>
128+
<nthrds_wav>1</nthrds_wav>
129+
<nthrds_cpl>1</nthrds_cpl>
130+
</nthrds>
131+
<rootpe>
132+
<rootpe_atm>0</rootpe_atm>
133+
<rootpe_rof>0</rootpe_rof>
134+
<rootpe_cpl>0</rootpe_cpl>
135+
<rootpe_ice>128</rootpe_ice>
136+
<rootpe_ocn>256</rootpe_ocn>
137+
<rootpe_lnd>0</rootpe_lnd>
138+
<rootpe_wav>0</rootpe_wav>
139+
<rootpe_glc>0</rootpe_glc>
140+
</rootpe>
141+
</pes>
142+
<pes pesize="any" compset="_DATM.+_CICE.*_MOM6%REGIONAL[^_]*MARBL-BIO.+_SWAV">
143+
<comment>Regional modeling configuration with CICE and MARBL-BIO</comment>
144+
<ntasks>
145+
<ntasks_atm>128</ntasks_atm>
146+
<ntasks_rof>128</ntasks_rof>
147+
<ntasks_cpl>128</ntasks_cpl>
148+
<ntasks_ice>128</ntasks_ice>
149+
<ntasks_ocn>384</ntasks_ocn>
150+
<ntasks_lnd>128</ntasks_lnd>
151+
<ntasks_wav>128</ntasks_wav>
152+
<ntasks_glc>128</ntasks_glc>
153+
</ntasks>
154+
<nthrds>
155+
<nthrds_atm>1</nthrds_atm>
156+
<nthrds_lnd>1</nthrds_lnd>
157+
<nthrds_rof>1</nthrds_rof>
158+
<nthrds_ice>1</nthrds_ice>
159+
<nthrds_ocn>1</nthrds_ocn>
160+
<nthrds_glc>1</nthrds_glc>
161+
<nthrds_wav>1</nthrds_wav>
162+
<nthrds_cpl>1</nthrds_cpl>
163+
</nthrds>
164+
<rootpe>
165+
<rootpe_atm>0</rootpe_atm>
166+
<rootpe_rof>0</rootpe_rof>
167+
<rootpe_cpl>0</rootpe_cpl>
168+
<rootpe_ice>128</rootpe_ice>
169+
<rootpe_ocn>256</rootpe_ocn>
170+
<rootpe_lnd>0</rootpe_lnd>
171+
<rootpe_wav>0</rootpe_wav>
172+
<rootpe_glc>0</rootpe_glc>
173+
</rootpe>
174+
</pes>
175+
</mach>
42176
</grid>
43177

44178
<grid name="a%(TL319|T62).+oi%tx2_3v2">

0 commit comments

Comments
 (0)