diff --git a/component_grids_mct.xml b/component_grids_mct.xml
index 374de56c..613c9acf 100644
--- a/component_grids_mct.xml
+++ b/component_grids_mct.xml
@@ -55,6 +55,8 @@
domain.ocn.0.47x0.63_gx1v6_090408.nc
domain.lnd.fv0.47x0.63_gx1v7.180521.nc
domain.ocn.fv0.47x0.63_gx1v7.180521.nc
+ domain.lnd.fv0.47x0.63_tn0.25v3.211026.nc
+ domain.ocn.fv0.47x0.63_tn0.25v3.211026.nc
0.47x0.63 is FV 1/2-deg grid:
@@ -223,6 +225,8 @@
$DIN_LOC_ROOT/share/domains/domain.ocn.ne30np4_gx1v6_110217.nc
$DIN_LOC_ROOT/share/domains/domain.lnd.ne30_gx1v7.171003.nc
$DIN_LOC_ROOT/share/domains/domain.ocn.ne30_gx1v7.171003.nc
+ $DIN_LOC_ROOT/share/domains/domain.lnd.ne30np4_tn0.25v3.211029.nc
+ $DIN_LOC_ROOT/share/domains/domain.ocn.ne30np4_tn0.25v3.211029.nc
ne30np4 is Spectral Elem 1-deg grid:
@@ -254,6 +258,8 @@
194402 1
$DIN_LOC_ROOT/share/domains/domain.lnd.ne60np4_gx1v6.120406.nc
$DIN_LOC_ROOT/share/domains/domain.ocn.ne60np4_gx1v6.121113.nc
+ $DIN_LOC_ROOT/share/domains/domain.lnd.ne60np4_tn0.25v3.210915.nc
+ $DIN_LOC_ROOT/share/domains/domain.ocn.ne60np4_tn0.25v3.210915.nc
ne60np4 is Spectral Elem 1/2-deg grid:
diff --git a/machines/cmake_macros/zeus.cmake b/machines/cmake_macros/zeus.cmake
index 3629c363..8c24e3dc 100644
--- 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
index d3408e1e..1ae588c1 100644
--- 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
impi20.1/parallel-netcdf/1.12.1
- impi20.1/esmf/8.0.1-intelmpi-64-g
+ impi20.1/esmf/8.1.1-intelmpi-64-g
- impi20.1/esmf/8.0.1-intelmpi-64-O
+ impi20.1/esmf/8.1.1-intelmpi-64-O
- intel20.1/esmf/8.0.1-mpiuni-64-g
+ intel20.1/esmf/8.1.1-mpiuni-64-g
- intel20.1/esmf/8.0.1-mpiuni-64-O
+ intel20.1/esmf/8.1.1-mpiuni-64-O
- /work/csp/cmip01/csm/xios
+ /data/inputs/CESM/xios-2.5
1
diff --git a/maps_mct.xml b/maps_mct.xml
index 94554f26..0364d5bf 100644
--- a/maps_mct.xml
+++ b/maps_mct.xml
@@ -110,6 +110,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -126,6 +142,14 @@
+
+
+
+
+
+
+
+
@@ -158,6 +182,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -229,6 +269,14 @@
+
+
+
+
+
+
+
+
@@ -259,6 +307,14 @@
+
+
+
+
+
+
+
+
@@ -464,6 +520,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -728,6 +798,14 @@
+
+
+
+
+
+
+
+
@@ -981,6 +1059,14 @@
+
+
+
+
+
+
+
+
@@ -1010,6 +1096,14 @@
+
+
+
+
+
+
+
+
diff --git a/modelgrid_aliases_mct.xml b/modelgrid_aliases_mct.xml
index fa1d47ec..919110d8 100644
--- a/modelgrid_aliases_mct.xml
+++ b/modelgrid_aliases_mct.xml
@@ -489,6 +489,13 @@
gx1v7
+
+ 0.47x0.63
+ 0.47x0.63
+ tn0.25v3
+ tn0.25v3
+
+
0.47x0.63
0.47x0.63
@@ -831,6 +838,13 @@
gx1v7
+
+ ne30np4
+ ne30np4
+ tn0.25v3
+ tn0.25v3
+
+
ne30np4.pg3
ne30np4.pg3
@@ -898,6 +912,13 @@
gx1v7
+
+ ne60np4
+ ne60np4
+ tn0.25v3
+ tn0.25v3
+
+
ne60np4
ne60np4