Skip to content

Commit 2b78728

Browse files
jayeshkrishnajayeshkrishna
authored
Merge branch 'jayeshkrishna/eam/fix_config_pes_for_prod_F_cases' into maint-2.0 (PR #5037)
Copying the component-specific config_pes.xml from E3SM master to maint-2.0. Without this change some F cases fail due to small PE layouts after the latest CIME update that moved config_pes.xml to individual components (PR #5005). This PR is NML because of changes in the PE layout Fixes #5024 [NML] [BFB]
2 parents 6275091 + 52a1e2f commit 2b78728

File tree

8 files changed

+4153
-10800
lines changed

8 files changed

+4153
-10800
lines changed

‎cime_config/allactive/config_pesall.xml‎

Lines changed: 1190 additions & 8764 deletions
Large diffs are not rendered by default.

‎components/cice/cime_config/config_pes.xml‎

Lines changed: 155 additions & 154 deletions
Original file line numberDiff line numberDiff line change
@@ -1,187 +1,188 @@
11
<?xml version="1.0"?>
2-
32
<config_pes>
4-
3+
<grid name="a%T62.+oi%tx0.1v2">
4+
<mach name="any">
5+
<pes compset="DATM.+CICE.+DOCN" pesize="S">
6+
<comment>CICE: grid a%T62.+oi%tx0.1v2, any mach, pesize=S</comment>
7+
<ntasks>
8+
<ntasks_atm>8</ntasks_atm>
9+
<ntasks_lnd>8</ntasks_lnd>
10+
<ntasks_rof>8</ntasks_rof>
11+
<ntasks_ice>480</ntasks_ice>
12+
<ntasks_ocn>8</ntasks_ocn>
13+
<ntasks_glc>8</ntasks_glc>
14+
<ntasks_wav>8</ntasks_wav>
15+
<ntasks_cpl>32</ntasks_cpl>
16+
</ntasks>
17+
<rootpe>
18+
<rootpe_atm>0</rootpe_atm>
19+
<rootpe_lnd>8</rootpe_lnd>
20+
<rootpe_rof>0</rootpe_rof>
21+
<rootpe_ice>32</rootpe_ice>
22+
<rootpe_ocn>16</rootpe_ocn>
23+
<rootpe_glc>24</rootpe_glc>
24+
<rootpe_wav>0</rootpe_wav>
25+
<rootpe_cpl>0</rootpe_cpl>
26+
</rootpe>
27+
</pes>
28+
<pes compset="DATM.+CICE.+DOCN" pesize="M">
29+
<comment>CICE: grid a%T62.+oi%tx0.1v2, any mach, pesize=M</comment>
30+
<ntasks>
31+
<ntasks_atm>48</ntasks_atm>
32+
<ntasks_lnd>48</ntasks_lnd>
33+
<ntasks_rof>48</ntasks_rof>
34+
<ntasks_ice>1024</ntasks_ice>
35+
<ntasks_ocn>48</ntasks_ocn>
36+
<ntasks_glc>48</ntasks_glc>
37+
<ntasks_wav>48</ntasks_wav>
38+
<ntasks_cpl>48</ntasks_cpl>
39+
</ntasks>
40+
<rootpe>
41+
<rootpe_atm>0</rootpe_atm>
42+
<rootpe_lnd>48</rootpe_lnd>
43+
<rootpe_rof>0</rootpe_rof>
44+
<rootpe_ice>0</rootpe_ice>
45+
<rootpe_ocn>192</rootpe_ocn>
46+
<rootpe_glc>96</rootpe_glc>
47+
<rootpe_wav>0</rootpe_wav>
48+
<rootpe_cpl>144</rootpe_cpl>
49+
</rootpe>
50+
</pes>
51+
</mach>
52+
</grid>
553
<grid name="a%T62.+oi%tx0.1">
654
<mach name="any">
755
<pes pesize="M" compset="any">
8-
<ntasks>
9-
<ntasks_atm>-2</ntasks_atm>
10-
<ntasks_lnd>-2</ntasks_lnd>
11-
<ntasks_rof>-2</ntasks_rof>
12-
<ntasks_ice>-40</ntasks_ice>
13-
<ntasks_ocn>-40</ntasks_ocn>
14-
<ntasks_glc>-2</ntasks_glc>
15-
<ntasks_wav>-2</ntasks_wav>
16-
<ntasks_cpl>-2</ntasks_cpl>
17-
</ntasks>
18-
<nthrds>
19-
<nthrds_atm>2</nthrds_atm>
20-
<nthrds_lnd>2</nthrds_lnd>
21-
<nthrds_rof>2</nthrds_rof>
22-
<nthrds_ice>2</nthrds_ice>
23-
<nthrds_ocn>2</nthrds_ocn>
24-
<nthrds_glc>2</nthrds_glc>
25-
<nthrds_wav>2</nthrds_wav>
26-
<nthrds_cpl>2</nthrds_cpl>
27-
</nthrds>
28-
<rootpe>
29-
<rootpe_atm>0</rootpe_atm>
30-
<rootpe_lnd>-2</rootpe_lnd>
31-
<rootpe_rof>-4</rootpe_rof>
32-
<rootpe_ice>0</rootpe_ice>
33-
<rootpe_ocn>0</rootpe_ocn>
34-
<rootpe_glc>-6</rootpe_glc>
35-
<rootpe_wav>-8</rootpe_wav>
36-
<rootpe_cpl>-10</rootpe_cpl>
37-
</rootpe>
56+
<comment>CICE: grid a%T62.+oi%tx0.1, any mach, any compset, pesize=M</comment>
57+
<ntasks>
58+
<ntasks_atm>-2</ntasks_atm>
59+
<ntasks_lnd>-2</ntasks_lnd>
60+
<ntasks_rof>-2</ntasks_rof>
61+
<ntasks_ice>-40</ntasks_ice>
62+
<ntasks_ocn>-40</ntasks_ocn>
63+
<ntasks_glc>-2</ntasks_glc>
64+
<ntasks_wav>-2</ntasks_wav>
65+
<ntasks_cpl>-2</ntasks_cpl>
66+
</ntasks>
67+
<nthrds>
68+
<nthrds_atm>2</nthrds_atm>
69+
<nthrds_lnd>2</nthrds_lnd>
70+
<nthrds_rof>2</nthrds_rof>
71+
<nthrds_ice>2</nthrds_ice>
72+
<nthrds_ocn>2</nthrds_ocn>
73+
<nthrds_glc>2</nthrds_glc>
74+
<nthrds_wav>2</nthrds_wav>
75+
<nthrds_cpl>2</nthrds_cpl>
76+
</nthrds>
77+
<rootpe>
78+
<rootpe_atm>0</rootpe_atm>
79+
<rootpe_lnd>-2</rootpe_lnd>
80+
<rootpe_rof>-4</rootpe_rof>
81+
<rootpe_ice>0</rootpe_ice>
82+
<rootpe_ocn>0</rootpe_ocn>
83+
<rootpe_glc>-6</rootpe_glc>
84+
<rootpe_wav>-8</rootpe_wav>
85+
<rootpe_cpl>-10</rootpe_cpl>
86+
</rootpe>
3887
</pes>
3988
</mach>
4089
</grid>
41-
4290
<grid name="a%4x5.+oi%gx3">
4391
<mach name="any">
4492
<pes pesize="any" compset="any">
45-
<ntasks>
46-
<ntasks_atm>8</ntasks_atm>
47-
<ntasks_lnd>8</ntasks_lnd>
48-
<ntasks_rof>8</ntasks_rof>
49-
<ntasks_ice>8</ntasks_ice>
50-
<ntasks_ocn>8</ntasks_ocn>
51-
<ntasks_glc>8</ntasks_glc>
52-
<ntasks_wav>8</ntasks_wav>
53-
<ntasks_cpl>8</ntasks_cpl>
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_lnd>0</rootpe_lnd>
68-
<rootpe_rof>0</rootpe_rof>
69-
<rootpe_ice>0</rootpe_ice>
70-
<rootpe_ocn>0</rootpe_ocn>
71-
<rootpe_glc>0</rootpe_glc>
72-
<rootpe_wav>0</rootpe_wav>
73-
<rootpe_cpl>0</rootpe_cpl>
74-
</rootpe>
93+
<comment>CICE: grid a%4x5.+oi%gx3, any mach, any compset, any pesize</comment>
94+
<ntasks>
95+
<ntasks_atm>8</ntasks_atm>
96+
<ntasks_lnd>8</ntasks_lnd>
97+
<ntasks_rof>8</ntasks_rof>
98+
<ntasks_ice>8</ntasks_ice>
99+
<ntasks_ocn>8</ntasks_ocn>
100+
<ntasks_glc>8</ntasks_glc>
101+
<ntasks_wav>8</ntasks_wav>
102+
<ntasks_cpl>8</ntasks_cpl>
103+
</ntasks>
75104
</pes>
76105
</mach>
77106
</grid>
78107
<grid name="a%T62.+oi%gx3">
79108
<mach name="any">
80109
<pes pesize="any" compset="any">
81-
<ntasks>
82-
<ntasks_atm>-2</ntasks_atm>
83-
<ntasks_lnd>-2</ntasks_lnd>
84-
<ntasks_rof>-2</ntasks_rof>
85-
<ntasks_ice>-2</ntasks_ice>
86-
<ntasks_ocn>-2</ntasks_ocn>
87-
<ntasks_glc>-2</ntasks_glc>
88-
<ntasks_wav>-2</ntasks_wav>
89-
<ntasks_cpl>-2</ntasks_cpl>
90-
</ntasks>
91-
<nthrds>
92-
<nthrds_atm>2</nthrds_atm>
93-
<nthrds_lnd>2</nthrds_lnd>
94-
<nthrds_rof>2</nthrds_rof>
95-
<nthrds_ice>2</nthrds_ice>
96-
<nthrds_ocn>2</nthrds_ocn>
97-
<nthrds_glc>2</nthrds_glc>
98-
<nthrds_wav>2</nthrds_wav>
99-
<nthrds_cpl>2</nthrds_cpl>
100-
</nthrds>
101-
<rootpe>
102-
<rootpe_atm>0</rootpe_atm>
103-
<rootpe_lnd>0</rootpe_lnd>
104-
<rootpe_rof>0</rootpe_rof>
105-
<rootpe_ice>0</rootpe_ice>
106-
<rootpe_ocn>0</rootpe_ocn>
107-
<rootpe_glc>0</rootpe_glc>
108-
<rootpe_wav>0</rootpe_wav>
109-
<rootpe_cpl>0</rootpe_cpl>
110-
</rootpe>
110+
<comment>CICE: grid a%T62.+oi%gx3, any mach, any compset, any pesize</comment>
111+
<ntasks>
112+
<ntasks_atm>-2</ntasks_atm>
113+
<ntasks_lnd>-2</ntasks_lnd>
114+
<ntasks_rof>-2</ntasks_rof>
115+
<ntasks_ice>-2</ntasks_ice>
116+
<ntasks_ocn>-2</ntasks_ocn>
117+
<ntasks_glc>-2</ntasks_glc>
118+
<ntasks_wav>-2</ntasks_wav>
119+
<ntasks_cpl>-2</ntasks_cpl>
120+
</ntasks>
121+
<nthrds>
122+
<nthrds_atm>2</nthrds_atm>
123+
<nthrds_lnd>2</nthrds_lnd>
124+
<nthrds_rof>2</nthrds_rof>
125+
<nthrds_ice>2</nthrds_ice>
126+
<nthrds_ocn>2</nthrds_ocn>
127+
<nthrds_glc>2</nthrds_glc>
128+
<nthrds_wav>2</nthrds_wav>
129+
<nthrds_cpl>2</nthrds_cpl>
130+
</nthrds>
111131
</pes>
112132
</mach>
113133
</grid>
114134
<grid name="a%T62.+oi%tx1v1">
115135
<mach name="any">
116136
<pes pesize="any" compset="any">
117-
<ntasks>
118-
<ntasks_atm>-4</ntasks_atm>
119-
<ntasks_lnd>-4</ntasks_lnd>
120-
<ntasks_rof>-4</ntasks_rof>
121-
<ntasks_ice>-4</ntasks_ice>
122-
<ntasks_ocn>-4</ntasks_ocn>
123-
<ntasks_glc>-4</ntasks_glc>
124-
<ntasks_wav>-4</ntasks_wav>
125-
<ntasks_cpl>-4</ntasks_cpl>
126-
</ntasks>
127-
<nthrds>
128-
<nthrds_atm>2</nthrds_atm>
129-
<nthrds_lnd>2</nthrds_lnd>
130-
<nthrds_rof>2</nthrds_rof>
131-
<nthrds_ice>2</nthrds_ice>
132-
<nthrds_ocn>2</nthrds_ocn>
133-
<nthrds_glc>2</nthrds_glc>
134-
<nthrds_wav>2</nthrds_wav>
135-
<nthrds_cpl>2</nthrds_cpl>
136-
</nthrds>
137-
<rootpe>
138-
<rootpe_atm>0</rootpe_atm>
139-
<rootpe_lnd>0</rootpe_lnd>
140-
<rootpe_rof>0</rootpe_rof>
141-
<rootpe_ice>0</rootpe_ice>
142-
<rootpe_ocn>0</rootpe_ocn>
143-
<rootpe_glc>0</rootpe_glc>
144-
<rootpe_wav>0</rootpe_wav>
145-
<rootpe_cpl>0</rootpe_cpl>
146-
</rootpe>
137+
<comment>CICE: grid a%T62.+oi%tx1v1, any mach, any compset, any pesize</comment>
138+
<ntasks>
139+
<ntasks_atm>-4</ntasks_atm>
140+
<ntasks_lnd>-4</ntasks_lnd>
141+
<ntasks_rof>-4</ntasks_rof>
142+
<ntasks_ice>-4</ntasks_ice>
143+
<ntasks_ocn>-4</ntasks_ocn>
144+
<ntasks_glc>-4</ntasks_glc>
145+
<ntasks_wav>-4</ntasks_wav>
146+
<ntasks_cpl>-4</ntasks_cpl>
147+
</ntasks>
148+
<nthrds>
149+
<nthrds_atm>2</nthrds_atm>
150+
<nthrds_lnd>2</nthrds_lnd>
151+
<nthrds_rof>2</nthrds_rof>
152+
<nthrds_ice>2</nthrds_ice>
153+
<nthrds_ocn>2</nthrds_ocn>
154+
<nthrds_glc>2</nthrds_glc>
155+
<nthrds_wav>2</nthrds_wav>
156+
<nthrds_cpl>2</nthrds_cpl>
157+
</nthrds>
147158
</pes>
148159
</mach>
149160
</grid>
150161
<grid name="a%T62.+oi%gx1">
151162
<mach name="any">
152163
<pes pesize="any" compset="any">
153-
<ntasks>
154-
<ntasks_atm>-4</ntasks_atm>
155-
<ntasks_lnd>-4</ntasks_lnd>
156-
<ntasks_rof>-4</ntasks_rof>
157-
<ntasks_ice>-4</ntasks_ice>
158-
<ntasks_ocn>-4</ntasks_ocn>
159-
<ntasks_glc>-4</ntasks_glc>
160-
<ntasks_wav>-4</ntasks_wav>
161-
<ntasks_cpl>-4</ntasks_cpl>
162-
</ntasks>
163-
<nthrds>
164-
<nthrds_atm>2</nthrds_atm>
165-
<nthrds_lnd>2</nthrds_lnd>
166-
<nthrds_rof>2</nthrds_rof>
167-
<nthrds_ice>2</nthrds_ice>
168-
<nthrds_ocn>2</nthrds_ocn>
169-
<nthrds_glc>2</nthrds_glc>
170-
<nthrds_wav>2</nthrds_wav>
171-
<nthrds_cpl>2</nthrds_cpl>
172-
</nthrds>
173-
<rootpe>
174-
<rootpe_atm>0</rootpe_atm>
175-
<rootpe_lnd>0</rootpe_lnd>
176-
<rootpe_rof>0</rootpe_rof>
177-
<rootpe_ice>0</rootpe_ice>
178-
<rootpe_ocn>0</rootpe_ocn>
179-
<rootpe_glc>0</rootpe_glc>
180-
<rootpe_wav>0</rootpe_wav>
181-
<rootpe_cpl>0</rootpe_cpl>
182-
</rootpe>
164+
<comment>CICE: grid a%T62.+oi%gx1, any mach, any compset, any pesize</comment>
165+
<ntasks>
166+
<ntasks_atm>-4</ntasks_atm>
167+
<ntasks_lnd>-4</ntasks_lnd>
168+
<ntasks_rof>-4</ntasks_rof>
169+
<ntasks_ice>-4</ntasks_ice>
170+
<ntasks_ocn>-4</ntasks_ocn>
171+
<ntasks_glc>-4</ntasks_glc>
172+
<ntasks_wav>-4</ntasks_wav>
173+
<ntasks_cpl>-4</ntasks_cpl>
174+
</ntasks>
175+
<nthrds>
176+
<nthrds_atm>2</nthrds_atm>
177+
<nthrds_lnd>2</nthrds_lnd>
178+
<nthrds_rof>2</nthrds_rof>
179+
<nthrds_ice>2</nthrds_ice>
180+
<nthrds_ocn>2</nthrds_ocn>
181+
<nthrds_glc>2</nthrds_glc>
182+
<nthrds_wav>2</nthrds_wav>
183+
<nthrds_cpl>2</nthrds_cpl>
184+
</nthrds>
183185
</pes>
184186
</mach>
185187
</grid>
186-
187188
</config_pes>

0 commit comments

Comments
 (0)