From f270208ef87ef8f9ee9f92cabc66d4425b6a5927 Mon Sep 17 00:00:00 2001
From: Jon Wolfe <jonbob@lanl.gov>
Date: Tue, 14 Nov 2023 11:17:32 -0600
Subject: [PATCH] Update IcoswISC30E3r2 mapping and domain files to match new
 convention

---
 cime_config/config_grids.xml | 60 ++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/cime_config/config_grids.xml b/cime_config/config_grids.xml
index 6a8df2fa67c3..c99efcd8be37 100755
--- a/cime_config/config_grids.xml
+++ b/cime_config/config_grids.xml
@@ -2394,7 +2394,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="ECwISC30to60E3r2">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_ECwISC30to60E3r2.231018.nc</file>
-      <file grid="atm|lnd" mask="IcoswISC30E3r2">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_IcoswISC30E3r2.230905.nc</file>
+      <file grid="atm|lnd" mask="IcoswISC30E3r2">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_IcoswISC30E3r2.231113.nc</file>
       <desc>T62 is Gaussian grid:</desc>
     </domain>
 
@@ -2439,8 +2439,8 @@
       <file grid="ice|ocn" mask="ECwISC30to60E2r1">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_ECwISC30to60E2r1.201007.nc</file>
       <file grid="atm|lnd" mask="ECwISC30to60E3r2">$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_ECwISC30to60E3r2.231018.nc</file>
       <file grid="ice|ocn" mask="ECwISC30to60E3r2">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_ECwISC30to60E3r2.231018.nc</file>
-      <file grid="atm|lnd" mask="IcoswISC30E3r2">$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_IcoswISC30E3r2.230905.nc</file>
-      <file grid="ice|ocn" mask="IcoswISC30E3r2">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_IcoswISC30E3r2.230905.nc</file>
+      <file grid="atm|lnd" mask="IcoswISC30E3r2">$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_IcoswISC30E3r2.231113.nc</file>
+      <file grid="ice|ocn" mask="IcoswISC30E3r2">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_IcoswISC30E3r2.231113.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>
@@ -2550,8 +2550,8 @@
       <file grid="ice|ocn" mask="oRRS18to6v3">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_oRRS18to6v3.211101.nc</file>
       <file grid="atm|lnd" mask="ECwISC30to60E3r2">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_ECwISC30to60E3r2.231018.nc</file>
       <file grid="ice|ocn" mask="ECwISC30to60E3r2">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_ECwISC30to60E3r2.231018.nc</file>
-      <file grid="atm|lnd" mask="IcoswISC30E3r2">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_IcoswISC30E3r2.230905.nc</file>
-      <file grid="ice|ocn" mask="IcoswISC30E3r2">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_IcoswISC30E3r2.230905.nc</file>
+      <file grid="atm|lnd" mask="IcoswISC30E3r2">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_IcoswISC30E3r2.231113.nc</file>
+      <file grid="ice|ocn" mask="IcoswISC30E3r2">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_IcoswISC30E3r2.231113.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>
@@ -2623,8 +2623,8 @@
       <file grid="ice|ocn" mask="ICOS10">$DIN_LOC_ROOT/share/domains/domain.ocn.ne120pg2_ICOS10.230120.nc</file>
       <file grid="atm|lnd" mask="ECwISC30to60E3r2">$DIN_LOC_ROOT/share/domains/domain.lnd.ne120pg2_ECwISC30to60E3r2.231018.nc</file>
       <file grid="ice|ocn" mask="ECwISC30to60E3r2">$DIN_LOC_ROOT/share/domains/domain.ocn.ne120pg2_ECwISC30to60E3r2.231018.nc</file>
-      <file grid="atm|lnd" mask="IcoswISC30E3r2">$DIN_LOC_ROOT/share/domains/domain.lnd.ne120pg2_IcoswISC30E3r2.230918.nc</file>
-      <file grid="ice|ocn" mask="IcoswISC30E3r2">$DIN_LOC_ROOT/share/domains/domain.ocn.ne120pg2_IcoswISC30E3r2.230918.nc</file>
+      <file grid="atm|lnd" mask="IcoswISC30E3r2">$DIN_LOC_ROOT/share/domains/domain.lnd.ne120pg2_IcoswISC30E3r2.231113.nc</file>
+      <file grid="ice|ocn" mask="IcoswISC30E3r2">$DIN_LOC_ROOT/share/domains/domain.ocn.ne120pg2_IcoswISC30E3r2.231113.nc</file>
       <file grid="atm|lnd" mask="gx1v6">$DIN_LOC_ROOT/share/domains/domain.lnd.ne120pg2_gx1v6.190819.nc</file>
       <file grid="ice|ocn" mask="gx1v6">$DIN_LOC_ROOT/share/domains/domain.ocn.ne120pg2_gx1v6.190819.nc</file>
       <desc>ne120np4 is Spectral Elem 1/4-deg grid w/ 2x2 FV physics grid</desc>
