From 60cd6e28a06efc6b6a80d2d6b34693d56cba4bc3 Mon Sep 17 00:00:00 2001 From: Jon Wolfe Date: Tue, 12 Mar 2024 19:25:48 -0500 Subject: [PATCH] Add domain, mapping, and spunup IC support for NARRM14to30E3r1 --- cime_config/config_grids.xml | 130 ++++++++++++++++++++ components/mpas-ocean/cime_config/buildnml | 4 +- components/mpas-seaice/cime_config/buildnml | 4 +- 3 files changed, 134 insertions(+), 4 deletions(-) diff --git a/cime_config/config_grids.xml b/cime_config/config_grids.xml index 3002ebdbdbd8..7366759705fc 100755 --- a/cime_config/config_grids.xml +++ b/cime_config/config_grids.xml @@ -409,6 +409,16 @@ IcoswISC30E3r5 + + T62 + T62 + NARRM14to30E3r1 + rx1 + null + null + NARRM14to30E3r1 + + TL319 TL319 @@ -529,6 +539,16 @@ IcoswISC30E3r5 + + TL319 + TL319 + NARRM14to30E3r1 + JRA025 + null + null + NARRM14to30E3r1 + + TL319 TL319 @@ -993,6 +1013,16 @@ WC14to60E2r3 + + ne0np4_northamericax4v1.pg2 + r025 + NARRM14to30E3r1 + r025 + null + null + NARRM14to30E3r1 + + ne0np4_northamericax4v1.pg2 ne0np4_northamericax4v1.pg2 @@ -1223,6 +1253,16 @@ IcoswISC30E3r5 + + ne30np4.pg2 + ne30np4.pg2 + NARRM14to30E3r1 + r05 + null + null + NARRM14to30E3r1 + + ne0np4_northamericax4v1 r0125 @@ -2064,6 +2104,16 @@ IcoswISC30E3r5 + + ne30np4.pg2 + r05 + NARRM14to30E3r1 + r05 + null + null + NARRM14to30E3r1 + + ne30np4.pg2 r05 @@ -2374,6 +2424,7 @@ $DIN_LOC_ROOT/share/domains/domain.lnd.T62_SOwISC12to60E2r4.210119.nc $DIN_LOC_ROOT/share/domains/domain.lnd.T62_ECwISC30to60E2r1.201007.nc $DIN_LOC_ROOT/share/domains/domain.lnd.T62_IcoswISC30E3r5.231121.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.T62_NARRM14to30E3r1.240228.nc T62 is Gaussian grid: @@ -2418,6 +2469,8 @@ $DIN_LOC_ROOT/share/domains/domain.ocn.TL319_ECwISC30to60E2r1.201007.nc $DIN_LOC_ROOT/share/domains/domain.lnd.TL319_IcoswISC30E3r5.231121.nc $DIN_LOC_ROOT/share/domains/domain.ocn.TL319_IcoswISC30E3r5.231121.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.TL319_NARRM14to30E3r1.240228.nc + $DIN_LOC_ROOT/share/domains/domain.ocn.TL319_NARRM14to30E3r1.240228.nc $DIN_LOC_ROOT/share/domains/domain.lnd.TL319_oRRS18to6v3.220124.nc $DIN_LOC_ROOT/share/domains/domain.ocn.TL319_oRRS18to6v3.220124.nc TL319 is JRA lat/lon grid: @@ -2527,6 +2580,8 @@ $DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_oRRS18to6v3.211101.nc $DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_IcoswISC30E3r5.231121.nc $DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_IcoswISC30E3r5.231121.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_NARRM14to30E3r1.240228.nc + $DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_NARRM14to30E3r1.240228.nc $DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_gx1v6.190806.nc $DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_gx1v6.190806.nc ne30np4.pg2 is Spectral Elem 1-deg grid w/ 2x2 FV physics grid per element: @@ -2801,6 +2856,13 @@ IcoswISC30E3r5 is a MPAS ocean grid generated with the jigsaw/compass process using a dual mesh that is a subdivided icosahedron, resulting in a nearly uniform resolution of 30 km. Additionally, it has ocean in ice-shelf cavities: + + 662141 + 1 + $DIN_LOC_ROOT/share/domains/domain.ocn.NARRM14to30E3r1.240228.nc + NARRM14to30E3r1 is a MPAS ocean grid generated with the jigsaw/compass process XXXX TODO: + + @@ -2833,6 +2895,8 @@ $DIN_LOC_ROOT/share/domains/domain.lnd.r05_WC14to60E2r3.200929.nc $DIN_LOC_ROOT/share/domains/domain.lnd.r05_IcoswISC30E3r5.231121.nc $DIN_LOC_ROOT/share/domains/domain.lnd.r05_IcoswISC30E3r5.231121.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.r05_NARRM14to30E3r1.240228.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.r05_NARRM14to30E3r1.240228.nc $DIN_LOC_ROOT/share/domains/domain.lnd.r05_gx1v6.191014.nc r05 is 1/2 degree river routing grid: @@ -2984,6 +3048,8 @@ $DIN_LOC_ROOT/share/domains/domain.ocn.northamericax4v1pg2_WC14to60E2r3.200929.nc $DIN_LOC_ROOT/share/domains/domain.lnd.northamericax4v1pg2_EC30to60E2r2.220428.nc $DIN_LOC_ROOT/share/domains/domain.ocn.northamericax4v1pg2_EC30to60E2r2.220428.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.northamericax4v1pg2_NARRM14to30E3r1.240304.nc + $DIN_LOC_ROOT/share/domains/domain.ocn.northamericax4v1pg2_NARRM14to30E3r1.240304.nc 1-deg with 1/4-deg over North America (version 1) pg2: @@ -3299,6 +3365,16 @@ cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcoswISC30E3r5_trfvnp2.20231121.nc + + cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_traave.20240228.nc + cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_trbilin.20240228.nc + cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_trbilin.20240228.nc + cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_ne30pg2_traave.20240228.nc + cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_ne30pg2_traave.20240228.nc + cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_trfvnp2.20240228.nc + cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_trfvnp2.20240228.nc + + cpl/gridmaps/ne30pg3/map_ne30pg3_to_oEC60to30v3_mono.200331.nc cpl/gridmaps/ne30pg3/map_ne30pg3_to_oEC60to30v3_bilin.200331.nc @@ -3769,6 +3845,16 @@ cpl/gridmaps/EC30to60E2r2/map_EC30to60E2r2_to_northamericax4v1pg2_mono.220428.nc + + cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_traave.20240304.nc + cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_trbilin.20240304.nc + cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_trbilin.20240304.nc + cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_northamericax4v1pg2_traave.20240304.nc + cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_northamericax4v1pg2_traave.20240304.nc + cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_trfvnp2.20240304.nc + cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_trfvnp2.20240304.nc + + cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_r0125_mono.20200401.nc cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_r0125_bilin.20200401.nc @@ -4026,6 +4112,14 @@ cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_T62_traave.20231121.nc + + cpl/gridmaps/T62/map_T62_to_NARRM14to30E3r1_traave.20240228.nc + cpl/gridmaps/T62/map_T62_to_NARRM14to30E3r1_trbilin.20240228.nc + cpl/gridmaps/T62/map_T62_to_NARRM14to30E3r1_esmfpatch.20240228.nc + cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_T62_traave.20240228.nc + cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_T62_traave.20240228.nc + + cpl/gridmaps/TL319/map_TL319_to_oEC60to30v3_aave.181203.nc cpl/gridmaps/TL319/map_TL319_to_oEC60to30v3_bilin.181203.nc @@ -4122,6 +4216,14 @@ cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_TL319_traave.20231121.nc + + cpl/gridmaps/TL319/map_TL319_to_NARRM14to30E3r1_traave.20240228.nc + cpl/gridmaps/TL319/map_TL319_to_NARRM14to30E3r1_trbilin.20240228.nc + cpl/gridmaps/TL319/map_TL319_to_NARRM14to30E3r1_esmfpatch.20240228.nc + cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_TL319_traave.20240228.nc + cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_TL319_traave.20240228.nc + + cpl/gridmaps/TL319/map_TL319_to_oRRS18to6v3_aave.220124.nc cpl/gridmaps/TL319/map_TL319_to_oRRS18to6v3_bilin.220124.nc @@ -4481,6 +4583,14 @@ cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_r05_traave.20231121.nc + + cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_r05_traave.20240228.nc + + + + cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_r025_traave.20240304.nc + + cpl/cpl6/map_EC30to60E2r2_to_r05_neareststod.220728.nc @@ -4587,6 +4697,11 @@ cpl/cpl6/map_rx1_to_IcoswISC30E3r5_cstmnn.r150e300.20231121.nc + + cpl/cpl6/map_rx1_to_NARRM14to30E3r1_cstmnn.r150e300.20240228.nc + cpl/cpl6/map_rx1_to_NARRM14to30E3r1_cstmnn.r150e300.20240228.nc + + cpl/cpl6/map_JRA025_to_oEC60to30v3_smoothed.r150e300.181204.nc cpl/cpl6/map_JRA025_to_oEC60to30v3_smoothed.r150e300.181204.nc @@ -4647,6 +4762,11 @@ cpl/cpl6/map_JRA025_to_IcoswISC30E3r5_cstmnn.r150e300.20231121.nc + + cpl/cpl6/map_JRA025_to_NARRM14to30E3r1_cstmnn.r150e300.20240228.nc + cpl/cpl6/map_JRA025_to_NARRM14to30E3r1_cstmnn.r150e300.20240228.nc + + cpl/cpl6/map_JRA025_to_oRRS18to6v3_smoothed.r50e100.220124.nc cpl/cpl6/map_JRA025_to_oRRS18to6v3_smoothed.r50e100.220124.nc @@ -4732,6 +4852,16 @@ cpl/cpl6/map_r05_to_IcoswISC30E3r5_cstmnn.r150e300.20231121.nc + + cpl/cpl6/map_r05_to_NARRM14to30E3r1_cstmnn.r150e300.20240228.nc + cpl/cpl6/map_r05_to_NARRM14to30E3r1_cstmnn.r150e300.20240228.nc + + + + cpl/cpl6/map_r025_to_NARRM14to30E3r1_cstmnn.r150e300.20240228.nc + cpl/cpl6/map_r025_to_NARRM14to30E3r1_cstmnn.r150e300.20240228.nc + + cpl/cpl6/map_r0125_to_WC14to60E2r3_smoothed.r150e300.200929.nc cpl/cpl6/map_r0125_to_WC14to60E2r3_smoothed.r150e300.200929.nc diff --git a/components/mpas-ocean/cime_config/buildnml b/components/mpas-ocean/cime_config/buildnml index e76ca6982603..8fa4e67fa8b9 100755 --- a/components/mpas-ocean/cime_config/buildnml +++ b/components/mpas-ocean/cime_config/buildnml @@ -304,8 +304,8 @@ def buildnml(case, caseroot, compname): ic_date = '20240227' ic_prefix = 'mpaso.NARRM14to30E3r1' if ocn_ic_mode == 'spunup': - logger.warning("WARNING: The specified compset is requesting ocean ICs spunup from a G-case") - logger.warning(" But no file available for this grid.") + ic_date = '20240312' + ic_prefix = 'mpaso.NARRM14to30E3r1.rstFromG-chrysalis' elif ocn_grid == 'NARRM14to30E3r2': decomp_date = '20240228' diff --git a/components/mpas-seaice/cime_config/buildnml b/components/mpas-seaice/cime_config/buildnml index 93ca6d8b56a7..b774d215972e 100755 --- a/components/mpas-seaice/cime_config/buildnml +++ b/components/mpas-seaice/cime_config/buildnml @@ -273,8 +273,8 @@ def buildnml(case, caseroot, compname): grid_date = '20240227' grid_prefix = 'mpassi.NARRM14to30E3r1' if ice_ic_mode == 'spunup': - logger.warning("WARNING: The specified compset is requesting seaice ICs spunup from a G-case") - logger.warning(" But no file available for this grid.") + grid_date = '20240312' + grid_prefix = 'mpassi.NARRM14to30E3r1.rstFromG-chrysalis' elif ice_grid == 'NARRM14to30E3r2': decomp_date = '20240228'