Skip to content

Commit

Permalink
updates for tnx1v4 mask and ocn/ice
Browse files Browse the repository at this point in the history
  • Loading branch information
@mvertens
mvertens committed Jun 26, 2023
1 parent d84927d commit 13c3ce1
Show file tree
Hide file tree
Showing 3 changed files with 108 additions and 1,068 deletions.
45 changes: 0 additions & 45 deletions component_grids_nuopc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@
<nx>144</nx> <ny>96</ny>
<!-- This is needed for PTS_MODE - it specifies the xml variable PTS_DOMAINFILE -->
<file>$DIN_LOC_ROOT/share/domains/domain.lnd.fv1.9x2.5_gx1v7.181205.nc</file>
<!-- TODO: the lats for the gx1v7 and gx1v6 mask are different at
the poles- the 141008 should be used for both but would change answers -->
<mesh>$DIN_LOC_ROOT/share/meshes/fv1.9x2.5_141008_ESMFmesh.nc</mesh>
<desc>1.9x2.5 is FV 2-deg grid:</desc>
</domain>
Expand Down Expand Up @@ -302,47 +300,10 @@
<desc>TL639 grid for ERA5</desc>
</domain>

<!-- fvcubed domains-->
<domain name="C24">
<nx>3456</nx> <ny>1</ny>
<mesh>$DIN_LOC_ROOT/share/meshes/C24_181018_ESMFmesh.nc</mesh>
<desc>C24 is a fvcubed xx-deg grid:</desc>
<support>Experimental for fv3 dycore</support>
</domain>
<domain name="C48">
<nx>13824</nx> <ny>1</ny>
<mesh>$DIN_LOC_ROOT/share/meshes/C48_181018_ESMFmesh.nc</mesh>
<desc>C48 is a fvcubed xx-deg grid:</desc>
<support>Experimental for fv3 dycore</support>
</domain>
<domain name="C96">
<nx>55296</nx> <ny>1</ny>
<mesh>$DIN_LOC_ROOT/share/meshes/C96_181018_ESMFmesh.nc</mesh>
<desc>C96 is a fvcubed xx-deg grid:</desc>
<support>Experimental for fv3 dycore</support>
</domain>
<domain name="C192">
<nx>221184</nx> <ny>1</ny>
<mesh>$DIN_LOC_ROOT/share/meshes/C192_181018_ESMFmesh.nc</mesh>
<desc>C192 is a fvcubed xx-deg grid:</desc>
<support>Experimental for fv3 dycore</support>
</domain>
<domain name="C384">
<nx>884736</nx> <ny>1</ny>
<mesh>$DIN_LOC_ROOT/share/meshes/C384_181018_ESMFmesh.nc</mesh>
<desc>C384 is a fvcubed xx-deg grid:</desc>
<support>Experimental for fv3 dycore</support>
</domain>

<!-- ======================================================== -->
<!-- OCN/ICE domains -->
<!-- ======================================================== -->

<domain name="gx1v6">
<nx>320</nx> <ny>384</ny>
<mesh>$DIN_LOC_ROOT/share/meshes/gx1v6_090205_ESMFmesh.nc</mesh>
<desc>gx1v6 is displaced Greenland pole v6 1-deg grid:</desc>
</domain>
<domain name="gx1v7">
<nx>320</nx> <ny>384</ny>
<mesh>$DIN_LOC_ROOT/share/meshes/gx1v7_151008_ESMFmesh.nc</mesh>
Expand Down Expand Up @@ -377,12 +338,6 @@
<desc>tx0.1v3 is tripole v3 1/10-deg grid:</desc>
<support>Experimental for high resolution experiments</support>
</domain>
<domain name="tx1v1">
<nx>360</nx> <ny>240</ny>
<mesh>$DIN_LOC_ROOT/share/meshes/tx1v1_ESMFMesh_cd5_c20210105.nc</mesh>
<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="tnx1v4">
<nx>360</nx> <ny>384</ny>
<mesh>$DIN_LOC_ROOT/share/meshes/tnx1v4_20170601_cdf5_ESMFmesh.nc</mesh>
Expand Down
41 changes: 0 additions & 41 deletions maps_nuopc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/gridmaps/rx1/map_rx1_to_gx3v7_nnsm_e1000r500_180430.nc</map>
<map name="ROF2OCN_ICE_RMAPNAME">cpl/gridmaps/rx1/map_rx1_to_gx3v7_nnsm_e1000r500_180430.nc</map>
</gridmap>
<gridmap rof_grid="rx1" ocn_grid="gx1v6" >
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/gridmaps/rx1/map_rx1_to_gx1v6_nn_open_ocean_nnsm_e1000r300_marginal_sea_170503.nc</map>
<map name="ROF2OCN_ICE_RMAPNAME">cpl/gridmaps/rx1/map_rx1_to_gx1v6_nnsm_e1000r300_170503.nc</map>
</gridmap>
<gridmap rof_grid="rx1" ocn_grid="gx1v7" >
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/gridmaps/rx1/map_rx1_to_gx1v7_nn_open_ocean_nnsm_e1000r300_marginal_sea_170413.nc</map>
<map name="ROF2OCN_ICE_RMAPNAME">cpl/gridmaps/rx1/map_rx1_to_gx1v7_nnsm_e1000r300_170413.nc</map>
Expand Down Expand Up @@ -46,10 +42,6 @@
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r05_to_tnx1v4_e1000r300_170609.nc</map>
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r05_to_tnx1v4_e1000r300_170609.nc</map>
</gridmap>
<gridmap rof_grid="r05" ocn_grid="gx1v6" >
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/gridmaps/r05/map_r05_to_gx1v6_nn_open_ocean_nnsm_e1000r300_marginal_sea_170503.nc</map>
<map name="ROF2OCN_ICE_RMAPNAME">cpl/gridmaps/r05/map_r05_to_gx1v6_nnsm_e1000r300_170503.nc</map>
</gridmap>
<gridmap rof_grid="r05" ocn_grid="gx1v7" >
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/gridmaps/r05/map_r05_to_gx1v7_nn_open_ocean_nnsm_e1000r300_marginal_sea_170413.nc</map>
<map name="ROF2OCN_ICE_RMAPNAME">cpl/gridmaps/r05/map_r05_to_gx1v7_nnsm_e1000r300_170413.nc</map>
Expand All @@ -62,10 +54,6 @@
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r05_to_tx0.1v2_r500e1000_080620.nc</map>
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r05_to_tx0.1v2_r500e1000_080620.nc</map>
</gridmap>
<gridmap rof_grid="r01" ocn_grid="gx1v6" >
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r01_to_gx1v6_120711.nc</map>
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r01_to_gx1v6_120711.nc</map>
</gridmap>
<gridmap rof_grid="JRA025v2" ocn_grid="gx1v7" >
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/gridmaps/rJRA025/map_JRA025m_to_gx1v7_nn_open_ocean_nnsm_e1000r300_marginal_sea_190214.nc</map>
<map name="ROF2OCN_ICE_RMAPNAME">cpl/gridmaps/rJRA025/map_JRA025m_to_gx1v7_e1000r300_190214.nc</map>
Expand Down Expand Up @@ -110,10 +98,6 @@
<!-- mapping is turned off in the system.) -->
<!-- ======================================================== -->

