Merge pull request #9 from daniele-peano/peano/nemo_zeus_port

Add grid definitions used by nemo configurations Change zeus machine configuration file
ESMCI · Feb 3, 2022 · 5aa2ffb · 5aa2ffb
2 parents f07be0c + b2624e8
commit 5aa2ffb
Show file tree

Hide file tree

Showing 5 changed files with 127 additions and 7 deletions.
diff --git a/component_grids_mct.xml b/component_grids_mct.xml
@@ -55,6 +55,8 @@
     <file grid="ocnice"  mask="gx1v6">domain.ocn.0.47x0.63_gx1v6_090408.nc</file>
     <file grid="atm|lnd" mask="gx1v7">domain.lnd.fv0.47x0.63_gx1v7.180521.nc</file>
     <file grid="ocnice"  mask="gx1v7">domain.ocn.fv0.47x0.63_gx1v7.180521.nc</file>
+    <file grid="atm|lnd" mask="tn0.25v3">domain.lnd.fv0.47x0.63_tn0.25v3.211026.nc</file>
+    <file grid="ocnice"  mask="tn0.25v3">domain.ocn.fv0.47x0.63_tn0.25v3.211026.nc</file>
     <desc>0.47x0.63 is FV 1/2-deg grid:</desc>
   </domain>
 
@@ -223,6 +225,8 @@
     <file grid="ocnice"  mask="gx1v6">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30np4_gx1v6_110217.nc</file>
     <file grid="atm|lnd" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30_gx1v7.171003.nc</file>
     <file grid="ocnice"  mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30_gx1v7.171003.nc</file>
+    <file grid="atm|lnd" mask="tn0.25v3">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30np4_tn0.25v3.211029.nc</file>
+    <file grid="ocnice"  mask="tn0.25v3">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30np4_tn0.25v3.211029.nc</file>
     <desc>ne30np4 is Spectral Elem 1-deg grid:</desc>
   </domain>
 
@@ -254,6 +258,8 @@
     <nx>194402</nx> <ny>1</ny>
     <file grid="atm|lnd" mask="gx1v6">$DIN_LOC_ROOT/share/domains/domain.lnd.ne60np4_gx1v6.120406.nc</file>
     <file grid="ocnice"  mask="gx1v6">$DIN_LOC_ROOT/share/domains/domain.ocn.ne60np4_gx1v6.121113.nc</file>
+    <file grid="atm|lnd" mask="tn0.25v3">$DIN_LOC_ROOT/share/domains/domain.lnd.ne60np4_tn0.25v3.210915.nc</file>
+    <file grid="ocnice"  mask="tn0.25v3">$DIN_LOC_ROOT/share/domains/domain.ocn.ne60np4_tn0.25v3.210915.nc</file>
     <desc>ne60np4 is Spectral Elem 1/2-deg grid:</desc>
   </domain>
 

diff --git a/machines/cmake_macros/zeus.cmake b/machines/cmake_macros/zeus.cmake
@@ -5,5 +5,4 @@ string(APPEND CPPDEFS " -DNO_R16 -DHAVE_NANOTIME")
 if (COMP_NAME STREQUAL nemo)
   string(APPEND FFLAGS " $(FC_AUTO_R8) -O3 -assume norealloc_lhs")
 endif()
-execute_process(COMMAND ${NETCDF_PATH}/bin/nc-config --flibs OUTPUT_VARIABLE SHELL_CMD_OUTPUT_BUILD_INTERNAL_IGNORE0 OUTPUT_STRIP_TRAILING_WHITESPACE)
-string(APPEND SLIBS " ${SHELL_CMD_OUTPUT_BUILD_INTERNAL_IGNORE0}")
+execute_process(COMMAND ${NETCDF_PATH}/bin/nc-config --flibs)
diff --git a/machines/config_machines.xml b/machines/config_machines.xml
@@ -3621,20 +3621,20 @@ This allows using a different mpirun command to launch unit tests
         <command name="load">impi20.1/parallel-netcdf/1.12.1</command>
       </modules>
       <modules compiler="intel" mpilib="!mpi-serial" DEBUG="TRUE">
-        <command name="load">impi20.1/esmf/8.0.1-intelmpi-64-g</command>
+        <command name="load">impi20.1/esmf/8.1.1-intelmpi-64-g</command>
       </modules>
       <modules compiler="intel" mpilib="!mpi-serial" DEBUG="FALSE">
