Merge pull request #121 from RussTreadon-NOAA/master

GitHub Issue NOAA-EMC/GSI #110. Add hpc-stack to master.
NOAA-EMC · Mar 9, 2021 · 9c1fc15 · 9c1fc15
2 parents a944725 + 8578601
commit 9c1fc15
Show file tree

Hide file tree

Showing 55 changed files with 239 additions and 255 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -108,18 +108,13 @@ project(GSI)
 
   cmake_policy(SET CMP0009 NEW)
   cmake_policy(SET CMP0054 NEW)
+  cmake_policy(SET CMP0074 NEW)
   find_package(OpenMP)
   message("found openmp with flag ${OPENMP_Fortran_FLAGS}")
 
 # Set Host specific flags and options
   setHOST()
 
-  if(FIND_HDF5_HL)
-    find_package(HDF5 COMPONENTS C HL)
-  elseif(FIND_HDF5)
-    find_package(HDF5)
-  endif()
-
   MESSAGE(${CMAKE_CURRENT_SOURCE_DIR})
   # make sure that the default is a RELEASE
   if (NOT CMAKE_BUILD_TYPE)
@@ -174,8 +169,6 @@ project(GSI)
     find_package(Baselibs REQUIRED)
   else()
     find_package( NetCDF COMPONENTS C Fortran REQUIRED)
-    find_package( ZLIB )
-    find_package( CURL )
   endif()
   if(( NOT HOST-WCOSS_D ) AND ( NOT HOST-WCOSS_C ) AND ( NOT HOST-Gaea ) ) 
     message(" trying to find lapack, ${host}")
@@ -273,6 +266,12 @@ project(GSI)
     add_subdirectory(util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/sorc/verf_radbcoef.fd)
     add_subdirectory(util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/sorc/verf_radbcor.fd)
     add_subdirectory(util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/sorc/verf_radtime.fd)
+    add_subdirectory(util/Conventional_Monitor/nwprod/conmon_shared/sorc/conmon_grads_lev.fd)
+    add_subdirectory(util/Conventional_Monitor/nwprod/conmon_shared/sorc/conmon_grads_mandlev.fd)
+    add_subdirectory(util/Conventional_Monitor/nwprod/conmon_shared/sorc/conmon_grads_sfc.fd)
+    add_subdirectory(util/Conventional_Monitor/nwprod/conmon_shared/sorc/conmon_grads_sfctime.fd)
+    add_subdirectory(util/Conventional_Monitor/nwprod/conmon_shared/sorc/conmon_grads_sig.fd)
+    add_subdirectory(util/Conventional_Monitor/nwprod/conmon_shared/sorc/conmon_time.fd)
   endif(BUILD_UTIL) 
   find_package( NDATE )
   if( NOT NDATE )

diff --git a/cmake/Modules/platforms/WCOSS-D.cmake b/cmake/Modules/platforms/WCOSS-D.cmake
@@ -1,15 +1,12 @@
 macro (setWCOSS_D)
   message("Setting paths for Dell")
-  option(FIND_HDF5 "Try to Find HDF5 libraries" ON)
-  option(FIND_HDF5_HL "Try to Find HDF5 libraries" OFF)
 
   set(HOST_FLAG "-xHOST" CACHE INTERNAL "Host Flag")
   set(MKL_FLAG "-mkl"  CACHE INTERNAL "MKL Flag")
   set(GSI_Intel_Platform_FLAGS "-DPOUND_FOR_STRINGIFY -fp-model strict -assume byterecl -convert big_endian -implicitnone -D_REAL8_ ${OpenMP_Fortran_FLAGS} ${MPI_Fortran_COMPILE_FLAGS} -O3" CACHE INTERNAL "GSI Fortran Flags")
   set(GSI_LDFLAGS "${OpenMP_Fortran_FLAGS} ${MKL_FLAG}" CACHE INTERNAL "")
   set(ENKF_Platform_FLAGS "-O3 -fp-model strict -convert big_endian -assume byterecl -implicitnone  -DGFS -D_REAL8_  ${OpenMP_Fortran_FLAGS} " CACHE INTERNAL "ENKF Fortran Flags")
 
-  set(HDF5_USE_STATIC_LIBRARIES "ON" CACHE INTERNAL "" )
   if( NOT DEFINED ENV{COREPATH} )
     set(COREPATH "/gpfs/dell1/nco/ops/nwprod/lib"  )
   else()

diff --git a/modulefiles/modulefile.ProdGSI.gaea b/modulefiles/modulefile.ProdGSI.gaea
@@ -9,13 +9,6 @@ puts stderr "for the Intel Compiler Suite $version\n"
 }
 module-whatis " NOAA-EMC/GSI whatis description"
 
-setenv COMP ftn
-setenv COMP_MP ftn
-setenv COMP_MPI ftn
-
-setenv C_COMP cc
-setenv C_COMP_MP cc
-
 set COMPILER intel
 
 setenv FFLAGS_COM "-fp-model strict"