<gridmap ocn_grid="gx1v6" glc_grid="gris4" >
<map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/gland4km/map_gland4km_to_gx1v6_nn_open_ocean_nnsm_e1000r300_marginal_sea_171105.nc</map>
<map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/gland4km/map_gland4km_to_gx1v6_nnsm_e1000r300_171105.nc</map>
</gridmap>
<gridmap ocn_grid="gx1v7" glc_grid="gris4" >
<map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/gland4km/map_gland4km_to_gx1v7_nn_open_ocean_nnsm_e1000r300_marginal_sea_171105.nc</map>
<map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/gland4km/map_gland4km_to_gx1v7_nnsm_e1000r300_171105.nc</map>
Expand All @@ -123,10 +107,6 @@
<map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/gland4km/map_gland4km_to_gx3v7_nnsm_e1000r500_180502.nc</map>
<map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/gland4km/map_gland4km_to_gx3v7_nnsm_e1000r500_180502.nc</map>
</gridmap>
<gridmap ocn_grid="gx1v6" glc_grid="gris20" >
<map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/gland20km/map_gland20km_to_gx1v6_nn_open_ocean_nnsm_e1000r300_marginal_sea_171105.nc</map>
<map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/gland20km/map_gland20km_to_gx1v6_nnsm_e1000r300_171105.nc</map>
</gridmap>
<gridmap ocn_grid="gx1v7" glc_grid="gris20" >
<map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/gland20km/map_gland20km_to_gx1v7_nn_open_ocean_nnsm_e1000r300_marginal_sea_171105.nc</map>
<map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/gland20km/map_gland20km_to_gx1v7_nnsm_e1000r300_171105.nc</map>
Expand All @@ -145,27 +125,6 @@
<map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/gland4km/map_gland4km_to_tx0.66v1_nnsm_e1000r300_190314.nc</map>
</gridmap>

<!-- ======================================================== -->
<!-- wav->ocn, ocn->wav, ice->wav -->
<!-- TODO: these should be removed - only here for backwards compatibility with MCT -->
<!-- ======================================================== -->

<gridmap ocn_grid="gx3v7" wav_grid="ww3a">
<map name="WAV2OCN_SMAPNAME">cpl/gridmaps/ww3a/map_ww3a_TO_gx3v7_splice_150428.nc</map>
<map name="OCN2WAV_SMAPNAME">cpl/gridmaps/gx3v7/map_gx3v7_TO_ww3a_splice_150428.nc</map>
<map name="ICE2WAV_SMAPNAME">cpl/gridmaps/gx3v7/map_gx3v7_TO_ww3a_splice_150428.nc</map>
</gridmap>
<gridmap ocn_grid="gx1v6" wav_grid="ww3a">
<map name="WAV2OCN_SMAPNAME">cpl/gridmaps/ww3a/map_ww3a_TO_gx1v6_splice_150428.nc</map>
<map name="OCN2WAV_SMAPNAME">cpl/gridmaps/gx1v6/map_gx1v6_TO_ww3a_splice_150428.nc</map>
<map name="ICE2WAV_SMAPNAME">cpl/gridmaps/gx1v6/map_gx1v6_TO_ww3a_splice_150428.nc</map>
</gridmap>
<gridmap ocn_grid="gx1v7" wav_grid="ww3a">
<map name="WAV2OCN_SMAPNAME">cpl/gridmaps/ww3a/map_ww3a_TO_gx1v7_splice_170214.nc</map>
<map name="OCN2WAV_SMAPNAME">cpl/gridmaps/gx1v7/map_gx1v7_TO_ww3a_splice_170214.nc</map>
<map name="ICE2WAV_SMAPNAME">cpl/gridmaps/gx1v7/map_gx1v7_TO_ww3a_splice_170214.nc</map>
</gridmap>

<!-- ======================================================== -->
<!-- MizuRoute mapping files -->
<!-- ======================================================== -->
Expand Down
Loading

0 comments on commit 13c3ce1

Please sign in to comment.