Clean up and unify the hafs modulefiles as well as the related build …

…and job scripts.
JohnSteffen-NOAA · Apr 10, 2021 · ec3760f · ec3760f
1 parent f806fe5
commit ec3760f
Show file tree

Hide file tree

Showing 55 changed files with 82 additions and 1,706 deletions.
diff --git a/jobs/JHAFS_ANALYSIS b/jobs/JHAFS_ANALYSIS
@@ -51,13 +51,10 @@ export machine=${WHERE_AM_I:-wcoss_cray} # platforms: wcoss_cray, wcoss_dell_p3,
 #export RUN_ENVIR=${RUN_ENVIR:-prod}
 export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
-  module use ${HOMEhafs}/modulefiles
-  module load modulefile.hafs.run.${machine}
   module use $HOMEhafs/sorc/hafs_gsi.fd/modulefiles
   module load modulefile.ProdGSI.${machine}
-  #source $HOMEhafs/sorc/hafs_gsi.fd/modulefiles/modulefile.ProdGSI.${machine}
-  #env
   module list
+  env
 fi
 
 #####################################

diff --git a/jobs/JHAFS_ANALYSIS_VR b/jobs/JHAFS_ANALYSIS_VR
@@ -61,13 +61,10 @@ export machine=${WHERE_AM_I:-wcoss_cray} # platforms: wcoss_cray, wcoss_dell_p3,
 #export RUN_ENVIR=${RUN_ENVIR:-prod}
 export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
-  module use ${HOMEhafs}/modulefiles
-  module load modulefile.hafs.run.${machine}
   module use $HOMEhafs/sorc/hafs_gsi.fd/modulefiles
   module load modulefile.ProdGSI.${machine}
-  #source $HOMEhafs/sorc/hafs_gsi.fd/modulefiles/modulefile.ProdGSI.${machine}
-  #env
   module list
+  env
 fi
 
 #####################################

diff --git a/jobs/JHAFS_ATM_INIT b/jobs/JHAFS_ATM_INIT
@@ -129,9 +129,6 @@ export machine=${WHERE_AM_I:-wcoss_cray} # platforms: wcoss_cray, wcoss_dell_p3,
 #export RUN_ENVIR=${RUN_ENVIR:-prod}
 export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
-  #module use ${HOMEhafs}/modulefiles
-  #module load modulefile.hafs.run.${machine}
-  #module purge
   if [ "$machine" = wcoss_dell_p3 ]; then
     module unload NetCDF
     module unload HDF5-serial
@@ -151,6 +148,7 @@ if [ "$RUN_ENVIR" = prod ]; then
   module load fv3
   module list
   export LD_LIBRARY_PATH="$HOMEhafs/sorc/hafs_forecast.fd/FV3/ccpp/lib::${LD_LIBRARY_PATH}"
+  env
 fi
 
 #####################################

diff --git a/jobs/JHAFS_CHGRES_BC b/jobs/JHAFS_CHGRES_BC
@@ -66,16 +66,14 @@ export machine=${WHERE_AM_I:-wcoss_cray} # platforms: wcoss_cray, wcoss_dell_p3,
 #export RUN_ENVIR=${RUN_ENVIR:-prod}
 export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
-  #module use ${HOMEhafs}/modulefiles
-  #module load modulefile.hafs.run.${machine}
   if [ "$machine" = wcoss_dell_p3 ]; then
     module unload NetCDF
     module unload HDF5-serial
   fi
-  #source ${HOMEhafs}/sorc/hafs_utils.fd/modulefiles/build.${machine}
   module use ${HOMEhafs}/sorc/hafs_utils.fd/modulefiles
   module load build.${machine}.intel
   module list
+  env
 fi
 
 #####################################

diff --git a/jobs/JHAFS_CHGRES_IC b/jobs/JHAFS_CHGRES_IC
@@ -59,16 +59,14 @@ export machine=${WHERE_AM_I:-wcoss_cray} # platforms: wcoss_cray, wcoss_dell_p3,
 #export RUN_ENVIR=${RUN_ENVIR:-prod}
 export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
-  #module use ${HOMEhafs}/modulefiles
-  #module load modulefile.hafs.run.${machine}
   if [ "$machine" = wcoss_dell_p3 ]; then
     module unload NetCDF
     module unload HDF5-serial
   fi
