nco in tests/fv3_conf/cpld_docn_dice.IN rather than modulefiles

NickSzapiro-NOAA · Jun 10, 2024 · b05325e · b05325e
1 parent b6d8bec
commit b05325e
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -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")