-        <command name="load">impi20.1/esmf/8.0.1-intelmpi-64-O</command>
+        <command name="load">impi20.1/esmf/8.1.1-intelmpi-64-O</command>
       </modules>
       <modules compiler="intel" mpilib="mpi-serial" DEBUG="TRUE">
-        <command name="load">intel20.1/esmf/8.0.1-mpiuni-64-g</command>
+        <command name="load">intel20.1/esmf/8.1.1-mpiuni-64-g</command>
       </modules>
       <modules compiler="intel" mpilib="mpi-serial" DEBUG="FALSE">
-        <command name="load">intel20.1/esmf/8.0.1-mpiuni-64-O</command>
+        <command name="load">intel20.1/esmf/8.1.1-mpiuni-64-O</command>
       </modules>
     </module_system>
     <environment_variables>
-      <env name="XIOS_PATH">/work/csp/cmip01/csm/xios</env>
+      <env name="XIOS_PATH">/data/inputs/CESM/xios-2.5</env>
     </environment_variables>
     <environment_variables compiler="intel">
       <env name="I_MPI_EXTRA_FILESYSTEM">1</env>

diff --git a/maps_mct.xml b/maps_mct.xml
@@ -110,6 +110,22 @@
     <map name="OCN2ATM_SMAPNAME">cpl/cpl6/map_tx0.1v2_to_fv0.23x0.31_aave_da_090127.nc</map>
   </gridmap>
 
+  <gridmap atm_grid="0.23x0.31" ocn_grid="tn1v3">
+    <map name="ATM2OCN_FMAPNAME">cpl/cpl6/map_fv0.23x0.31_TO_tn1v3_aave.160414.nc</map>
+    <map name="ATM2OCN_SMAPNAME">cpl/cpl6/map_fv0.23x0.31_TO_tn1v3_blin.160414.nc</map>
+    <map name="ATM2OCN_VMAPNAME">cpl/cpl6/map_fv0.23x0.31_TO_tn1v3_blin.160414.nc</map>
+    <map name="OCN2ATM_FMAPNAME">cpl/cpl6/map_tn1v3_TO_fv0.23x0.31_aave.160414.nc</map>
+    <map name="OCN2ATM_SMAPNAME">cpl/cpl6/map_tn1v3_TO_fv0.23x0.31_aave.160414.nc</map>
+  </gridmap>
+
+  <gridmap atm_grid="0.23x0.31" ocn_grid="tn0.25v3">
+    <map name="ATM2OCN_FMAPNAME">cpl/cpl6/map_fv0.23x0.31_TO_tn0.25v3_aave.160721.nc</map>
+    <map name="ATM2OCN_SMAPNAME">cpl/cpl6/map_fv0.23x0.31_TO_tn0.25v3_blin.160721.nc</map>
+    <map name="ATM2OCN_VMAPNAME">cpl/cpl6/map_fv0.23x0.31_TO_tn0.25v3_blin.160721.nc</map>
+    <map name="OCN2ATM_FMAPNAME">cpl/cpl6/map_tn0.25v3_TO_fv0.23x0.31_aave.160721.nc</map>
+    <map name="OCN2ATM_SMAPNAME">cpl/cpl6/map_tn0.25v3_TO_fv0.23x0.31_aave.160721.nc</map>
+  </gridmap>
+
   <gridmap atm_grid="0.47x0.63" ocn_grid="gx1v6">
     <map name="ATM2OCN_FMAPNAME">cpl/cpl6/map_fv0.47x0.63_to_gx1v6_aave_da_090407.nc</map>
     <map name="ATM2OCN_SMAPNAME">cpl/cpl6/map_fv0.47x0.63_to_gx1v6_patch_090401.nc</map>
@@ -126,6 +142,14 @@
     <map name="OCN2ATM_SMAPNAME">cpl/cpl6/map_tx0.1v2_to_fv0.47x0.63_aave_da_090218.nc</map>
   </gridmap>
 