-  #source ${HOMEhafs}/sorc/hafs_utils.fd/modulefiles/build.${machine}
   module use ${HOMEhafs}/sorc/hafs_utils.fd/modulefiles
   module load build.${machine}.intel
   module list
+  env
 fi
 
 #####################################

diff --git a/jobs/JHAFS_EMCGRAPHICS b/jobs/JHAFS_EMCGRAPHICS
@@ -57,6 +57,7 @@ if [ "$RUN_ENVIR" = prod ]; then
   module use ${HOMEgraph}/modulefiles
   module load modulefile.graphics.run.${machine}
   module list
+  env
 fi
 
 #####################################

diff --git a/jobs/JHAFS_ENKF_HX b/jobs/JHAFS_ENKF_HX
@@ -67,13 +67,10 @@ export machine=${WHERE_AM_I:-wcoss_cray} # platforms: wcoss_cray, wcoss_dell_p3,
 #export RUN_ENVIR=${RUN_ENVIR:-prod}
 export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
-  module use ${HOMEhafs}/modulefiles
-  module load modulefile.hafs.run.${machine}
   module use $HOMEhafs/sorc/hafs_gsi.fd/modulefiles
   module load modulefile.ProdGSI.${machine}
-  #source $HOMEhafs/sorc/hafs_gsi.fd/modulefiles/modulefile.ProdGSI.${machine}
-  #env
   module list
+  env
 fi
 
 #####################################

diff --git a/jobs/JHAFS_ENKF_MEAN b/jobs/JHAFS_ENKF_MEAN
@@ -67,13 +67,10 @@ export machine=${WHERE_AM_I:-wcoss_cray} # platforms: wcoss_cray, wcoss_dell_p3,
 #export RUN_ENVIR=${RUN_ENVIR:-prod}
 export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
-  module use ${HOMEhafs}/modulefiles
-  module load modulefile.hafs.run.${machine}
   module use $HOMEhafs/sorc/hafs_gsi.fd/modulefiles
   module load modulefile.ProdGSI.${machine}
-  #source $HOMEhafs/sorc/hafs_gsi.fd/modulefiles/modulefile.ProdGSI.${machine}
-  #env
   module list
+  env
 fi
 
 #####################################

diff --git a/jobs/JHAFS_ENKF_RECENTER b/jobs/JHAFS_ENKF_RECENTER
@@ -67,13 +67,10 @@ export machine=${WHERE_AM_I:-wcoss_cray} # platforms: wcoss_cray, wcoss_dell_p3,
 #export RUN_ENVIR=${RUN_ENVIR:-prod}
 export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
-  module use ${HOMEhafs}/modulefiles
-  module load modulefile.hafs.run.${machine}
   module use $HOMEhafs/sorc/hafs_gsi.fd/modulefiles
   module load modulefile.ProdGSI.${machine}
-  #source $HOMEhafs/sorc/hafs_gsi.fd/modulefiles/modulefile.ProdGSI.${machine}
-  #env
   module list
+  env
 fi
 
 #####################################

diff --git a/jobs/JHAFS_ENKF_UPDATE b/jobs/JHAFS_ENKF_UPDATE
@@ -67,13 +67,10 @@ export machine=${WHERE_AM_I:-wcoss_cray} # platforms: wcoss_cray, wcoss_dell_p3,
 #export RUN_ENVIR=${RUN_ENVIR:-prod}
 export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
-  module use ${HOMEhafs}/modulefiles
-  module load modulefile.hafs.run.${machine}
   module use $HOMEhafs/sorc/hafs_gsi.fd/modulefiles
   module load modulefile.ProdGSI.${machine}
-  #source $HOMEhafs/sorc/hafs_gsi.fd/modulefiles/modulefile.ProdGSI.${machine}
-  #env
   module list
+  env
 fi
 
 #####################################

diff --git a/jobs/JHAFS_FORECAST b/jobs/JHAFS_FORECAST
@@ -129,9 +129,6 @@ export machine=${WHERE_AM_I:-wcoss_cray} # platforms: wcoss_cray, wcoss_dell_p3,
 #export RUN_ENVIR=${RUN_ENVIR:-prod}
 export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
-  #module use ${HOMEhafs}/modulefiles
-  #module load modulefile.hafs.run.${machine}
-  #module purge
   if [ "$machine" = wcoss_dell_p3 ]; then
     module unload NetCDF
     module unload HDF5-serial
