Skip to content
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.

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

Add new NARRM14to30E3r1 and NARRM14to30E3r2 ocean and sea-ice meshes #80

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Prev Previous commit
Next Next commit
Replace domain and mapping files for NARRM14to30E3r1
  • Loading branch information
jonbob authored and xylar committed May 16, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit a829611d4e277593d03189d015e4975ee7a4f667
72 changes: 36 additions & 36 deletions cime_config/config_grids.xml
Original file line number Diff line number Diff line change
@@ -2631,7 +2631,7 @@
<file grid="atm|lnd" mask="SOwISC12to60E2r4">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_SOwISC12to60E2r4.210119.nc</file>
<file grid="atm|lnd" mask="ECwISC30to60E2r1">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_ECwISC30to60E2r1.201007.nc</file>
<file grid="atm|lnd" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_IcoswISC30E3r5.231121.nc</file>
<file grid="atm|lnd" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_NARRM14to30E3r1.240228.nc</file>
<file grid="atm|lnd" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_NARRM14to30E3r1.240326.nc</file>
<desc>T62 is Gaussian grid:</desc>
</domain>

@@ -2686,8 +2686,8 @@
<file grid="ice|ocn" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_IcoswISC30E3r5.231121.nc</file>
<file grid="atm|lnd" mask="IcosXISC30E3r7">$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_IcosXISC30E3r7.240326.nc</file>
<file grid="ice|ocn" mask="IcosXISC30E3r7">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_IcosXISC30E3r7.240326.nc</file>
<file grid="atm|lnd" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_NARRM14to30E3r1.240228.nc</file>
<file grid="ice|ocn" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_NARRM14to30E3r1.240228.nc</file>
<file grid="atm|lnd" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_NARRM14to30E3r1.240326.nc</file>
<file grid="ice|ocn" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_NARRM14to30E3r1.240326.nc</file>
<file grid="atm|lnd" mask="oRRS18to6v3">$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_oRRS18to6v3.220124.nc</file>
<file grid="ice|ocn" mask="oRRS18to6v3">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_oRRS18to6v3.220124.nc</file>
<desc>TL319 is JRA lat/lon grid:</desc>
@@ -2799,8 +2799,8 @@
<file grid="ice|ocn" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_IcoswISC30E3r5.231121.nc</file>
<file grid="atm|lnd" mask="IcosXISC30E3r7">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_IcosXISC30E3r7.240326.nc</file>
<file grid="ice|ocn" mask="IcosXISC30E3r7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_IcosXISC30E3r7.240326.nc</file>
<file grid="atm|lnd" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_NARRM14to30E3r1.240228.nc</file>
<file grid="ice|ocn" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_NARRM14to30E3r1.240228.nc</file>
<file grid="atm|lnd" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_NARRM14to30E3r1.240326.nc</file>
<file grid="ice|ocn" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_NARRM14to30E3r1.240326.nc</file>
<file grid="atm|lnd" mask="gx1v6">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_gx1v6.190806.nc</file>
<file grid="ice|ocn" mask="gx1v6">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_gx1v6.190806.nc</file>
<desc>ne30np4.pg2 is Spectral Elem 1-deg grid w/ 2x2 FV physics grid per element:</desc>
@@ -3113,7 +3113,7 @@
<domain name="NARRM14to30E3r1">
<nx>662141</nx>
<ny>1</ny>
<file grid="ice|ocn">$DIN_LOC_ROOT/share/domains/domain.ocn.NARRM14to30E3r1.240228.nc</file>
<file grid="ice|ocn">$DIN_LOC_ROOT/share/domains/domain.ocn.NARRM14to30E3r1.240326.nc</file>
<desc>NARRM14to30E3r1 is a MPAS ocean grid generated with the jigsaw/compass process XXXX TODO:</desc>
</domain>

@@ -3151,8 +3151,8 @@
<file grid="lnd" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_IcoswISC30E3r5.231121.nc</file>
<file grid="atm" mask="IcosXISC30E3r7">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_IcosXISC30E3r7.240326.nc</file>
<file grid="lnd" mask="IcosXISC30E3r7">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_IcosXISC30E3r7.240326.nc</file>
<file grid="atm" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_NARRM14to30E3r1.240228.nc</file>
<file grid="lnd" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_NARRM14to30E3r1.240228.nc</file>
<file grid="atm" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_NARRM14to30E3r1.240326.nc</file>
<file grid="lnd" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_NARRM14to30E3r1.240326.nc</file>
<file grid="lnd" mask="gx1v6">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_gx1v6.191014.nc</file>
<desc>r05 is 1/2 degree river routing grid:</desc>
</domain>
@@ -3318,8 +3318,8 @@
<file grid="ice|ocn" mask="EC30to60E2r2">$DIN_LOC_ROOT/share/domains/domain.ocn.northamericax4v1pg2_EC30to60E2r2.220428.nc</file>
<file grid="atm|lnd" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.lnd.northamericax4v1pg2_IcoswISC30E3r5.240416.nc</file>
<file grid="ice|ocn" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.ocn.northamericax4v1pg2_IcoswISC30E3r5.240416.nc</file>
<file grid="atm|lnd" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.northamericax4v1pg2_NARRM14to30E3r1.240304.nc</file>
<file grid="ice|ocn" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.ocn.northamericax4v1pg2_NARRM14to30E3r1.240304.nc</file>
<file grid="atm|lnd" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.northamericax4v1pg2_NARRM14to30E3r1.240326.nc</file>
<file grid="ice|ocn" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.ocn.northamericax4v1pg2_NARRM14to30E3r1.240326.nc</file>
<desc>1-deg with 1/4-deg over North America (version 1) pg2:</desc>
</domain>