+  <gridmap atm_grid="0.47x0.63" ocn_grid="tn0.25v3">
+    <map name="ATM2OCN_FMAPNAME">cpl/cpl6/map_fv0.47x0.63_TO_tn0.25v3_aave.211025.nc</map>
+    <map name="ATM2OCN_SMAPNAME">cpl/cpl6/map_fv0.47x0.63_TO_tn0.25v3_blin.211025.nc</map>
+    <map name="ATM2OCN_VMAPNAME">cpl/cpl6/map_fv0.47x0.63_TO_tn0.25v3_blin.211025.nc</map>
+    <map name="OCN2ATM_FMAPNAME">cpl/cpl6/map_tn0.25v3_TO_fv0.47x0.63_aave.211025.nc</map>
+    <map name="OCN2ATM_SMAPNAME">cpl/cpl6/map_tn0.25v3_TO_fv0.47x0.63_aave.211025.nc</map>
+  </gridmap>
+
   <gridmap atm_grid="0.9x1.25" ocn_grid="gx1v6">
     <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/fv0.9x1.25/map_fv0.9x1.25_TO_gx1v6_aave.130322.nc</map>
     <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/fv0.9x1.25/map_fv0.9x1.25_TO_gx1v6_blin.130322.nc</map>
@@ -158,6 +182,22 @@
     <map name="OCN2ATM_SMAPNAME">cpl/cpl6/map_mp120v1_to_fv0.9x1.25_aave_da_111004.nc</map>
   </gridmap>
 
+  <gridmap atm_grid="0.9x1.25" ocn_grid="tn1v3">
+    <map name="ATM2OCN_FMAPNAME">cpl/cpl6/map_fv0.9x1.25_TO_tn1v3_aave.160414.nc</map>
+    <map name="ATM2OCN_SMAPNAME">cpl/cpl6/map_fv0.9x1.25_TO_tn1v3_blin.160414.nc</map>
+    <map name="ATM2OCN_VMAPNAME">cpl/cpl6/map_fv0.9x1.25_TO_tn1v3_patc.160414.nc</map>
+    <map name="OCN2ATM_FMAPNAME">cpl/cpl6/map_tn1v3_TO_fv0.9x1.25_aave.160414.nc</map>
+    <map name="OCN2ATM_SMAPNAME">cpl/cpl6/map_tn1v3_TO_fv0.9x1.25_aave.160414.nc</map>
+  </gridmap>
+
+  <gridmap atm_grid="0.9x1.25" ocn_grid="tn0.25v3">
+    <map name="ATM2OCN_FMAPNAME">cpl/cpl6/map_fv0.9x1.25_TO_tn0.25v3_aave.160721.nc</map>
+    <map name="ATM2OCN_SMAPNAME">cpl/cpl6/map_fv0.9x1.25_TO_tn0.25v3_blin.160721.nc</map>
+    <map name="ATM2OCN_VMAPNAME">cpl/cpl6/map_fv0.9x1.25_TO_tn0.25v3_patc.160721.nc</map>
+    <map name="OCN2ATM_FMAPNAME">cpl/cpl6/map_tn0.25v3_TO_fv0.9x1.25_aave.160721.nc</map>
+    <map name="OCN2ATM_SMAPNAME">cpl/cpl6/map_tn0.25v3_TO_fv0.9x1.25_aave.160721.nc</map>
+  </gridmap>
+
   <gridmap atm_grid="1.9x2.5" ocn_grid="gx1v6">
     <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/fv1.9x2.5/map_fv1.9x2.5_TO_gx1v6_aave.130322.nc</map>
     <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/fv1.9x2.5/map_fv1.9x2.5_TO_gx1v6_blin.130322.nc</map>
@@ -229,6 +269,14 @@
     <map name="ATM2WAV_SMAPNAME">cpl/gridmaps/ne30np4/map_ne30_TO_ww3a_blin.190214.nc</map>
   </gridmap>
 
+  <gridmap atm_grid="ne30np4" ocn_grid="tn0.25v3">
+    <map name="ATM2OCN_FMAPNAME">cpl/cpl6/map_ne30np4_TO_tn0.25v3_aave.211029.nc</map>
+    <map name="ATM2OCN_SMAPNAME">cpl/cpl6/map_ne30np4_TO_tn0.25v3_blin.211029.nc</map>
+    <map name="ATM2OCN_VMAPNAME">cpl/cpl6/map_ne30np4_TO_tn0.25v3_patc.211029.nc</map>
+    <map name="OCN2ATM_FMAPNAME">cpl/cpl6/map_tn0.25v3_TO_ne30np4_aave.211029.nc</map>
+    <map name="OCN2ATM_SMAPNAME">cpl/cpl6/map_tn0.25v3_TO_ne30np4_aave.211029.nc</map>
+  </gridmap>
+
   <gridmap atm_grid="ne30np4.pg2" ocn_grid="gx1v7">
     <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/ne30np4.pg2/map_ne30np4.pg2_TO_gx1v7_aave.200626.nc</map>
     <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/ne30np4.pg2/map_ne30np4.pg2_TO_gx1v7_blin.200626.nc</map>
