Skip to content

Commit d0bdc37

Browse files
jedwards4bjedwards4b
authored
Merge pull request #241 from gdicker1/eworg_mpaso_mpassi
Add MPAS-O and MPAS-SI from EarthWorksOrg/EarthWorks
2 parents d01a9a9 + fa2f4fc commit d0bdc37

File tree

5 files changed

+297
-0
lines changed

5 files changed

+297
-0
lines changed

‎component_grids_nuopc.xml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,67 @@
397397
<desc>tripole v1 1-deg grid: testing proxy for high-res tripole ocean grids- do not use for scientific experiments</desc>
398398
<support>Experimental tripole ocean grid</support>
399399
</domain>
400+
<domain name="oQU480">
401+
<nx>7234</nx> <ny>1</ny>
402+
<mesh driver="nuopc">$DIN_LOC_ROOT/ocn/mpas-o/oQU480/oQU480_ESMFmesh.nc</mesh>
403+
<desc>oQU480 is a MPAS ocean grid that is roughly 4 degree resolution:</desc>
404+
<support>Experimental, under development</support>
405+
</domain>
406+
<domain name="oQU240">
407+
<nx>7234</nx> <ny>1</ny>
408+
<mesh driver="nuopc">$DIN_LOC_ROOT/ocn/mpas-o/oQU240/oQU240_ESMFmesh.nc</mesh>
409+
<desc>oQU240 is a MPAS ocean grid that is roughly 2 degree resolution:</desc>
410+
<support>Experimental, under development</support>
411+
</domain>
412+
<domain name="oQU120">
413+
<nx>28876</nx> <ny>1</ny>
414+
<mesh driver="nuopc">$DIN_LOC_ROOT/ocn/mpas-o/oQU120/oQU120_ESMFmesh.230524.nc</mesh>
415+
<desc>oQU120 is a MPAS ocean grid that is roughly 1 degree resolution:</desc>
416+
<support>Experimental, under development</support>
417+
</domain>
418+
<domain name="oEC60to30v3">
419+
<nx>28571</nx> <ny>1</ny>
420+
<mesh driver="nuopc">/glade/work/dazlich/ec60_30/oEC60to30_ESMFmesh.nc</mesh>
421+
<desc>oEC60to30v3 is a MPAS ocean grid that is roughly 1/2 degree resolution:</desc>
422+
<support>Experimental, under development</support>
423+
</domain>
424+
<domain name="oQU060">
425+
<nx>115494</nx> <ny>1</ny>
426+
<mesh driver="nuopc">$DIN_LOC_ROOT/ocn/mpas-o/oQU060/oQU060_ESMFmesh.230907.nc</mesh>
427+
<desc>oQU060 is a MPAS ocean grid that is roughly 1/2 degree resolution:</desc>
428+
<support>Experimental, under development</support>
429+
</domain>
430+
<domain name="oQU030">
431+
<nx>462000</nx> <ny>1</ny>
432+
<mesh driver="nuopc">$DIN_LOC_ROOT/ocn/mpas-o/oQU030/oQU030_ESMFmesh.241221.nc</mesh>
433+
<desc>oQU030 is a MPAS ocean grid that is roughly 1/4 degree resolution:</desc>
434+
<support>Experimental, under development</support>
435+
</domain>
436+
<domain name="oQU015">
437+
<nx>1850090</nx> <ny>1</ny>
438+
<mesh driver="nuopc">$DIN_LOC_ROOT/ocn/mpas-o/oQU015/oQU015_ESMFmesh.241221.nc</mesh>
439+
<desc>oQU015 is a MPAS ocean grid that is roughly 1/8 degree resolution:</desc>
440+
<support>Experimental, under development</support>
441+
</domain>
442+
<domain name="oQU0075">
443+
<nx>7399783</nx> <ny>1</ny>
444+
<mesh driver="nuopc">$DIN_LOC_ROOT/ocn/mpas-o/oQU0075/oQU0075_ESMFmesh.241221.nc</mesh>
445+
<desc>oQU0075 is a MPAS ocean grid that is roughly 1/16 degree resolution:</desc>
446+
<support>Experimental, under development</support>
447+
</domain>
448+
<domain name="oQU00375">
449+
<nx>29598824</nx> <ny>1</ny>
450+
<mesh driver="nuopc">$DIN_LOC_ROOT/ocn/mpas-o/oQU00375/oQU00375_ESMFmesh.241221.nc</mesh>
451+
<desc>oQU00375 is a MPAS ocean grid that is roughly 1/32 degree resolution:</desc>
452+
<support>Experimental, under development</support>
453+
</domain>
454+
<domain name="oRR60-3WUS">
455+
<nx>835536</nx> <ny>1</ny>
456+
<mesh driver="nuopc">/glade/work/dazlich/oRR60-3/oRR60-3WUS_ESMFmesh.nc</mesh>
457+
<desc>oQU60-3wus is a MPAS ocean grid that s 3km region refinement over the western US:</desc>
458+
<support>Experimental, under development</support>
459+
</domain>
460+
400461

