Skip to content

Add MPAS-O and MPAS-SI from EarthWorksOrg/EarthWorks #241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Jun 18, 2025
Merged

Add MPAS-O and MPAS-SI from EarthWorksOrg/EarthWorks #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ff47575
Add mpas grids for earthworks
Aug 27, 2022
65cd846
Update modelgrid_aliases_nuopc.xml
Sep 7, 2022
54b99b0
Merge ESMCI/ccs_config_cesm tag 'ccs_config_cesm0.0.76' into 'eworg_m…
gdicker1 May 12, 2025
3cbd61e
Define the necessary grids to permit runoff remapping
dazlich Oct 5, 2023
eef4545
Merge ESMCI/ccs_config_cesm tag 'ccs_config_cesm0.0.99' into 'eworg_m…
gdicker1 May 12, 2025
36e3df2
Fix hardcoded paths oQU480 and oQU240 domains
gdicker1 May 10, 2024
bf43f70
Merge ESMCI/ccs_config_cesm tag 'ccs_config_cesm1.0.7' into 'eworg_mp…
gdicker1 May 12, 2025
bd63371
Update EarthWorks specific aliases, match CESM convention
gdicker1 Oct 14, 2024
4b26480
Update 15km file defaults
dazlich Dec 30, 2024
98cd576
Merge ESMCI/ccs_config_cesm tag 'ccs_config_cesm1.0.19' into 'eworg_m…
gdicker1 May 12, 2025
ed91aa3
Update hires file information
dazlich Feb 18, 2025
ff68d04
Merge tag 'ccs_config_cesm1.0.40' into branch 'eworg_mpasso_mpassi'
gdicker1 Jun 11, 2025
1fd1e60
new 30km ocean files
dazlich May 27, 2025
fa2f4fc
Move MPAS-O,SI Makefile mods to Depends files
gdicker1 Jun 17, 2025
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
61 changes: 61 additions & 0 deletions component_grids_nuopc.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,67 @@
<desc>tripole v1 1-deg grid: testing proxy for high-res tripole ocean grids- do not use for scientific experiments</desc>
<support>Experimental tripole ocean grid</support>
</domain>
<domain name="oQU480">
<nx>7234</nx> <ny>1</ny>
<mesh driver="nuopc">$DIN_LOC_ROOT/ocn/mpas-o/oQU480/oQU480_ESMFmesh.nc</mesh>
<desc>oQU480 is a MPAS ocean grid that is roughly 4 degree resolution:</desc>
<support>Experimental, under development</support>
</domain>
<domain name="oQU240">
<nx>7234</nx> <ny>1</ny>
<mesh driver="nuopc">$DIN_LOC_ROOT/ocn/mpas-o/oQU240/oQU240_ESMFmesh.nc</mesh>
<desc>oQU240 is a MPAS ocean grid that is roughly 2 degree resolution:</desc>
<support>Experimental, under development</support>
</domain>
<domain name="oQU120">
<nx>28876</nx> <ny>1</ny>
<mesh driver="nuopc">$DIN_LOC_ROOT/ocn/mpas-o/oQU120/oQU120_ESMFmesh.230524.nc</mesh>
<desc>oQU120 is a MPAS ocean grid that is roughly 1 degree resolution:</desc>
<support>Experimental, under development</support>
</domain>
<domain name="oEC60to30v3">
<nx>28571</nx> <ny>1</ny>
<mesh driver="nuopc">/glade/work/dazlich/ec60_30/oEC60to30_ESMFmesh.nc</mesh>
<desc>oEC60to30v3 is a MPAS ocean grid that is roughly 1/2 degree resolution:</desc>
<support>Experimental, under development</support>
</domain>
<domain name="oQU060">
<nx>115494</nx> <ny>1</ny>
<mesh driver="nuopc">$DIN_LOC_ROOT/ocn/mpas-o/oQU060/oQU060_ESMFmesh.230907.nc</mesh>
<desc>oQU060 is a MPAS ocean grid that is roughly 1/2 degree resolution:</desc>
<support>Experimental, under development</support>
</domain>
<domain name="oQU030">
<nx>462000</nx> <ny>1</ny>
<mesh driver="nuopc">$DIN_LOC_ROOT/ocn/mpas-o/oQU030/oQU030_ESMFmesh.241221.nc</mesh>
<desc>oQU030 is a MPAS ocean grid that is roughly 1/4 degree resolution:</desc>
<support>Experimental, under development</support>
</domain>
<domain name="oQU015">
<nx>1850090</nx> <ny>1</ny>
<mesh driver="nuopc">$DIN_LOC_ROOT/ocn/mpas-o/oQU015/oQU015_ESMFmesh.241221.nc</mesh>
<desc>oQU015 is a MPAS ocean grid that is roughly 1/8 degree resolution:</desc>
<support>Experimental, under development</support>
</domain>
<domain name="oQU0075">
<nx>7399783</nx> <ny>1</ny>
<mesh driver="nuopc">$DIN_LOC_ROOT/ocn/mpas-o/oQU0075/oQU0075_ESMFmesh.241221.nc</mesh>
<desc>oQU0075 is a MPAS ocean grid that is roughly 1/16 degree resolution:</desc>
<support>Experimental, under development</support>
</domain>
<domain name="oQU00375">
<nx>29598824</nx> <ny>1</ny>
<mesh driver="nuopc">$DIN_LOC_ROOT/ocn/mpas-o/oQU00375/oQU00375_ESMFmesh.241221.nc</mesh>
<desc>oQU00375 is a MPAS ocean grid that is roughly 1/32 degree resolution:</desc>
<support>Experimental, under development</support>
</domain>
<domain name="oRR60-3WUS">
<nx>835536</nx> <ny>1</ny>
<mesh driver="nuopc">/glade/work/dazlich/oRR60-3/oRR60-3WUS_ESMFmesh.nc</mesh>
<desc>oQU60-3wus is a MPAS ocean grid that s 3km region refinement over the western US:</desc>
<support>Experimental, under development</support>
</domain>