@@ -151,6 +148,7 @@ if [ "$RUN_ENVIR" = prod ]; then
   module load fv3
   module list
   export LD_LIBRARY_PATH="$HOMEhafs/sorc/hafs_forecast.fd/FV3/ccpp/lib::${LD_LIBRARY_PATH}"
+  env
 fi
 
 #####################################

diff --git a/jobs/JHAFS_GRID b/jobs/JHAFS_GRID
@@ -96,16 +96,14 @@ export machine=${WHERE_AM_I:-wcoss_cray} # platforms: wcoss_cray, wcoss_dell_p3,
 #export RUN_ENVIR=${RUN_ENVIR:-prod}
 export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
-  #module use ${HOMEhafs}/modulefiles
-  #module load modulefile.hafs.run.${machine}
   if [ "$machine" = wcoss_dell_p3 ]; then
     module unload NetCDF
     module unload HDF5-serial
   fi
-  #source ${HOMEhafs}/sorc/hafs_utils.fd/modulefiles/build.${machine}
   module use ${HOMEhafs}/sorc/hafs_utils.fd/modulefiles
   module load build.${machine}.intel
   module list
+  env
 fi
 
 #####################################

diff --git a/jobs/JHAFS_HRDGRAPHICS b/jobs/JHAFS_HRDGRAPHICS
@@ -59,6 +59,7 @@ export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
   source ${GPLOThafs}/modulefiles/modulefile.gplot.${machine}
   module list
+  env
 fi
 
 #####################################

diff --git a/jobs/JHAFS_HYCOMPOST b/jobs/JHAFS_HYCOMPOST
@@ -47,16 +47,8 @@ export machine=${WHERE_AM_I:-wcoss_cray} # platforms: wcoss_cray, wcoss_dell_p3,
 #export RUN_ENVIR=${RUN_ENVIR:-prod}
 export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
-  #module purge
-  #module use ${HOMEhafs}/modulefiles
-  #module load modulefile.hafs.run.${machine}
-  if [ "$machine" = wcoss_dell_p3 ]; then
-    module unload NetCDF
-    module unload HDF5-serial
-  fi
-  module use ${HOMEhafs}/sorc/hafs_hycom_utils.fd/modulefiles
-  module load modulefile.hycom_utils.${machine}
   module list
+  env
 fi
 
 #####################################

diff --git a/jobs/JHAFS_OCEAN_INIT b/jobs/JHAFS_OCEAN_INIT
@@ -48,9 +48,8 @@ export machine=${WHERE_AM_I:-wcoss_cray} # platforms: wcoss_cray, wcoss_dell_p3,
 #export RUN_ENVIR=${RUN_ENVIR:-prod}
 export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
-  #module use ${HOMEhafs}/modulefiles
-  #module load modulefile.hafs.run.${machine}
   module list
+  env
 fi
 
 #####################################

diff --git a/jobs/JHAFS_POST b/jobs/JHAFS_POST
@@ -72,9 +72,6 @@ export machine=${WHERE_AM_I:-wcoss_cray} # platforms: wcoss_cray, wcoss_dell_p3,
 #export RUN_ENVIR=${RUN_ENVIR:-prod}
 export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
-  #module purge
-  #module use ${HOMEhafs}/modulefiles
-  #module load modulefile.hafs.run.${machine}
   if [ "$machine" = wcoss_dell_p3 ]; then
     module unload NetCDF
     module unload HDF5-serial
@@ -94,6 +91,7 @@ if [ "$RUN_ENVIR" = prod ]; then
   module use ${HOMEhafs}/sorc/hafs_post.fd/modulefiles
   module load ${machine}
   module list
+  env
 fi
 
 #####################################

diff --git a/jobs/JHAFS_PRODUCT b/jobs/JHAFS_PRODUCT
@@ -73,9 +73,8 @@ export machine=${WHERE_AM_I:-wcoss_cray} # platforms: wcoss_cray, wcoss_dell_p3,
 #export RUN_ENVIR=${RUN_ENVIR:-prod}
 export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
-  #module use ${HOMEhafs}/modulefiles
-  #module load modulefile.hafs.run.${machine}
   module list
+  env
 fi
 
 #####################################