@@ -2831,7 +2831,7 @@
     <domain name="IcoswISC30E3r2">
       <nx>465044</nx>
       <ny>1</ny>
-      <file grid="ice|ocn">$DIN_LOC_ROOT/share/domains/domain.ocn.IcoswISC30E3r2.230905.nc</file>
+      <file grid="ice|ocn">$DIN_LOC_ROOT/share/domains/domain.ocn.IcoswISC30E3r2.231113.nc</file>
       <desc>IcoswISC30E3r2 is a MPAS ocean grid generated with the jigsaw/compass process XXX. Additionally, it has ocean in ice-shelf cavities:</desc>
     </domain>
 
@@ -2867,8 +2867,8 @@
       <file grid="lnd" mask="WC14to60E2r3">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_WC14to60E2r3.200929.nc</file>
       <file grid="atm" mask="ECwISC30to60E3r2">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_ECwISC30to60E3r2.231018.nc</file>
       <file grid="lnd" mask="ECwISC30to60E3r2">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_ECwISC30to60E3r2.231018.nc</file>
-      <file grid="atm" mask="IcoswISC30E3r2">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_IcoswISC30E3r2.230901.nc</file>
-      <file grid="lnd" mask="IcoswISC30E3r2">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_IcoswISC30E3r2.230901.nc</file>
+      <file grid="atm" mask="IcoswISC30E3r2">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_IcoswISC30E3r2.231113.nc</file>
+      <file grid="lnd" mask="IcoswISC30E3r2">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_IcoswISC30E3r2.231113.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>
@@ -3332,11 +3332,11 @@
     </gridmap>
 
     <gridmap atm_grid="ne30np4.pg2" ocn_grid="IcoswISC30E3r2">
-      <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcoswISC30E3r2_mono.230905.nc</map>
-      <map name="ATM2OCN_VMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcoswISC30E3r2_bilin.230905.nc</map>
-      <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcoswISC30E3r2-nomask_bilin.230905.nc</map>
-      <map name="OCN2ATM_FMAPNAME">cpl/gridmaps/IcoswISC30E3r2/map_IcoswISC30E3r2_to_ne30pg2_mono.230905.nc</map>
-      <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/IcoswISC30E3r2/map_IcoswISC30E3r2_to_ne30pg2_mono.230905.nc</map>
+      <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcoswISC30E3r2_traave.20231113.nc</map>
+      <map name="ATM2OCN_VMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcoswISC30E3r2_trbilin.20231113.nc</map>
+      <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcoswISC30E3r2-nomask_trbilin.20231113.nc</map>
+      <map name="OCN2ATM_FMAPNAME">cpl/gridmaps/IcoswISC30E3r2/map_IcoswISC30E3r2_to_ne30pg2_traave.20231113.nc</map>
+      <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/IcoswISC30E3r2/map_IcoswISC30E3r2_to_ne30pg2_traave.20231113.nc</map>
     </gridmap>
 
     <gridmap atm_grid="ne30np4.pg3" ocn_grid="oEC60to30v3">
@@ -3561,11 +3561,11 @@
     </gridmap>
 
     <gridmap atm_grid="ne120np4.pg2" ocn_grid="IcoswISC30E3r2">
