From b05325e299ae7b51e32ecf787a7dde34034854d3 Mon Sep 17 00:00:00 2001
From: Nick Szapiro <nick.szapiro@noaa.gov>
Date: Mon, 10 Jun 2024 02:55:32 -0600
Subject: [PATCH] nco in tests/fv3_conf/cpld_docn_dice.IN rather than
 modulefiles

---
 modulefiles/ufs_common.lua        | 2 --
 modulefiles/ufs_derecho.gnu.lua   | 2 --
 modulefiles/ufs_derecho.intel.lua | 2 --
 modulefiles/ufs_wcoss2.intel.lua  | 2 --
 tests/fv3_conf/cpld_docn_dice.IN  | 2 +-
 5 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/modulefiles/ufs_common.lua b/modulefiles/ufs_common.lua
index 18a5d67493..6e9c1f6f45 100644
--- a/modulefiles/ufs_common.lua
+++ b/modulefiles/ufs_common.lua
@@ -30,5 +30,3 @@ for i = 1, #ufs_modules do
     load(pathJoin(name, os.getenv(env_version_name) or default_version))
   end
 end
-
-load("nco")
diff --git a/modulefiles/ufs_derecho.gnu.lua b/modulefiles/ufs_derecho.gnu.lua
index 2e81159974..3d7b6440d8 100644
--- a/modulefiles/ufs_derecho.gnu.lua
+++ b/modulefiles/ufs_derecho.gnu.lua
@@ -24,8 +24,6 @@ load(pathJoin("cmake", cmake_ver))
 stack_python_ver=os.getenv("stack_python_ver") or "3.10.8"
 load(pathJoin("stack-python", stack_python_ver))
 
-load("nco")
-
 setenv("CMAKE_Platform", "derecho.gnu")
 load("ufs-weather-model-env")
 
diff --git a/modulefiles/ufs_derecho.intel.lua b/modulefiles/ufs_derecho.intel.lua
index c5c1887885..a7998b036e 100644
--- a/modulefiles/ufs_derecho.intel.lua
+++ b/modulefiles/ufs_derecho.intel.lua
@@ -24,8 +24,6 @@ load(pathJoin("cmake", cmake_ver))
 stack_python_ver=os.getenv("stack_python_ver") or "3.10.8"
 load(pathJoin("stack-python", stack_python_ver))
 
-load("nco")
-
 setenv("CMAKE_Platform", "derecho.intel")
 load("ufs-weather-model-env")
 
diff --git a/modulefiles/ufs_wcoss2.intel.lua b/modulefiles/ufs_wcoss2.intel.lua
index 7cc130a620..dfc94d1d9f 100644
--- a/modulefiles/ufs_wcoss2.intel.lua
+++ b/modulefiles/ufs_wcoss2.intel.lua
@@ -49,8 +49,6 @@ for i = 1, #ufs_modules do
   end
 end
 
-load("nco")
-
 setenv("CC", "cc")
 setenv("CXX", "CC")
 setenv("FC", "ftn")
diff --git a/tests/fv3_conf/cpld_docn_dice.IN b/tests/fv3_conf/cpld_docn_dice.IN
index 1abd1be0d9..b2ad8bc18c 100644
--- a/tests/fv3_conf/cpld_docn_dice.IN
+++ b/tests/fv3_conf/cpld_docn_dice.IN
@@ -7,7 +7,7 @@ fi
 
 #CDEPS data files
 #cp @[INPUTDATA_ROOT]/DOCN_DICE_cplhist/ufs.cpld.cpl*.nc INPUT
-#module load nco
+module load nco
 ncrcat ../${DEP_RUN}${SUFFIX}/ufs.cpld.cpl.hi.ice*nc ./INPUT/ufs.cpld.cpl.hi.ice.nc
 ncrcat ../${DEP_RUN}${SUFFIX}/ufs.cpld.cpl.hi.ocn*nc ./INPUT/ufs.cpld.cpl.hi.ocn.nc