@@ -3646,13 +3646,13 @@
</gridmap>

<gridmap atm_grid="ne30np4.pg2" ocn_grid="NARRM14to30E3r1">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_traave.20240228.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_trbilin.20240228.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_trbilin.20240228.nc</map>
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_ne30pg2_traave.20240228.nc</map>
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_ne30pg2_traave.20240228.nc</map>
<map name="ATM2ICE_FMAPNAME_NONLINEAR">cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_trfvnp2.20240228.nc</map>
<map name="ATM2OCN_FMAPNAME_NONLINEAR">cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_trfvnp2.20240228.nc</map>
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_traave.20240326.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_trbilin.20240326.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_trbilin.20240326.nc</map>
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_ne30pg2_traave.20240326.nc</map>
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_ne30pg2_traave.20240326.nc</map>
<map name="ATM2ICE_FMAPNAME_NONLINEAR">cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_trfvnp2.20240326.nc</map>
<map name="ATM2OCN_FMAPNAME_NONLINEAR">cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_trfvnp2.20240326.nc</map>
</gridmap>

<gridmap atm_grid="ne30np4.pg3" ocn_grid="oEC60to30v3">
@@ -4152,13 +4152,13 @@
</gridmap>

<gridmap atm_grid="ne0np4_northamericax4v1.pg2" ocn_grid="NARRM14to30E3r1">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_traave.20240304.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_trbilin.20240304.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_trbilin.20240304.nc</map>
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_northamericax4v1pg2_traave.20240304.nc</map>
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_northamericax4v1pg2_traave.20240304.nc</map>
<map name="ATM2ICE_FMAPNAME_NONLINEAR">cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_trfvnp2.20240304.nc</map>
<map name="ATM2OCN_FMAPNAME_NONLINEAR">cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_trfvnp2.20240304.nc</map>
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_traave.20240326.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_trbilin.20240326.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_trbilin.20240326.nc</map>
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_northamericax4v1pg2_traave.20240326.nc</map>
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_northamericax4v1pg2_traave.20240326.nc</map>
<map name="ATM2ICE_FMAPNAME_NONLINEAR">cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_trfvnp2.20240326.nc</map>
<map name="ATM2OCN_FMAPNAME_NONLINEAR">cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_trfvnp2.20240326.nc</map>
</gridmap>

<gridmap atm_grid="ne0np4_northamericax4v1.pg2" lnd_grid="r0125">
@@ -4433,11 +4433,11 @@
</gridmap>

<gridmap atm_grid="T62" ocn_grid="NARRM14to30E3r1">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/T62/map_T62_to_NARRM14to30E3r1_traave.20240228.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/T62/map_T62_to_NARRM14to30E3r1_trbilin.20240228.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/T62/map_T62_to_NARRM14to30E3r1_esmfpatch.20240228.nc</map>
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_T62_traave.20240228.nc</map>
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_T62_traave.20240228.nc</map>
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/T62/map_T62_to_NARRM14to30E3r1_traave.20240326.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/T62/map_T62_to_NARRM14to30E3r1_trbilin.20240326.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/T62/map_T62_to_NARRM14to30E3r1_esmfpatch.20240326.nc</map>
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_T62_traave.20240326.nc</map>
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_T62_traave.20240326.nc</map>
</gridmap>

<gridmap atm_grid="TL319" ocn_grid="oEC60to30v3">
@@ -4577,11 +4577,11 @@
</gridmap>

<gridmap atm_grid="TL319" ocn_grid="NARRM14to30E3r1">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/TL319/map_TL319_to_NARRM14to30E3r1_traave.20240228.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/TL319/map_TL319_to_NARRM14to30E3r1_trbilin.20240228.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/TL319/map_TL319_to_NARRM14to30E3r1_esmfpatch.20240228.nc</map>
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_TL319_traave.20240228.nc</map>
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_TL319_traave.20240228.nc</map>
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/TL319/map_TL319_to_NARRM14to30E3r1_traave.20240326.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/TL319/map_TL319_to_NARRM14to30E3r1_trbilin.20240326.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/TL319/map_TL319_to_NARRM14to30E3r1_esmfpatch.20240326.nc</map>
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_TL319_traave.20240326.nc</map>
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_TL319_traave.20240326.nc</map>
</gridmap>

<gridmap atm_grid="TL319" ocn_grid="oRRS18to6v3">
@@ -4965,11 +4965,11 @@
</gridmap>

<gridmap rof_grid="r05" ocn_grid="NARRM14to30E3r1">
<map name="OCN2ROF_SMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_r05_traave.20240228.nc</map>
<map name="OCN2ROF_SMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_r05_traave.20240326.nc</map>
</gridmap>

<gridmap rof_grid="r025" ocn_grid="NARRM14to30E3r1">
<map name="OCN2ROF_SMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_r025_traave.20240304.nc</map>
<map name="OCN2ROF_SMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_r025_traave.20240326.nc</map>
</gridmap>

<gridmap rof_grid="r05" ocn_grid="EC30to60E2r2">