<!-- ======================================================== -->
<!-- ROF domains -->
Expand Down
9 changes: 9 additions & 0 deletions machines/Depends.gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,12 @@ mo_fluxes_broadband_kernels.o

$(RRTMGP_OBJS): %.o: %.F90
$(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -fno-openmp $<

ifeq ($(COMP_NAME),mpassi)
# mpas seaice files that can't compile with optimization using gnu
MPASSI_NOOPT_OBJS=\
ice_shortwave.o

$(MPASSI_NOOPT_OBJS): %.o : %.F90
$(FC) -c $(FPPFLAGS) $(INCLDIR) $(INCS) $(FREEFLAGS) $(FFLAGS) $(FFLAGS_NOOPT) $<
endif
6 changes: 6 additions & 0 deletions machines/Depends.nvhpc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,12 @@ ifeq ($(DEBUG),FALSE)
$(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) $(OPENACC_GPU_FLAGS) $<
$(CLUBB_OBJS): %.o: %.F90
$(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) $(OPENACC_GPU_FLAGS) $<

ifeq ($(COMP_NAME),mpaso)
# mpas ocean files need gpuflags
FFLAGS +=$(GPUFLAGS)
endif

else
$(REDUCED_ERRORCHKS_IN_DEBUG): %.o: %.F90
$(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -Mnobounds -Ktrap=none -Knoieee $<
Expand Down
28 changes: 28 additions & 0 deletions maps_nuopc.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,34 @@
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/gridmaps/rJRA025/map_jra_to_tx2_3_nnsm_e250r250_241211.nc</map>
<map name="ROF2OCN_ICE_RMAPNAME">cpl/gridmaps/rJRA025/map_jra_to_tx2_3_nnsm_e250r250_241211.nc</map>
</gridmap>
<gridmap rof_grid="rx1" ocn_grid="oQU120" >
<map name="ROF2OCN_LIQ_RMAPNAME">rof/remap/wght_file_drof_qu120.230123.nc</map>
<map name="ROF2OCN_ICE_RMAPNAME">rof/remap/wght_file_drof_qu120.230123.nc</map>
</gridmap>
<gridmap rof_grid="r05" ocn_grid="oQU120" >
<map name="ROF2OCN_LIQ_RMAPNAME">rof/remap/wght_file_mosart_qu120.230123.nc</map>
<map name="ROF2OCN_ICE_RMAPNAME">rof/remap/wght_file_mosart_qu120.230123.nc</map>
</gridmap>
<gridmap rof_grid="r05" ocn_grid="oQU060" >
<map name="ROF2OCN_LIQ_RMAPNAME">rof/remap/wght_file_mosart_qu060.230613.nc</map>
<map name="ROF2OCN_ICE_RMAPNAME">rof/remap/wght_file_mosart_qu060.230613.nc</map>
</gridmap>
<gridmap rof_grid="JRA025v2" ocn_grid="oQU120" >
<map name="ROF2OCN_LIQ_RMAPNAME">rof/remap/wght_file_jra_qu120.230517.nc</map>
<map name="ROF2OCN_ICE_RMAPNAME">rof/remap/wght_file_jra_qu120.230517.nc</map>
</gridmap>
<gridmap rof_grid="JRA025v2" ocn_grid="oQU060" >
<map name="ROF2OCN_LIQ_RMAPNAME">rof/remap/wght_file_jra_qu060.230613.nc</map>
<map name="ROF2OCN_ICE_RMAPNAME">rof/remap/wght_file_jra_qu060.230613.nc</map>
</gridmap>
<gridmap rof_grid="r05" ocn_grid="oQU030" >
<map name="ROF2OCN_LIQ_RMAPNAME">rof/remap/wght_file_mosart_qu030.241221.nc</map>
<map name="ROF2OCN_ICE_RMAPNAME">rof/remap/wght_file_mosart_qu030.241221.nc</map>
</gridmap>
<gridmap rof_grid="JRA025v2" ocn_grid="oQU030" >
<map name="ROF2OCN_LIQ_RMAPNAME">rof/remap/wght_file_jra_qu030.241221.nc</map>
<map name="ROF2OCN_ICE_RMAPNAME">rof/remap/wght_file_jra_qu030.241221.nc</map>
</gridmap>

<!-- ======================================================== -->
<!-- MizuRoute mapping files -->
Expand Down
193 changes: 193 additions & 0 deletions modelgrid_aliases_nuopc.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,98 @@
<mask>oQU120</mask>
</model_grid>

<!-- EarthWorks Specific, MPAS-O+ROF -->
<model_grid alias="TL319_oQU120" not_compset="_CAM">
<grid name="atm">TL319</grid>
<grid name="lnd">TL319</grid>
<grid name="ocnice">oQU120</grid>
<grid name="rof">JRA025v2</grid>
<mask>oQU120</mask>
</model_grid>

<model_grid alias="T62_oEC60to30v3" not_compset="_CAM">
<grid name="atm">T62</grid>
<grid name="lnd">T62</grid>
<grid name="ocnice">oEC60to30v3</grid>
<mask>oEC60to30v3</mask>
</model_grid>

<model_grid alias="T62_oQU060" not_compset="_CAM">
<grid name="atm">T62</grid>
<grid name="lnd">T62</grid>
<grid name="ocnice">oQU060</grid>
<mask>oQU060</mask>
</model_grid>

<model_grid alias="TL319_oQU060" not_compset="_CAM">
<grid name="atm">TL319</grid>
<grid name="lnd">TL319</grid>
<grid name="ocnice">oQU060</grid>
<grid name="rof">JRA025v2</grid>
<mask>oQU060</mask>
</model_grid>

<model_grid alias="T62_oQU030" not_compset="_CAM">
<grid name="atm">T62</grid>
<grid name="lnd">T62</grid>
<grid name="ocnice">oQU030</grid>
<mask>oQU030</mask>
</model_grid>

<model_grid alias="TL319_oQU030" not_compset="_CAM">
<grid name="atm">TL319</grid>
<grid name="lnd">TL319</grid>
<grid name="ocnice">oQU030</grid>
<grid name="rof">JRA025v2</grid>
<mask>oQU030</mask>
</model_grid>

<model_grid alias="TL319_oQU015" not_compset="_CAM">
<grid name="atm">TL319</grid>
<grid name="lnd">TL319</grid>
<grid name="ocnice">oQU015</grid>
<grid name="rof">JRA025v2</grid>
<mask>oQU015</mask>
</model_grid>

<model_grid alias="T62_oQU015" not_compset="_CAM">
<grid name="atm">T62</grid>
<grid name="lnd">T62</grid>
<grid name="ocnice">oQU015</grid>
<mask>oQU015</mask>
</model_grid>

<model_grid alias="T62_oQU0075" not_compset="_CAM">
<grid name="atm">T62</grid>
<grid name="lnd">T62</grid>
<grid name="ocnice">oQU0075</grid>
<mask>oQU0075</mask>
</model_grid>

<model_grid alias="TL319_oQU0075" not_compset="_CAM">
<grid name="atm">TL319</grid>
<grid name="lnd">TL319</grid>
<grid name="ocnice">oQU0075</grid>
<grid name="rof">JRA025v2</grid>
<mask>oQU0075</mask>
</model_grid>

<model_grid alias="T62_oQU00375" not_compset="_CAM">
<grid name="atm">T62</grid>
<grid name="lnd">T62</grid>
<grid name="ocnice">oQU00375</grid>
<mask>oQU00375</mask>
</model_grid>

<model_grid alias="TL319_oQU00375" not_compset="_CAM">
<grid name="atm">TL319</grid>
<grid name="lnd">TL319</grid>
<grid name="ocnice">oQU00375</grid>
<grid name="rof">JRA025v2</grid>
<mask>oQU00375</mask>
</model_grid>
<!-- END EarthWorks Specific, MPAS-O+ROF -->

<!-- finite volume grids -->

<model_grid alias="f02_g16" not_compset="_MOM">
Expand Down Expand Up @@ -1422,6 +1514,107 @@
<mask>tx0.1v3</mask>
</model_grid>

<!-- EarthWorks Specific, MPAS-A+MPAS-O grids -->
<model_grid alias="mpasa480_oQU480" not_compset="_MOM">
<grid name="atm">mpasa480</grid>
<grid name="lnd">mpasa480</grid>
<grid name="ocnice">oQU480</grid>
<mask>oQU480</mask>
</model_grid>

<model_grid alias="mpasa240_oQU240" not_compset="_MOM">
<grid name="atm">mpasa240</grid>
<grid name="lnd">mpasa240</grid>
<grid name="ocnice">oQU240</grid>
<mask>oQU240</mask>
</model_grid>

<model_grid alias="mpasa120_oQU120" not_compset="_MOM">
<grid name="atm">mpasa120</grid>
<grid name="lnd">mpasa120</grid>
<grid name="ocnice">oQU120</grid>
<mask>oQU120</mask>
</model_grid>

<model_grid alias="mpasa120_oEC60to30v3" not_compset="_MOM">
<grid name="atm">mpasa120</grid>
<grid name="lnd">mpasa120</grid>
<grid name="ocnice">oEC60to30v3</grid>
<mask>oEC60to30v3</mask>
</model_grid>

<model_grid alias="mpasa60_oEC60to30v3" not_compset="_MOM">
<grid name="atm">mpasa60</grid>
<grid name="lnd">mpasa60</grid>
<grid name="ocnice">oEC60to30v3</grid>
<mask>oEC60to30v3</mask>
</model_grid>

<model_grid alias="mpasa30_oEC60to30v3" not_compset="_MOM">
<grid name="atm">mpasa30</grid>
<grid name="lnd">mpasa30</grid>
<grid name="ocnice">oEC60to30v3</grid>
<mask>oEC60to30v3</mask>
</model_grid>

<model_grid alias="mpasa60_oQU060" not_compset="_MOM">
<grid name="atm">mpasa60</grid>
<grid name="lnd">mpasa60</grid>
<grid name="ocnice">oQU060</grid>
<mask>oQU060</mask>
</model_grid>

<model_grid alias="mpasa30_oQU030" not_compset="_MOM">
<grid name="atm">mpasa30</grid>
<grid name="lnd">mpasa30</grid>
<grid name="ocnice">oQU030</grid>
<mask>oQU030</mask>
</model_grid>

<model_grid alias="mpasa15_oQU015" not_compset="_MOM">
<grid name="atm">mpasa15</grid>
<grid name="lnd">mpasa15</grid>
<grid name="ocnice">oQU015</grid>
<mask>oQU015</mask>
</model_grid>

<model_grid alias="mpasa7p5_oQU0075" not_compset="_MOM">
<grid name="atm">mpasa7p5</grid>
<grid name="lnd">mpasa7p5</grid>
<grid name="ocnice">oQU0075</grid>
<mask>oQU0075</mask>
</model_grid>

<model_grid alias="mpasa3p75_oQU00375" not_compset="_MOM">
<grid name="atm">mpasa3p75</grid>
<grid name="lnd">mpasa3p75</grid>
<grid name="ocnice">oQU00375</grid>
<mask>oQU00375</mask>
</model_grid>

<model_grid alias="mpasa60-3wus_oRR60-3WUS" not_compset="_MOM">
<grid name="atm">mpasa60-3wus</grid>
<grid name="lnd">mpasa60-3wus</grid>
<grid name="ocnice">oRR60-3WUS</grid>
<mask>oRR60-3WUS</mask>
</model_grid>

<model_grid alias="mpasa60-3wus_mpasa60-3wus" not_compset="_MOM">
<grid name="atm">mpasa60-3wus</grid>
<grid name="lnd">mpasa60-3wus</grid>
<grid name="ocnice">mpasa60-3wus</grid>
<mask>mpasa60-3wus</mask>
</model_grid>

<model_grid alias="T62_oRR60-3WUS" not_compset="_MOM">
<grid name="atm">T62</grid>
<grid name="lnd">T62</grid>
<grid name="ocnice">oRR60-3WUS</grid>
<mask>oRR60-3WUS</mask>
</model_grid>

<!-- END EarthWorks Specific, MPAS-A+MPAS-O grids -->


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

Expand Down