-      <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/ne120pg2/map_ne120pg2_to_IcoswISC30E3r2_mono.230918.nc</map>
-      <map name="ATM2OCN_VMAPNAME">cpl/gridmaps/ne120pg2/map_ne120pg2_to_IcoswISC30E3r2_bilin.230918.nc</map>
-      <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/ne120pg2/map_ne120pg2_to_IcoswISC30E3r2-nomask_bilin.230918.nc</map>
-      <map name="OCN2ATM_FMAPNAME">cpl/gridmaps/IcoswISC30E3r2/map_IcoswISC30E3r2_to_ne120pg2_mono.230918.nc</map>
-      <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/IcoswISC30E3r2/map_IcoswISC30E3r2_to_ne120pg2_mono.230918.nc</map>
+      <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/ne120pg2/map_ne120pg2_to_IcoswISC30E3r2_traave.20231113.nc</map>
+      <map name="ATM2OCN_VMAPNAME">cpl/gridmaps/ne120pg2/map_ne120pg2_to_IcoswISC30E3r2_trbilin.20231113.nc</map>
+      <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/ne120pg2/map_ne120pg2_to_IcoswISC30E3r2-nomask_trbilin.20231113.nc</map>
+      <map name="OCN2ATM_FMAPNAME">cpl/gridmaps/IcoswISC30E3r2/map_IcoswISC30E3r2_to_ne120pg2_traave.20231113.nc</map>
+      <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/IcoswISC30E3r2/map_IcoswISC30E3r2_to_ne120pg2_traave.20231113.nc</map>
     </gridmap>
 
     <gridmap atm_grid="ne120np4.pg2" lnd_grid="r05">
@@ -4067,11 +4067,11 @@
     </gridmap>
 
     <gridmap atm_grid="T62" ocn_grid="IcoswISC30E3r2">
-      <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/T62/map_T62_to_IcoswISC30E3r2_mono.230905.nc</map>
-      <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/T62/map_T62_to_IcoswISC30E3r2-nomask_bilin.230905.nc</map>
-      <map name="ATM2OCN_VMAPNAME">cpl/gridmaps/T62/map_T62_to_IcoswISC30E3r2_patch.230905.nc</map>
-      <map name="OCN2ATM_FMAPNAME">cpl/gridmaps/IcoswISC30E3r2/map_IcoswISC30E3r2_to_T62_mono.230905.nc</map>
-      <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/IcoswISC30E3r2/map_IcoswISC30E3r2_to_T62_mono.230905.nc</map>
+      <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/T62/map_T62_to_IcoswISC30E3r2_traave.20231113.nc</map>
+      <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/T62/map_T62_to_IcoswISC30E3r2-nomask_trbilin.20231113.nc</map>
+      <map name="ATM2OCN_VMAPNAME">cpl/gridmaps/T62/map_T62_to_IcoswISC30E3r2_patch.20231113.nc</map>
+      <map name="OCN2ATM_FMAPNAME">cpl/gridmaps/IcoswISC30E3r2/map_IcoswISC30E3r2_to_T62_traave.20231113.nc</map>
+      <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/IcoswISC30E3r2/map_IcoswISC30E3r2_to_T62_traave.20231113.nc</map>
     </gridmap>
 
     <gridmap atm_grid="TL319" ocn_grid="oEC60to30v3">
@@ -4171,11 +4171,11 @@
     </gridmap>
 
     <gridmap atm_grid="TL319" ocn_grid="IcoswISC30E3r2">
-      <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/TL319/map_TL319_to_IcoswISC30E3r2_mono.230905.nc</map>
-      <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/TL319/map_TL319_to_IcoswISC30E3r2-nomask_bilin.230905.nc</map>
-      <map name="ATM2OCN_VMAPNAME">cpl/gridmaps/TL319/map_TL319_to_IcoswISC30E3r2_patch.230905.nc</map>
-      <map name="OCN2ATM_FMAPNAME">cpl/gridmaps/IcoswISC30E3r2/map_IcoswISC30E3r2_to_TL319_mono.230905.nc</map>
-      <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/IcoswISC30E3r2/map_IcoswISC30E3r2_to_TL319_mono.230905.nc</map>
+      <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/TL319/map_TL319_to_IcoswISC30E3r2_traave.20231113.nc</map>
+      <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/TL319/map_TL319_to_IcoswISC30E3r2-nomask_trbilin.20231113.nc</map>
+      <map name="ATM2OCN_VMAPNAME">cpl/gridmaps/TL319/map_TL319_to_IcoswISC30E3r2_patch.20231113.nc</map>
+      <map name="OCN2ATM_FMAPNAME">cpl/gridmaps/IcoswISC30E3r2/map_IcoswISC30E3r2_to_TL319_traave.20231113.nc</map>
+      <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/IcoswISC30E3r2/map_IcoswISC30E3r2_to_TL319_traave.20231113.nc</map>
     </gridmap>
 
     <gridmap atm_grid="TL319" ocn_grid="oRRS18to6v3">