401462
<!-- ======================================================== -->
402463
<!-- ROF domains -->

‎machines/Depends.gnu‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,12 @@ mo_fluxes_broadband_kernels.o
1414

1515
$(RRTMGP_OBJS): %.o: %.F90
1616
$(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -fno-openmp $<
17+
18+
ifeq ($(COMP_NAME),mpassi)
19+
# mpas seaice files that can't compile with optimization using gnu
20+
MPASSI_NOOPT_OBJS=\
21+
ice_shortwave.o
22+
23+
$(MPASSI_NOOPT_OBJS): %.o : %.F90
24+
$(FC) -c $(FPPFLAGS) $(INCLDIR) $(INCS) $(FREEFLAGS) $(FFLAGS) $(FFLAGS_NOOPT) $<
25+
endif

‎machines/Depends.nvhpc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,12 @@ ifeq ($(DEBUG),FALSE)
174174
$(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) $(OPENACC_GPU_FLAGS) $<
175175
$(CLUBB_OBJS): %.o: %.F90
176176
$(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) $(OPENACC_GPU_FLAGS) $<
177+
178+
ifeq ($(COMP_NAME),mpaso)
179+
# mpas ocean files need gpuflags
180+
FFLAGS +=$(GPUFLAGS)
181+
endif
182+
177183
else
178184
$(REDUCED_ERRORCHKS_IN_DEBUG): %.o: %.F90
179185
$(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -Mnobounds -Ktrap=none -Knoieee $<

‎maps_nuopc.xml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,34 @@
9494
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/gridmaps/rJRA025/map_jra_to_tx2_3_nnsm_e250r250_241211.nc</map>
9595
<map name="ROF2OCN_ICE_RMAPNAME">cpl/gridmaps/rJRA025/map_jra_to_tx2_3_nnsm_e250r250_241211.nc</map>
9696
</gridmap>
97+
<gridmap rof_grid="rx1" ocn_grid="oQU120" >
98+
<map name="ROF2OCN_LIQ_RMAPNAME">rof/remap/wght_file_drof_qu120.230123.nc</map>
99+
<map name="ROF2OCN_ICE_RMAPNAME">rof/remap/wght_file_drof_qu120.230123.nc</map>
100+
</gridmap>
101+
<gridmap rof_grid="r05" ocn_grid="oQU120" >
102+
<map name="ROF2OCN_LIQ_RMAPNAME">rof/remap/wght_file_mosart_qu120.230123.nc</map>
103+
<map name="ROF2OCN_ICE_RMAPNAME">rof/remap/wght_file_mosart_qu120.230123.nc</map>
104+
</gridmap>
105+
<gridmap rof_grid="r05" ocn_grid="oQU060" >
106+
<map name="ROF2OCN_LIQ_RMAPNAME">rof/remap/wght_file_mosart_qu060.230613.nc</map>
107+
<map name="ROF2OCN_ICE_RMAPNAME">rof/remap/wght_file_mosart_qu060.230613.nc</map>
108+
</gridmap>
109+
<gridmap rof_grid="JRA025v2" ocn_grid="oQU120" >
110+
<map name="ROF2OCN_LIQ_RMAPNAME">rof/remap/wght_file_jra_qu120.230517.nc</map>
111+
<map name="ROF2OCN_ICE_RMAPNAME">rof/remap/wght_file_jra_qu120.230517.nc</map>
112+
</gridmap>
113+
<gridmap rof_grid="JRA025v2" ocn_grid="oQU060" >
114+
<map name="ROF2OCN_LIQ_RMAPNAME">rof/remap/wght_file_jra_qu060.230613.nc</map>
115+
<map name="ROF2OCN_ICE_RMAPNAME">rof/remap/wght_file_jra_qu060.230613.nc</map>
116+
</gridmap>
117+
<gridmap rof_grid="r05" ocn_grid="oQU030" >
118+
<map name="ROF2OCN_LIQ_RMAPNAME">rof/remap/wght_file_mosart_qu030.241221.nc</map>
119+
<map name="ROF2OCN_ICE_RMAPNAME">rof/remap/wght_file_mosart_qu030.241221.nc</map>
120+
</gridmap>
121+
<gridmap rof_grid="JRA025v2" ocn_grid="oQU030" >
122+
<map name="ROF2OCN_LIQ_RMAPNAME">rof/remap/wght_file_jra_qu030.241221.nc</map>
123+
<map name="ROF2OCN_ICE_RMAPNAME">rof/remap/wght_file_jra_qu030.241221.nc</map>
124+
</gridmap>
97125

98126
<!-- ======================================================== -->
99127
<!-- MizuRoute mapping files -->

‎modelgrid_aliases_nuopc.xml‎

Lines changed: 193 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,98 @@
430430
<mask>oQU120</mask>
431431
</model_grid>
432432

433+
<!-- EarthWorks Specific, MPAS-O+ROF -->
434+
<model_grid alias="TL319_oQU120" not_compset="_CAM">
435+
<grid name="atm">TL319</grid>
436+
<grid name="lnd">TL319</grid>
437+
<grid name="ocnice">oQU120</grid>
438+
<grid name="rof">JRA025v2</grid>
439+
<mask>oQU120</mask>
440+
</model_grid>
441+
442+
<model_grid alias="T62_oEC60to30v3" not_compset="_CAM">
443+
<grid name="atm">T62</grid>
444+
<grid name="lnd">T62</grid>
445+
<grid name="ocnice">oEC60to30v3</grid>
446+
<mask>oEC60to30v3</mask>
447+
</model_grid>
448+
449+
<model_grid alias="T62_oQU060" not_compset="_CAM">
450+
<grid name="atm">T62</grid>
451+
<grid name="lnd">T62</grid>
452+
<grid name="ocnice">oQU060</grid>
453+
<mask>oQU060</mask>
454+
</model_grid>
455+
456+
<model_grid alias="TL319_oQU060" not_compset="_CAM">
457+
<grid name="atm">TL319</grid>
458+
<grid name="lnd">TL319</grid>
459+
<grid name="ocnice">oQU060</grid>
460+
<grid name="rof">JRA025v2</grid>
461+
<mask>oQU060</mask>
462+
</model_grid>
463+
464+
<model_grid alias="T62_oQU030" not_compset="_CAM">
465+
<grid name="atm">T62</grid>
466+
<grid name="lnd">T62</grid>
467+
<grid name="ocnice">oQU030</grid>
468+
<mask>oQU030</mask>
469+
</model_grid>
470+
471+
<model_grid alias="TL319_oQU030" not_compset="_CAM">
472+
<grid name="atm">TL319</grid>
473+
<grid name="lnd">TL319</grid>
474+
<grid name="ocnice">oQU030</grid>
475+
<grid name="rof">JRA025v2</grid>
476+
<mask>oQU030</mask>
477+
</model_grid>
478+
479+
<model_grid alias="TL319_oQU015" not_compset="_CAM">
480+
<grid name="atm">TL319</grid>
481+
<grid name="lnd">TL319</grid>
482+
<grid name="ocnice">oQU015</grid>
483+
<grid name="rof">JRA025v2</grid>
484+
<mask>oQU015</mask>
485+
</model_grid>
486+
487+
<model_grid alias="T62_oQU015" not_compset="_CAM">
488+
<grid name="atm">T62</grid>
489+
<grid name="lnd">T62</grid>
490+
<grid name="ocnice">oQU015</grid>
491+
<mask>oQU015</mask>
492+
</model_grid>
493+
494+
<model_grid alias="T62_oQU0075" not_compset="_CAM">
495+
<grid name="atm">T62</grid>
496+
<grid name="lnd">T62</grid>
497+
<grid name="ocnice">oQU0075</grid>
498+
<mask>oQU0075</mask>
499+
</model_grid>
500+
501+
<model_grid alias="TL319_oQU0075" not_compset="_CAM">
502+
<grid name="atm">TL319</grid>
503+
<grid name="lnd">TL319</grid>
504+
<grid name="ocnice">oQU0075</grid>
505+
<grid name="rof">JRA025v2</grid>
506+
<mask>oQU0075</mask>
507+
</model_grid>
508+
509+
<model_grid alias="T62_oQU00375" not_compset="_CAM">
510+
<grid name="atm">T62</grid>
511+
<grid name="lnd">T62</grid>
512+
<grid name="ocnice">oQU00375</grid>
513+
<mask>oQU00375</mask>
514+
</model_grid>
515+
516+
<model_grid alias="TL319_oQU00375" not_compset="_CAM">
517+
<grid name="atm">TL319</grid>
518+
<grid name="lnd">TL319</grid>
519+
<grid name="ocnice">oQU00375</grid>
520+
<grid name="rof">JRA025v2</grid>
521+
<mask>oQU00375</mask>
522+
</model_grid>
523+
<!-- END EarthWorks Specific, MPAS-O+ROF -->
524+
433525
<!-- finite volume grids -->
434526

435527
<model_grid alias="f02_g16" not_compset="_MOM">
@@ -1429,6 +1521,107 @@
14291521
<mask>tx0.1v3</mask>
14301522
</model_grid>
14311523

1524+
<!-- EarthWorks Specific, MPAS-A+MPAS-O grids -->
1525+
<model_grid alias="mpasa480_oQU480" not_compset="_MOM">
1526+
<grid name="atm">mpasa480</grid>
1527+
<grid name="lnd">mpasa480</grid>
1528+
<grid name="ocnice">oQU480</grid>
1529+
<mask>oQU480</mask>
1530+
</model_grid>
1531+
1532+
<model_grid alias="mpasa240_oQU240" not_compset="_MOM">
1533+
<grid name="atm">mpasa240</grid>
1534+
<grid name="lnd">mpasa240</grid>
1535+
<grid name="ocnice">oQU240</grid>
1536+
<mask>oQU240</mask>
1537+
</model_grid>
1538+
1539+
<model_grid alias="mpasa120_oQU120" not_compset="_MOM">
1540+
<grid name="atm">mpasa120</grid>
1541+
<grid name="lnd">mpasa120</grid>
1542+
<grid name="ocnice">oQU120</grid>
1543+
<mask>oQU120</mask>
1544+
</model_grid>
1545+
1546+
<model_grid alias="mpasa120_oEC60to30v3" not_compset="_MOM">
1547+
<grid name="atm">mpasa120</grid>
1548+
<grid name="lnd">mpasa120</grid>
1549+
<grid name="ocnice">oEC60to30v3</grid>
1550+
<mask>oEC60to30v3</mask>
1551+
</model_grid>
1552+
1553+
<model_grid alias="mpasa60_oEC60to30v3" not_compset="_MOM">
1554+
<grid name="atm">mpasa60</grid>
1555+
<grid name="lnd">mpasa60</grid>
1556+
<grid name="ocnice">oEC60to30v3</grid>
1557+
<mask>oEC60to30v3</mask>
1558+
</model_grid>
1559+
1560+
<model_grid alias="mpasa30_oEC60to30v3" not_compset="_MOM">
1561+
<grid name="atm">mpasa30</grid>
1562+
<grid name="lnd">mpasa30</grid>
1563+
<grid name="ocnice">oEC60to30v3</grid>
1564+
<mask>oEC60to30v3</mask>
1565+
</model_grid>
1566+
1567+
<model_grid alias="mpasa60_oQU060" not_compset="_MOM">
1568+
<grid name="atm">mpasa60</grid>
1569+
<grid name="lnd">mpasa60</grid>
1570+
<grid name="ocnice">oQU060</grid>
1571+
<mask>oQU060</mask>
1572+
</model_grid>
1573+
1574+
<model_grid alias="mpasa30_oQU030" not_compset="_MOM">
1575+
<grid name="atm">mpasa30</grid>
1576+
<grid name="lnd">mpasa30</grid>
1577+
<grid name="ocnice">oQU030</grid>
1578+
<mask>oQU030</mask>
1579+
</model_grid>
1580+
1581+
<model_grid alias="mpasa15_oQU015" not_compset="_MOM">
1582+
<grid name="atm">mpasa15</grid>
1583+
<grid name="lnd">mpasa15</grid>
1584+
<grid name="ocnice">oQU015</grid>
1585+
<mask>oQU015</mask>
1586+
</model_grid>
1587+
1588+
<model_grid alias="mpasa7p5_oQU0075" not_compset="_MOM">
1589+
<grid name="atm">mpasa7p5</grid>
1590+
<grid name="lnd">mpasa7p5</grid>
1591+
<grid name="ocnice">oQU0075</grid>
1592+
<mask>oQU0075</mask>
1593+
</model_grid>
1594+
1595+
<model_grid alias="mpasa3p75_oQU00375" not_compset="_MOM">
1596+
<grid name="atm">mpasa3p75</grid>
1597+
<grid name="lnd">mpasa3p75</grid>
1598+
<grid name="ocnice">oQU00375</grid>
1599+
<mask>oQU00375</mask>
1600+
</model_grid>
1601+
1602+
<model_grid alias="mpasa60-3wus_oRR60-3WUS" not_compset="_MOM">
1603+
<grid name="atm">mpasa60-3wus</grid>
1604+
<grid name="lnd">mpasa60-3wus</grid>
1605+
<grid name="ocnice">oRR60-3WUS</grid>
1606+
<mask>oRR60-3WUS</mask>
1607+
</model_grid>
1608+
1609+
<model_grid alias="mpasa60-3wus_mpasa60-3wus" not_compset="_MOM">
1610+
<grid name="atm">mpasa60-3wus</grid>
1611+
<grid name="lnd">mpasa60-3wus</grid>
1612+
<grid name="ocnice">mpasa60-3wus</grid>
1613+
<mask>mpasa60-3wus</mask>
1614+
</model_grid>
1615+
1616+
<model_grid alias="T62_oRR60-3WUS" not_compset="_MOM">
1617+
<grid name="atm">T62</grid>
1618+
<grid name="lnd">T62</grid>
1619+
<grid name="ocnice">oRR60-3WUS</grid>
1620+
<mask>oRR60-3WUS</mask>
1621+
</model_grid>
1622+
1623+
<!-- END EarthWorks Specific, MPAS-A+MPAS-O grids -->
1624+
14321625

14331626
<!-- new runoff grids for data runoff model DROF -->
14341627

0 commit comments

Comments
 (0)