Skip to content

Commit cc6fd59

Browse files
vanroekelvanroekel
committed
Merge branch 'ocean/WC14to60kmL60E3SMv2r02' into ocean/develop
 Adds WC14 mesh, E3SM Water Cycle v2 RRM. Note that a thorough examination of passages and islands is needed in a later revision before final inclusion in E3SM. * mark/ocean/WC14to60kmL60E3SMv2r02: Removes timeMonthlyOutput from spinup of WC14 Make the resolution plot 300 dpi for easier zooming Change resolution around Kamchatka Peninsula Update metadata Turn off land making at Kamchatka Name Bering sea halves Shift Kamchatka region by 360 degrees Update mesh metadata Extend Gulf Stream region further northeast Move high-res region south around Norway Fix periodicity of Bering Sea region Fix periodicity of Bering Sea region Update mesh info in ini file Add WC14 case to compass
2 parents 991e52a + c2ad8bf commit cc6fd59

30 files changed

+1471
-8
lines changed

‎testing_and_setup/compass/ocean/global_ocean/CUSP12/init/region_Bering_Sea.geojson‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"name": "region for CUSP mesh",
88
"component": "ocean",
99
"object": "region",
10-
"author": "Mark Petersen"
10+
"author": "Mark Petersen, Xylar Asay-Davis"
1111
},
1212
"geometry": {
1313
"type": "Polygon",
@@ -26,12 +26,12 @@
2626
47.81315451752768
2727
],
2828
[
29-
187.91015625,
30-
70.78690984117928
29+
180.0,
30+
51.12421275782688
3131
],
3232
[
33-
182.724609375,
34-
70.90226826757711
33+
180.0,
34+
70.58341752317065
3535
],
3636
[
3737
167.2119140625,
@@ -74,11 +74,11 @@
7474
71.27259471233448
7575
],
7676
[
77-
-179.99999,
77+
-180.0,
7878
70.58341752317065
7979
],
8080
[
81-
-179.99999,
81+
-180.0,
8282
51.12421275782688
8383
],
8484
[

‎testing_and_setup/compass/ocean/global_ocean/WC14/init/coastline_CUSP.geojson‎

Lines changed: 253 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,253 @@
1+
{
2+
"type": "FeatureCollection",
3+
"features": [
4+
{
5+
"type": "Feature",
6+
"properties": {
7+
"name": "region for CUSP mesh",
8+
"component": "ocean",
9+
"object": "region",
10+
"author": "Mark Petersen"
11+
},
12+
"geometry": {
13+
"type": "Polygon",
14+
"coordinates": [
15+
[
16+
[
17+
-128.4521484375,
18+
50.70863440082825
19+
],
20+
[
21+
-124.8046875,
22+
48.545705491847464
23+
],
24+
[
25+
-124.1015625,
26+
46.92025531537451
27+
],
28+
[
29+
-124.45312499999999,
30+
43.004647127794435
31+
],
32+
[
33+
-124.01367187499999,
34+
41.31082388091818
35+
],
36+
[
37+
-124.365234375,
38+
40.245991504199026
39+
],
40+
[
41+
-122.9150390625,
42+
37.89219554724437
43+
],
44+
[
45+
-120.5419921875,
46+
34.52466147177172
47+
],
48+
[
49+
-116.98242187499999,
50+
32.54681317351514
51+
],
52+
[
53+
-114.80712890625,
54+
27.6251403350933
55+
],
56+
[
57+
-110.03906250000001,
58+
22.877440464897106
59+
],
60+
[
61+
-106.12792968749999,
62+
22.796439320919465
63+
],
64+
[
65+
-97.31689453125,
66+
25.97779895546436
67+
],
68+
[
69+
-97.44873046875,
70+
27.702983735525862
71+
],
72+
[
73+
-95.00976562499999,
74+
29.420460341013133
75+
],
76+
[
77+
-93.1640625,
78+
29.783449456820605
79+
],
80+
[
81+
-90.87890625,
82+
29.38217507514529
83+
],
84+
[
85+
-89.31884765624999,
86+
30.315987718557867
87+
],
88+
[
89+
-84.00146484374999,
90+
30.088107753367257
91+
],
92+
[
93+
-82.705078125,
94+
28.883159609323474
95+
],
96+
[
97+
-82.529296875,
98+
27.371767300523047
99+
],
100+
[
101+
-80.9912109375,
102+
25.284437746983055
103+
],
104+
[
105+
-79.91455078125001,
106+
25.383735254706867
107+
],
108+
[
109+
-81.5185546875,
110+
30.82678090477975
111+
],
112+
[
113+
-78.92578124999999,
114+
33.706062655101206
115+
],
116+
[
117+
-76.5087890625,
118+
34.74161249883172
119+
],
120+
[
121+
-75.21240234375,
122+
35.42486791930558
123+
],
124+
[
125+
-76.04736328125,
126+
36.80928470205937
127+
],
128+
[
129+
-73.74023437500001,
130+
40.44694705960048
131+
],
132+
[
133+
-69.78515625,
134+
41.77131167976407
135+
],
136+
[
137+
-69.9609375,
138+
43.89789239125797
139+
],
140+
[
141+
-65.390625,
142+
43.77109381775651
143+
],
144+
[
145+
-52.82226562499999,
146+
47.040182144806664
147+
],
148+
[
149+
-43.9453125,
150+
60.326947742998414
151+
],
152+
[
153+
-22.851562500000004,
154+
70.49557354093136
155+
],
156+
[
157+
-11.77734375,
158+
81.4139332828511
159+
],
160+
[
161+
-27.773437499999996,
162+
83.599030708362
163+
],
164+
[
165+
-76.46484375,
166+
83.17403513173129
167+
],
168+
[
169+
-95.27343750000001,
170+
81.5182718765338
171+
],
172+
[
173+
-118.828125,
174+
77.38950400539731
175+
],
176+
[
177+
-127.79296875,
178+
70.55417853776078
179+
],
180+
[
181+
-137.28515624999997,
182+
68.84766505841037
183+
],
184+
[
185+
-156.26953125,
186+
71.18775391813158
187+
],
188+
[
189+
-166.11328125000003,
190+
68.78414378041504
191+
],
192+
[
193+
-167.34375,
194+
65.58572002329473
195+
],
196+
[
197+
-167.51953124999997,
198+
60.23981116999893
199+
],
200+
[
201+
-157.5,
202+
58.53959476664049
203+
],
204+
[
205+
-165.234375,
206+
55.47885346331034
207+
],
208+
[
209+
-177.890625,
210+
52.05249047600099
211+
],
212+
[
213+
-177.5390625,
214+
50.958426723359935
215+
],
216+
[
217+
-164.35546875,
218+
53.85252660044951
219+
],
220+
[
221+
-156.796875,
222+
57.231502991478926
223+
],
224+
[
225+
-153.80859375,
226+
56.9449741808516
227+
],
228+
[
229+
-145.8984375,
230+
60.326947742998414
231+
],
232+
[
233+
-140.44921875,
234+
59.977005492196
235+
],
236+
[
237+
-134.82421875,
238+
56.65622649350222
239+
],
240+
[
241+
-131.484375,
242+
51.83577752045248
243+
],
244+
[
245+
-128.4521484375,
246+
50.70863440082825
247+
]
248+
]
249+
]
250+
}
251+
}
252+
]
253+
}

‎testing_and_setup/compass/ocean/global_ocean/WC14/init/config_E3SM_coupling_files.ini‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# This is the custom config file specific to this test case. Any values here
2+
# will override the defaults in defaults.ini Users wishing to alter the
3+
# configuration should modify this file, rather than defaults.ini
4+
5+
[main]
6+
nprocs = 1
7+
# the file name of the initial condition, possibly after spin-up
8+
initial_condition = ../../spin_up/simulation/restarts/restart.0001-01-21_00.00.00.nc
9+
10+
[mesh]
11+
short_name = ${prefix}${min_res}to${max_res}E${e3sm_version}r${mesh_version}
12+
long_name = ${prefix}${min_res}to${max_res}kmL${levels}E3SMv${e3sm_version}r${mesh_version}
13+
prefix = WC
14+
description = MPAS North America and Arctic Focused Water Cycle mesh for E3SM version
15+
${e3sm_version}, with a focused ${min_res}-km resolution
16+
around North America and ${levels} vertical levels as documented at
17+
https://github.com/MPAS-Dev/MPAS-Model/pull/584
18+
e3sm_version = 2
19+
mesh_version = 02
20+
creation_date = autodetect
21+
min_res = 14
22+
max_res = 60
23+
max_depth = autodetect
24+
levels = autodetect
25+
runoff_description = <<<Spreading function described here>>>
26+
27+
# The following options are detected from .gitconfig if not explicitly entered
28+
author = autodetect
29+
email = autodetect
30+
31+
[initial_condition_ocean]
32+
enable = true
33+
34+
[graph_partition_ocean]
35+
enable = true
36+
37+
[initial_condition_seaice]
38+
enable = true
39+
40+
[scrip]
41+
enable = true
42+
43+
[transects_and_regions]
44+
enable = true
45+
46+
[mapping_analysis]
47+
enable = true
48+
49+
[mapping_CORE_Gcase]
50+
enable = false
51+
52+
[mapping_JRA_Gcase]
53+
enable = false
54+
55+
[mapping_ne30]
56+
enable = false
57+
58+
[domain_CORE_Gcase]
59+
enable = false
60+
61+
[domain_JRA_Gcase]
62+
enable = false
63+
64+
[domain_ne30]
65+
enable = false
66+
67+
[mapping_runoff]
68+
enable = false
69+
70+
[salinity_restoring]
71+
enable = false
72+
73+
[prescribed_ismf]
74+
enable = false

‎testing_and_setup/compass/ocean/global_ocean/WC14/init/config_base_mesh.xml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0"?>
2+
<config case="base_mesh">
3+
<get_file dest_path="bathymetry_database" file_name="SRTM15_plus_earth_relief_15s.nc">
4+
<mirror protocol="wget" url="https://web.lcrc.anl.gov/public/e3sm/mpas_standalonedata/mpas-ocean/bathymetry_database/"/>
5+
</get_file>
6+
7+
<add_link source_path="mpas_model" source="testing_and_setup/compass/ocean/jigsaw_to_MPAS" dest="jigsaw_to_MPAS"/>
8+
<add_link source_path="bathymetry_database" source="SRTM15_plus_earth_relief_15s.nc" dest="earth_relief_15s.nc"/>
9+
<copy_file source_path="script_test_dir" source="define_base_mesh.py" dest="define_base_mesh.py"/>
10+
<add_link source_path="script_test_dir" source="coastline_CUSP.geojson" dest="coastline_CUSP.geojson"/>
11+
<add_link source_path="script_test_dir" source="land_mask_Mexico.geojson" dest="land_mask_Mexico.geojson"/>
12+
<add_link source_path="script_test_dir" source="region_Bering_Sea.geojson" dest="region_Bering_Sea.geojson"/>
13+
<add_link source_path="script_test_dir" source="region_Bering_Sea_reduced.geojson" dest="region_Bering_Sea_reduced.geojson"/>
14+
<add_link source_path="script_test_dir" source="region_Gulf_Stream_extension.geojson" dest="region_Gulf_Stream_extension.geojson"/>
15+
<add_link source_path="script_test_dir" source="land_mask_Kamchatka.geojson" dest="land_mask_Kamchatka.geojson"/>
16+
<add_link source_path="script_test_dir" source="region_Arctic_Ocean.geojson" dest="region_Arctic_Ocean.geojson"/>
17+
<add_link source_path="script_test_dir" source="region_Gulf_of_Mexico.geojson" dest="region_Gulf_of_Mexico.geojson"/>
18+
<add_link source_path="script_test_dir" source="region_Central_America.geojson" dest="region_Central_America.geojson"/>
19+
20+
<run_script name="run.py">
21+
<step executable="python">
22+
<argument flag="-m">jigsaw_to_MPAS.build_mesh</argument>
23+
</step>
24+
</run_script>
25+
26+
</config>

‎testing_and_setup/compass/ocean/global_ocean/WC14/init/config_culled_mesh.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../config_files/config_culled_mesh.xml

0 commit comments

Comments
 (0)