@@ -26,7 +19,6 @@ setenv LDFLAGS_COM " "
 #set WRF_SHARED_ROOT /lustre/f1/pdata/ncep_shared/NCEPLIBS/lib/EXTERNAL/wrf_shared
 #setenv WRF_SHARED_PATH ${WRF_SHARED_ROOT}.${WRF_SHARED_VER}
 
-# Known conflicts
 setenv NCEPLIBS /lustre/f1/pdata/ncep_shared/NCEPLIBS/lib
 
 # Loading ncep environment

diff --git a/modulefiles/modulefile.ProdGSI.hera b/modulefiles/modulefile.ProdGSI.hera
@@ -1,45 +1,44 @@
 #%Module######################################################################
-## NOAA-EMC/GSI
-##_____________________________________________________
-
-set COMP ifort
-set COMP_MP mpfort
-set COMP_MPI mpiifort
-
-set C_COMP icc
-set C_COMP_MP mpcc
+# NOAA-EMC/GSI
+#_____________________________________________________
+#proc ModulesHelp { } {
+#puts stderr "Set environment variables for NOAA-EMC/GSI"
+#puts stderr "This module initializes the environment "
+#puts stderr "for the Intel Compiler Suite $version\n"
+##}
+#module-whatis " NOAA-EMC/GSI whatis description"
 
 setenv CRTM_FIX /scratch2/NCEPDEV/nwprod/NCEPLIBS/fix/crtm_v2.3.0
 
-# Known conflicts
+# Load cmake
+module use -a /contrib/cmake/modulefiles
+module load cmake/3.16.1
 
 # Load hpc-stack
 module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack
 module load hpc/1.1.0
 
-# Load compiler, mpi, cmake, and hdf5/netcdf
+# Load intel compiler and mpi
 module load hpc-intel/18.0.5.274
+module load hpc-impi/2018.0.4
 
-# python
+# Load python
+#  Note:  anaconda/2.3.0 requires intel be loaded prior to anaconda
 module use -a /contrib/anaconda/modulefiles
-module load anaconda/2.3.0 
+module load anaconda/2.3.0
 
-module load hpc-impi/2018.0.4
-
-module use -a /contrib/cmake/modulefiles
-module load cmake/3.9.0
+# Load production utilities
+module load prod_util/1.2.2
 
-# Load libraries
-module load bacio/2.4.1
+# Load nceplibs
 module load bufr/11.4.0
-module load crtm/2.3.0
 module load ip/3.3.3
 module load nemsio/2.5.2
-module load prod_util/1.2.2
 module load sfcio/1.4.1
 module load sigio/2.3.2
 module load sp/2.3.3
-module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load hdf5/1.10.6
+module load w3emc/2.7.3
+module load bacio/2.4.1
+module load crtm/2.3.0
 module load netcdf/4.7.4
diff --git a/modulefiles/modulefile.ProdGSI.jet b/modulefiles/modulefile.ProdGSI.jet
@@ -1,4 +1,4 @@
-#%Module######################################################################
+ #%Module######################################################################
 ## NOAA-EMC/GSI
 ##_____________________________________________________
 #proc ModulesHelp { } {
@@ -10,28 +10,34 @@
 #
 #
 
-module load intel/18.0.5.274
-module load impi
-#
-module load szip/2.1
-module load hdf5/1.8.9
+set CRTM_FIX /lfs4/HFIP/hfv3gfs/gwv/l0530/lib/crtm/v2.3.0/fix
+
+# Load cmake
+module load cmake/3.16.1
+
+# Load python
+module load intelpython/3.6.5
 
-export COREPATH=/lfs4/HFIP/hfv3gfs/gwv/l0530/lib
-export NCEPLIBS=$COREPATH
-module use $NCEPLIBS/modulefiles
+# Load hpc-stack
+module use /lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/modulefiles/stack
+module load hpc/1.1.0
 
-export FFLAGS="-qopenmp"
-export LDFLAGS="-qopenmp"
-module load bacio-intel-sandybridge/2.0.2
-module load crtm-intel-sandybridge/2.2.5
-module load bufr-intel-sandybridge/11.1.0
-module load nemsio-intel-sandybridge/2.2.2
-module load sp-intel-sandybridge/2.0.2
-module load w3emc-intel-sandybridge/2.2.0
-module load w3nco-intel-sandybridge/2.0.6
-module load sigio-intel-sandybridge/2.0.1
-module load sfcio-intel-sandybridge/1.0.0
-module load ip-intel-sandybridge/3.0.0
+# Load intel compiler and mpi
+module load hpc-intel/18.0.5.274
+module load hpc-impi/2018.4.274
 
+# Load production utilities
+module load prod_util/1.2.2
 