@@ -259,6 +307,14 @@
     <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/gx1v6/map_gx1v6_TO_ne60np4_aave.120406.nc</map>
   </gridmap>
 
+  <gridmap atm_grid="ne60np4" ocn_grid="tn0.25v3">
+    <map name="ATM2OCN_FMAPNAME">cpl/cpl6/map_ne60np4_TO_tn0.25v3_aave.210914.nc</map>
+    <map name="ATM2OCN_SMAPNAME">cpl/cpl6/map_ne60np4_TO_tn0.25v3_blin.210914.nc</map>
+    <map name="ATM2OCN_VMAPNAME">cpl/cpl6/map_ne60np4_TO_tn0.25v3_patc.210914.nc</map>
+    <map name="OCN2ATM_FMAPNAME">cpl/cpl6/map_tn0.25v3_TO_ne60np4_aave.210914.nc</map>
+    <map name="OCN2ATM_SMAPNAME">cpl/cpl6/map_tn0.25v3_TO_ne60np4_aave.210914.nc</map>
+  </gridmap>
+
   <gridmap atm_grid="ne120np4" ocn_grid="gx1v6">
     <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/ne120np4/map_ne120np4_to_gx1v6_aave_110428.nc</map>
     <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/ne120np4/map_ne120np4_to_gx1v6_bilin_110428.nc</map>
@@ -464,6 +520,20 @@
     <map name="OCN2ATM_FMAPNAME">cpl/gridmaps/oQU120/map_oQU120_TO_T62_aave.151209.nc</map>
     <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/oQU120/map_oQU120_TO_T62_aave.151209.nc</map>
   </gridmap>
+  <gridmap atm_grid="T62" ocn_grid="tn1v3">
+    <map name="ATM2OCN_FMAPNAME">cpl/cpl6/map_T62_TO_tn1v3_aave.160414.nc</map>
+    <map name="ATM2OCN_SMAPNAME">cpl/cpl6/map_T62_TO_tn1v3_blin.160414.nc</map>
+    <map name="ATM2OCN_VMAPNAME">cpl/cpl6/map_T62_TO_tn1v3_patc.160414.nc</map>
+    <map name="OCN2ATM_FMAPNAME">cpl/cpl6/map_tn1v3_TO_T62_aave.160414.nc</map>
+    <map name="OCN2ATM_SMAPNAME">cpl/cpl6/map_tn1v3_TO_T62_aave.160414.nc</map>
+  </gridmap>
+  <gridmap atm_grid="T62" ocn_grid="tn0.25v3">
+    <map name="ATM2OCN_FMAPNAME">cpl/cpl6/map_T62_TO_tn0.25v3_aave.160721.nc</map>
+    <map name="ATM2OCN_SMAPNAME">cpl/cpl6/map_T62_TO_tn0.25v3_blin.160721.nc</map>
+    <map name="ATM2OCN_VMAPNAME">cpl/cpl6/map_T62_TO_tn0.25v3_patc.160721.nc</map>
+    <map name="OCN2ATM_FMAPNAME">cpl/cpl6/map_tn0.25v3_TO_T62_aave.160721.nc</map>
+    <map name="OCN2ATM_SMAPNAME">cpl/cpl6/map_tn0.25v3_TO_T62_aave.160721.nc</map>
+  </gridmap>
 
   <gridmap atm_grid="T31" ocn_grid="gx3v7">
     <!-- alias is used for gridname -->
@@ -728,6 +798,14 @@
     <map name="ROF2OCN_FMAPNAME">cpl/gridmaps/r05/map_r05_TO_gx1v7_aave.161012.nc</map>
   </gridmap>
 
+  <gridmap rof_grid="r05" ocn_grid="tn1v3" >
+    <map name="ROF2OCN_FMAPNAME">cpl/cpl6/map_r05_to_tn1v3_e1000r300_160414.nc</map>
+  </gridmap>
+
+  <gridmap rof_grid="r05" ocn_grid="tn0.25v3" >
+    <map name="ROF2OCN_FMAPNAME">cpl/cpl6/map_r05_to_tn0.25v3_e1000r300_160721.nc</map>
+  </gridmap>
+
   <!-- ======================================================== -->
   <!-- gridS: lnd to glc and glc to lnd mapping                 -->
   <!--                                                          -->