diff --git a/modulefiles/modulefile.hafs.base.wcoss_cray b/modulefiles/modulefile.hafs.base.wcoss_cray
diff --git a/modulefiles/modulefile.hafs.run.hera → modulefiles/modulefile.hafs.hera b/modulefiles/modulefile.hafs.run.hera → modulefiles/modulefile.hafs.hera
diff --git a/modulefiles/modulefile.hafs.run.jet → modulefiles/modulefile.hafs.jet b/modulefiles/modulefile.hafs.run.jet → modulefiles/modulefile.hafs.jet
diff --git a/modulefiles/modulefile.hafs.run.orion → modulefiles/modulefile.hafs.orion b/modulefiles/modulefile.hafs.run.orion → modulefiles/modulefile.hafs.orion
diff --git a/modulefiles/modulefile.hafs.run.wcoss_cray → modulefiles/modulefile.hafs.wcoss_cray b/modulefiles/modulefile.hafs.run.wcoss_cray → modulefiles/modulefile.hafs.wcoss_cray
diff --git a/...lefiles/modulefile.hafs.run.wcoss_dell_p3 → modulefiles/modulefile.hafs.wcoss_dell_p3 b/...lefiles/modulefile.hafs.run.wcoss_dell_p3 → modulefiles/modulefile.hafs.wcoss_dell_p3
diff --git a/modulefiles/modulefile.tools.hera b/modulefiles/modulefile.tools.hera
diff --git a/modulefiles/modulefile.tools.jet b/modulefiles/modulefile.tools.jet
diff --git a/modulefiles/modulefile.tools.orion b/modulefiles/modulefile.tools.orion
diff --git a/modulefiles/modulefile.tools.wcoss_cray b/modulefiles/modulefile.tools.wcoss_cray
diff --git a/modulefiles/modulefile.tools.wcoss_dell_p3 b/modulefiles/modulefile.tools.wcoss_dell_p3
diff --git a/modulefiles/modulefile.vortextracker.hera b/modulefiles/modulefile.vortextracker.hera
diff --git a/modulefiles/modulefile.vortextracker.jet b/modulefiles/modulefile.vortextracker.jet
diff --git a/modulefiles/modulefile.vortextracker.orion b/modulefiles/modulefile.vortextracker.orion
diff --git a/modulefiles/modulefile.vortextracker.wcoss_cray b/modulefiles/modulefile.vortextracker.wcoss_cray
diff --git a/modulefiles/modulefile.vortextracker.wcoss_dell_p3 b/modulefiles/modulefile.vortextracker.wcoss_dell_p3
diff --git a/sorc/build_hycom_utils.sh b/sorc/build_hycom_utils.sh
@@ -9,22 +9,10 @@ if [ $target = wcoss_cray ]; then
   export DM_CC="cc -static"
 fi
 
-module use hafs_hycom_utils.fd/modulefiles
-module load modulefile.hycom_utils.$target
+module use ../modulefiles
+module load modulefile.hafs.$target
 module list
 
-#export NETCDF_INCLUDE=${NETCDF_INCLUDE:-"-I${NETCDF}/include"}
-#export NETCDF_LDFLAGS=${NETCDF_LDFLAGS:-"-L${NETCDF}/lib -lnetcdf -lnetcdff"}
-## export NETCDF_INCLUDE="-I${NETCDF}/include"
-## export NETCDF_LDFLAGS="-L${NETCDF}/lib -lnetcdff -lnetcdf"
-
-##export HDF5_INCLUDE=${HDF5_INCLUDE:-"-I${HDF5}/include"}
-#export HDF5_LDFLAGS=${HDF5_LDFLAGS:-"-L${HDF5}/lib -lhdf5_hl -lhdf5hl_fortran -lhdf5 -lhdf5_fortran"}
-##export HDF5_LDFLAGS=${HDF5_LDFLAGS:-"-L${HDF5}/lib -lhdf5_hl -lhdf5"}
-
-#export HDF5_LDFLAGS="-L${HDF5}/lib -lhdf5_hl -lhdf5hl_fortran -lhdf5 -lhdf5_fortran -lz";
-#export NETCDF_LDFLAGS="-L${NETCDF}/lib -lnetcdff -lnetcdf -lz ${HDF5_LDFLAGS}";
-
 cd hafs_hycom_utils.fd/libs
 if [ -d "build" ]; then
    rm -rf build
@@ -52,14 +40,6 @@ fi
 make -j 8 VERBOSE=1
 make install
 
-# Ensure a clean compile:
-#make -i clean
-#find . -name '*.o' -o -name '*.a' -o -name '*.mod' | xargs rm -f
-#rm -f ./exec/*
-
-# Compile hycom_utils
-#make -i -f makefile all
-
 cd ../
 
 exit