-module load netcdfp/4.7.4
+# Load nceplibs
+module load bufr/11.4.0
+module load ip/3.3.3
+module load nemsio/2.5.2
+module load sfcio/1.4.1
+module load sigio/2.3.2
+module load sp/2.3.3
+module load w3nco/2.4.1
+module load w3emc/2.7.3
+module load bacio/2.4.1
+module load crtm/2.3.0
+module load netcdf/4.7.4
diff --git a/modulefiles/modulefile.ProdGSI.orion b/modulefiles/modulefile.ProdGSI.orion
@@ -1,44 +1,49 @@
 #%Module######################################################################
-## NOAA-EMC/GSI
-##_____________________________________________________
+# NOAA-EMC/GSI
+#_____________________________________________________
+#proc ModulesHelp { } {
+#puts stderr "Set environment variables for NOAA-EMC/GSI"
+#puts stderr "This module initializes the environment "
+#puts stderr "for the Intel Compiler Suite $version\n"
+##}
+#module-whatis " NOAA-EMC/GSI whatis description"
 
-set COMP ifort
-set COMP_MP mpfort
-set COMP_MPI mpiifort
+setenv CRTM_FIX /apps/contrib/NCEPLIBS/orion/fix/crtm_v2.3.0
 
-set C_COMP icc
-set C_COMP_MP mpcc
+# Load cmake
+module load cmake/3.17.3
 
-# Known conflicts
-
-
-# Load compiler, mpi, cmake, and hdf5/netcdf
-module load intel/2018.4
-module load impi/2018.4
-
-module load cmake/3.15.4
-
-# Python
+# Load python
 module load python/3.7.5
 
-# Load libraries
-module use /apps/contrib/NCEPLIBS/orion/modulefiles
-module load bacio/2.0.3
-module load bufr/11.3.0
+# Load hpc-stack
+module use /apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack
+module load hpc/1.1.0
+
+# Load intel compiler and mpi
+#
+# Note:  hpc-intel/2018.4 erroneously loads mkl/2020.2.  hpc-stack
+#   PR 173 submitted to resolves this.  Until then, unload mkl/2020.2
+#   after loading hpc-intel/2018.4 and load mkl/2018.4 to ensure 
+#   consistency
+#
+module load hpc-intel/2018.4
+module unload mkl/2020.2
+module load mkl/2018.4
+module load hpc-impi/2018.4
+
+# Load production utilities
+module load prod_util/1.2.2
+
+# Load nceplibs
+module load bufr/11.4.0
+module load ip/3.3.3
+module load nemsio/2.5.2
+module load sfcio/1.4.1
+module load sigio/2.3.2
+module load sp/2.3.3
+module load w3nco/2.4.1
+module load w3emc/2.7.3
+module load bacio/2.4.1
 module load crtm/2.3.0
-module load ip/3.0.2
-module load nemsio/2.2.4
-module load prod_util/1.2.0
-module load sfcio/1.1.1
-module load sigio/2.1.1
-module load sp/2.0.3
-module load w3emc/2.4.0
-module load w3nco/2.0.7
-
-module use /apps/contrib/NCEPLIBS/lib/modulefiles
-module load netcdfp/4.7.4.release
-
-# Fix MKL threads for reproducible global_gsi.x with correlated obs error
-#export MKL_NUM_THREADS=4
-#export MKL_CBWR=AUTO
-
+module load netcdf/4.7.4
diff --git a/modulefiles/modulefile.ProdGSI.s4 b/modulefiles/modulefile.ProdGSI.s4
@@ -2,14 +2,7 @@
 ## NOAA-EMC/GSI
 ##_____________________________________________________
 
-set COMP ifort
-set COMP_MP mpfort
-set COMP_MPI mpiifort
 
-set C_COMP icc
-set C_COMP_MP mpcc
-
-# Known conflicts
 module use -a /home/mpotts/s4-cardinal/spack/share/spack/modules/linux-centos7-x86_64 
 module load license_intel/S4           
 module load intel/18.0.3              

diff --git a/modulefiles/modulefile.ProdGSI.wcoss_c b/modulefiles/modulefile.ProdGSI.wcoss_c
@@ -8,13 +8,6 @@ puts stderr "for the Intel Compiler Suite $version\n"
 }
 module-whatis " NOAA-EMC/GSI whatis description"
 
-setenv COMP ftn
-setenv COMP_MP ftn
-setenv COMP_MPI ftn
-
-setenv C_COMP cc
-setenv C_COMP_MP cc
-
 set COMPILER intel
 
 setenv FFLAGS_COM "-fp-model strict"
@@ -24,8 +17,6 @@ set WRF_SHARED_VER v1.1.0
 set WRF_SHARED_ROOT /gpfs/hps/nco/ops/nwprod/wrf_shared
 setenv WRF_SHARED_PATH ${WRF_SHARED_ROOT}.${WRF_SHARED_VER}-${COMPILER}
 
-# Known conflicts
-
 # Loading ncep environment
 module load ncep/1.0
 module load prod_util/1.1.2