@@ -981,6 +1059,14 @@
     <map name="ROF2OCN_LIQ_RMAPNAME">cpl/gridmaps/rx1/map_rx1_to_tx1v1_e1000r300_161214.nc</map>
     <map name="ROF2OCN_ICE_RMAPNAME">cpl/gridmaps/rx1/map_rx1_to_tx1v1_e1000r300_161214.nc</map>
   </gridmap>
+  <gridmap rof_grid="rx1" ocn_grid="tn1v3" >
+    <map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_rx1_to_tn1v3_e1000r300_160414.nc</map>
+    <map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_rx1_to_tn1v3_e1000r300_160414.nc</map>
+  </gridmap>
+  <gridmap rof_grid="rx1" ocn_grid="tn0.25v3" >
+    <map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_rx1_to_tn0.25v3_e1000r300_160721.nc</map>
+    <map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_rx1_to_tn0.25v3_e1000r300_160721.nc</map>
+  </gridmap>
   <gridmap rof_grid="rx1" ocn_grid="tx0.66v1" >
     <map name="ROF2OCN_LIQ_RMAPNAME">cpl/gridmaps/rx1/map_rx1_to_tx0.66v1_nnsm_e1000r300_190315.nc</map>
     <map name="ROF2OCN_ICE_RMAPNAME">cpl/gridmaps/rx1/map_rx1_to_tx0.66v1_nnsm_e1000r300_190315.nc</map>
@@ -1010,6 +1096,14 @@
     <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>
   </gridmap>
+  <gridmap rof_grid="r05" ocn_grid="tn1v3" >
+    <map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r05_to_tn1v3_e1000r300_160414.nc</map>
+    <map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r05_to_tn1v3_e1000r300_160414.nc</map>
+  </gridmap>
+  <gridmap rof_grid="r05" ocn_grid="tn0.25v3" >
+    <map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r05_to_tn0.25v3_e1000r300_160721.nc</map>
+    <map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r05_to_tn0.25v3_e1000r300_160721.nc</map>
+  </gridmap>
   <gridmap rof_grid="r05" ocn_grid="tx1v1" >
     <map name="ROF2OCN_LIQ_RMAPNAME">cpl/gridmaps/r05/map_r05_to_tx1v1_e1000r500_161214.nc</map>
     <map name="ROF2OCN_ICE_RMAPNAME">cpl/gridmaps/r05/map_r05_to_tx1v1_e1000r500_161214.nc</map>

diff --git a/modelgrid_aliases_mct.xml b/modelgrid_aliases_mct.xml
@@ -489,6 +489,13 @@
     <mask>gx1v7</mask>
   </model_grid>
 
+  <model_grid alias="f05_n0253">
+    <grid name="atm">0.47x0.63</grid>
+    <grid name="lnd">0.47x0.63</grid>
+    <grid name="ocnice">tn0.25v3</grid>
+    <mask>tn0.25v3</mask>
+  </model_grid>
+
   <model_grid alias="f05_t12">
     <grid name="atm">0.47x0.63</grid>
     <grid name="lnd">0.47x0.63</grid>
@@ -831,6 +838,13 @@
     <mask>gx1v7</mask>
   </model_grid>
 
+  <model_grid alias="ne30_n0253">
+    <grid name="atm">ne30np4</grid>
+    <grid name="lnd">ne30np4</grid>
+    <grid name="ocnice">tn0.25v3</grid>
+    <mask>tn0.25v3</mask>
+  </model_grid>
+
   <model_grid alias="ne30pg3_g17">
     <grid name="atm">ne30np4.pg3</grid>
     <grid name="lnd">ne30np4.pg3</grid>
@@ -898,6 +912,13 @@
     <mask>gx1v7</mask>
   </model_grid>
 
+  <model_grid alias="ne60_n0253">
+    <grid name="atm">ne60np4</grid>
+    <grid name="lnd">ne60np4</grid>
+    <grid name="ocnice">tn0.25v3</grid>
+    <mask>tn0.25v3</mask>
+  </model_grid>
+
   <model_grid alias="ne60_ne60_mg16" not_compset="_POP">
     <grid name="atm">ne60np4</grid>
     <grid name="lnd">ne60np4</grid>