trilinos · trilinos-autotester · May 6, 2020 · Apr 10, 2020 · Apr 10, 2020 · Apr 22, 2020
diff --git a/...18.0.2_openmpi-2.0.3_openmp_static_dbg.sh → ...18.0.2_openmpi-4.0.1_openmp_static_dbg.sh b/...18.0.2_openmpi-2.0.3_openmp_static_dbg.sh → ...18.0.2_openmpi-4.0.1_openmp_static_dbg.sh
diff --git a/...18.0.2_openmpi-2.0.3_openmp_static_opt.sh → ...18.0.2_openmpi-4.0.1_openmp_static_opt.sh b/...18.0.2_openmpi-2.0.3_openmp_static_opt.sh → ...18.0.2_openmpi-4.0.1_openmp_static_opt.sh
diff --git a/cmake/std/PullRequestLinuxClang7.0.1TestingSettings.cmake b/cmake/std/PullRequestLinuxClang7.0.1TestingSettings.cmake
@@ -13,7 +13,7 @@
 
 #set (TPL_ENABLE_Netcdf OFF CACHE BOOL "Turn off for Clang")
 
-#set (TPL_Netcdf_LIBRARIES "-L$ENV{BOOST_ROOT}/lib;-L$ENV{NETCDF_ROOT}/lib;-L$ENV{NETCDF_ROOT}/lib;-L$ENV{PNETCDF_ROOT}/lib;-L$ENV{HDF5_ROOT}/lib;$ENV{BOOST_ROOT}/lib/libboost_program_options.a;$ENV{BOOST_ROOT}/lib/libboost_system.a;$ENV{NETCDF_ROOT}/lib/libnetcdf.a;$ENV{PNETCDF_ROOT}/lib/libpnetcdf.a;$ENV{HDF5_ROOT}/lib/libhdf5_hl.a;$ENV{HDF5_ROOT}/lib/libhdf5.a;-lz;-ldl" CACHE STRING "Set by default for CUDA PR testing")
+#set (TPL_Netcdf_LIBRARIES "-L$ENV{SEMS_NETCDF_ROOT}/lib;-L$ENV{SEMS_HDF5_ROOT}/lib;$ENV{SEMS_NETCDF_ROOT}/lib/libnetcdf.a;$ENV{SEMS_NETCDF_ROOT}/lib/libpnetcdf.a;$ENV{SEMS_HDF5_ROOT}/lib/libhdf5_hl.a;$ENV{SEMS_HDF5_ROOT}/lib/libhdf5.a;-lz;-ldl;-lcurl" CACHE STRING "Set by default for Exodus PR testing")
 
 set (MPI_EXEC_PRE_NUMPROCS_FLAGS "--bind-to;none" CACHE STRING "Set by default for PR testing")
 # NOTE: The above is a workaround for the problem of having threads on MPI

diff --git a/cmake/std/PullRequestLinuxClang9.0.0TestingSettings.cmake b/cmake/std/PullRequestLinuxClang9.0.0TestingSettings.cmake
@@ -13,7 +13,7 @@
 
 #set (TPL_ENABLE_Netcdf OFF CACHE BOOL "Turn off for Clang")
 
-#set (TPL_Netcdf_LIBRARIES "-L$ENV{BOOST_ROOT}/lib;-L$ENV{NETCDF_ROOT}/lib;-L$ENV{NETCDF_ROOT}/lib;-L$ENV{PNETCDF_ROOT}/lib;-L$ENV{HDF5_ROOT}/lib;$ENV{BOOST_ROOT}/lib/libboost_program_options.a;$ENV{BOOST_ROOT}/lib/libboost_system.a;$ENV{NETCDF_ROOT}/lib/libnetcdf.a;$ENV{PNETCDF_ROOT}/lib/libpnetcdf.a;$ENV{HDF5_ROOT}/lib/libhdf5_hl.a;$ENV{HDF5_ROOT}/lib/libhdf5.a;-lz;-ldl" CACHE STRING "Set by default for CUDA PR testing")
+#set (TPL_Netcdf_LIBRARIES "-L$ENV{SEMS_NETCDF_ROOT}/lib;-L$ENV{SEMS_HDF5_ROOT}/lib;$ENV{SEMS_NETCDF_ROOT}/lib/libnetcdf.a;$ENV{SEMS_NETCDF_ROOT}/lib/libpnetcdf.a;$ENV{SEMS_HDF5_ROOT}/lib/libhdf5_hl.a;$ENV{SEMS_HDF5_ROOT}/lib/libhdf5.a;-lz;-ldl;-lcurl" CACHE STRING "Set by default for CUDA PR testing")
 
 set (MPI_EXEC_PRE_NUMPROCS_FLAGS "--bind-to;none" CACHE STRING "Set by default for PR testing")
 # NOTE: The above is a workaround for the problem of having threads on MPI

diff --git a/cmake/std/PullRequestLinuxCuda9.2TestingSettings.cmake b/cmake/std/PullRequestLinuxCuda9.2TestingSettings.cmake
@@ -60,7 +60,12 @@ set (HDF5_INCLUDE_DIRS "$ENV{HDF5_ROOT}/include" CACHE FILEPATH "Set by default
 set (TPL_HDF5_LIBRARIES "-L$ENV{HDF5_ROOT}/lib;$ENV{HDF5_ROOT}/lib/libhdf5_hl.a;$ENV{HDF5_ROOT}/lib/libhdf5.a;-lz;-ldl" CACHE FILEPATH "Set by default for CUDA PR testing")
 set (TPL_ENABLE_Netcdf ON CACHE BOOL "Set by default for CUDA PR testing")
 set (Netcdf_INCLUDE_DIRS "$ENV{NETCDF_ROOT}/include" CACHE FILEPATH "Set by default for CUDA PR testing")
-set (TPL_Netcdf_LIBRARIES "-L$ENV{BOOST_ROOT}/lib;-L$ENV{NETCDF_ROOT}/lib;-L$ENV{NETCDF_ROOT}/lib;-L$ENV{PNETCDF_ROOT}/lib;-L$ENV{HDF5_ROOT}/lib;$ENV{BOOST_ROOT}/lib/libboost_program_options.a;$ENV{BOOST_ROOT}/lib/libboost_system.a;$ENV{NETCDF_ROOT}/lib/libnetcdf.a;$ENV{PNETCDF_ROOT}/lib/libpnetcdf.a;$ENV{HDF5_ROOT}/lib/libhdf5_hl.a;$ENV{HDF5_ROOT}/lib/libhdf5.a;-lz;-ldl" CACHE STRING "Set by default for CUDA PR testing")
+IF ("$ENV{PNETCDF_ROOT}" STREQUAL "")
+  SET(PNETCDF_ROOT "$ENV{NETCDF_ROOT}")
+ELSE()
+  SET(PNETCDF_ROOT "$ENV{PNETCDF_ROOT}")
+ENDIF()
+set (TPL_Netcdf_LIBRARIES "-L$ENV{NETCDF_ROOT}/lib;$ENV{NETCDF_ROOT}/lib/libnetcdf.a;${PNETCDF_ROOT}/lib/libpnetcdf.a;${TPL_HDF5_LIBRARIES}" CACHE STRING "Set by default for CUDA PR testing")
 # SuperLU and SuperLUDist is available on ride and could be enabled for the CUDA PR build
 set (TPL_ENABLE_SuperLU OFF CACHE BOOL "Set by default for CUDA PR testing")
 set (TPL_ENABLE_SuperLUDist OFF CACHE BOOL "Set by default for CUDA PR testing")

diff --git a/cmake/std/PullRequestLinuxDriverTest.py b/cmake/std/PullRequestLinuxDriverTest.py
@@ -160,8 +160,8 @@ def setBuildEnviron(arguments):
                      'sems-python/2.7.9',
                      'sems-boost/1.63.0/base',
                      'sems-zlib/1.2.8/base',
-                     'sems-hdf5/1.8.12/parallel',
-                     'sems-netcdf/4.4.1/exo_parallel',
+                     'sems-hdf5/1.10.6/parallel',
+                     'sems-netcdf/4.7.3/parallel',
                      'sems-parmetis/4.0.3/parallel',
                      'sems-scotch/6.0.3/nopthread_64bit_parallel',
                      'sems-superlu/4.3/base',
@@ -175,8 +175,8 @@ def setBuildEnviron(arguments):
                       'sems-python/2.7.9',
                       'sems-boost/1.63.0/base',
                       'sems-zlib/1.2.8/base',
-                      'sems-hdf5/1.8.12/base',
-                      'sems-netcdf/4.4.1/exo',
+                      'sems-hdf5/1.10.6/base',
+                      'sems-netcdf/4.7.3/base',
                       'sems-metis/5.1.0/base',
                       'sems-superlu/4.3/base',
                       'sems-cmake/3.10.3',
@@ -204,8 +204,8 @@ def setBuildEnviron(arguments):
                      'sems-python/2.7.9',
                      'sems-boost/1.63.0/base',
                      'sems-zlib/1.2.8/base',
-                     'sems-hdf5/1.8.12/parallel',
-                     'sems-netcdf/4.4.1/exo_parallel',
+                     'sems-hdf5/1.10.6/parallel',
+                     'sems-netcdf/4.7.3/parallel',
                      'sems-parmetis/4.0.3/parallel',
                      'sems-scotch/6.0.3/nopthread_64bit_parallel',
                      'sems-superlu/4.3/base',
@@ -220,8 +220,8 @@ def setBuildEnviron(arguments):
                      'sems-python/2.7.9',
                      'sems-boost/1.66.0/base',
                      'sems-zlib/1.2.8/base',
-                     'sems-hdf5/1.8.12/parallel',
-                     'sems-netcdf/4.4.1/exo_parallel',
+                     'sems-hdf5/1.10.6/parallel',
+                     'sems-netcdf/4.7.3/parallel',
                      'sems-parmetis/4.0.3/parallel',
                      'sems-scotch/6.0.3/nopthread_64bit_parallel',
                      'sems-superlu/4.3/base',
@@ -237,8 +237,8 @@ def setBuildEnviron(arguments):
                      'sems-python/2.7.9',
                      'sems-boost/1.63.0/base',
                      'sems-zlib/1.2.8/base',
-                     'sems-hdf5/1.8.12/parallel',
-                     'sems-netcdf/4.4.1/exo_parallel',
+                     'sems-hdf5/1.10.6/parallel',
+                     'sems-netcdf/4.7.3/parallel',
                      'sems-parmetis/4.0.3/parallel',
                      'sems-scotch/6.0.3/nopthread_64bit_parallel',
                      'sems-superlu/4.3/base',
@@ -254,8 +254,8 @@ def setBuildEnviron(arguments):
                      'sems-python/2.7.9',
                      'sems-boost/1.63.0/base',
                      'sems-zlib/1.2.8/base',
-                     'sems-hdf5/1.8.12/parallel',
-                     'sems-netcdf/4.4.1/exo_parallel',
+                     'sems-hdf5/1.10.6/parallel',
+                     'sems-netcdf/4.7.3/parallel',
                      'sems-parmetis/4.0.3/parallel',
                      'sems-scotch/6.0.3/nopthread_64bit_parallel',
                      'sems-superlu/4.3/base',
@@ -271,8 +271,8 @@ def setBuildEnviron(arguments):
                      'sems-python/2.7.9',
                      'sems-boost/1.63.0/base',
                      'sems-zlib/1.2.8/base',
-                     'sems-hdf5/1.8.12/parallel',
-                     'sems-netcdf/4.4.1/exo_parallel',
+                     'sems-hdf5/1.10.6/parallel',
+                     'sems-netcdf/4.7.3/parallel',
                      'sems-parmetis/4.0.3/parallel',
                      'sems-scotch/6.0.3/nopthread_64bit_parallel',
                      'sems-superlu/4.3/base',

diff --git a/cmake/std/atdm/ATDMDevEnvSettings.cmake b/cmake/std/atdm/ATDMDevEnvSettings.cmake
@@ -430,8 +430,13 @@ ELSE()
   IF (NOT "$ENV{ATDM_CONFIG_NETCDF_LIBS}" STREQUAL "")
     ATDM_SET_CACHE(TPL_Netcdf_LIBRARIES "$ENV{ATDM_CONFIG_NETCDF_LIBS}" CACHE FILEPATH)
   ELSE()
+    IF ("$ENV{PNETCDF_ROOT}" STREQUAL "")
+      SET(PNETCDF_ROOT "$ENV{NETCDF_ROOT}")
+    ELSE()
+      SET(PNETCDF_ROOT "$ENV{PNETCDF_ROOT}")
+    ENDIF()
     ASSERT_DEFINED(ENV{ZLIB_ROOT})
-    ATDM_SET_CACHE(TPL_Netcdf_LIBRARIES "${TPL_BoostLib_LIBRARIES};$ENV{NETCDF_ROOT}/lib/libnetcdf.${ATDM_TPL_LIB_EXT};$ENV{NETCDF_ROOT}/lib/libpnetcdf.a;$ENV{HDF5_ROOT}/lib/libhdf5_hl.${ATDM_TPL_LIB_EXT};$ENV{HDF5_ROOT}/lib/libhdf5.${ATDM_TPL_LIB_EXT};$ENV{ZLIB_ROOT}/lib/libz.${ATDM_TPL_LIB_EXT};-ldl;-lcurl" CACHE FILEPATH)
+    ATDM_SET_CACHE(TPL_Netcdf_LIBRARIES "$ENV{NETCDF_ROOT}/lib/libnetcdf.${ATDM_TPL_LIB_EXT};${PNETCDF_ROOT}/lib/libpnetcdf.a;$ENV{HDF5_ROOT}/lib/libhdf5_hl.${ATDM_TPL_LIB_EXT};$ENV{HDF5_ROOT}/lib/libhdf5.${ATDM_TPL_LIB_EXT};$ENV{ZLIB_ROOT}/lib/libz.${ATDM_TPL_LIB_EXT};-ldl;-lcurl" CACHE FILEPATH)
   ENDIF()
 ENDIF()
 

diff --git a/cmake/std/atdm/ATDMDisables.cmake b/cmake/std/atdm/ATDMDisables.cmake
@@ -34,6 +34,7 @@ SET(ATDM_SE_PACKAGE_DISABLES
   Komplex
   FEI
   TriKota
+  Compadre
   STKClassic
   STKSearchUtil
   STKUnit_tests

diff --git a/cmake/std/atdm/ats2/environment.sh b/cmake/std/atdm/ats2/environment.sh
@@ -220,7 +220,6 @@ export ATDM_CONFIG_SPARC_TPL_BASE=/projects/sparc/tpls/ats2-${sparc_tpl_arch}
 sparc_tpl_base=${ATDM_CONFIG_SPARC_TPL_BASE}
 
 # Commont ROOT config variables
-export BOOST_ROOT=${sparc_tpl_base}/boost-1.65.1/00000000/${sparc_tpl_ext}
 export HDF5_ROOT=${sparc_tpl_base}/hdf5-1.10.5/00000000/${sparc_tpl_mpi_ext}
 export CGNS_ROOT=${sparc_tpl_base}/cgns-c09a5cd/27e5681f1b74c679b5dcb337ac71036d16c47977/${sparc_tpl_mpi_ext}
 export PNETCDF_ROOT=${sparc_tpl_base}/pnetcdf-1.10.0/6144dc67b2041e4093063a04e89fc1e33398bd09/${sparc_tpl_mpi_ext}
@@ -231,7 +230,7 @@ export SUPERLUDIST_ROOT=${sparc_tpl_base}/superlu_dist-5.4.0/a3121eaff44f7bf7d44
 
 export ATDM_CONFIG_USE_HWLOC=OFF
 export ATDM_CONFIG_HDF5_LIBS="-L${HDF5_ROOT}/lib;${HDF5_ROOT}/lib/libhdf5_hl.a;${HDF5_ROOT}/lib/libhdf5.a;-lz;-ldl"
-export ATDM_CONFIG_NETCDF_LIBS="-L${BOOST_ROOT}/lib;-L${NETCDF_ROOT}/lib;-L${NETCDF_ROOT}/lib;-L${SEMS_PNETCDF_ROOT}/lib;-L${HDF5_ROOT}/lib;${BOOST_ROOT}/lib/libboost_program_options.a;${BOOST_ROOT}/lib/libboost_system.a;${NETCDF_ROOT}/lib/libnetcdf.a;${PNETCDF_ROOT}/lib/libpnetcdf.a;${HDF5_ROOT}/lib/libhdf5_hl.a;${HDF5_ROOT}/lib/libhdf5.a;-lz;-ldl;-lcurl"
+export ATDM_CONFIG_NETCDF_LIBS="-L${NETCDF_ROOT}/lib;${NETCDF_ROOT}/lib/libnetcdf.a;${PNETCDF_ROOT}/lib/libpnetcdf.a;${ATDM_CONFIG_HDF5_LIBS};-lcurl"
 
 if [[ "${ATDM_CONFIG_SUPERLUDIST_INCLUDE_DIRS}" == "" ]] ; then
   export ATDM_CONFIG_SUPERLUDIST_INCLUDE_DIRS=${SUPERLUDIST_ROOT}/include

diff --git a/cmake/std/atdm/cee-rhel6/environment.sh b/cmake/std/atdm/cee-rhel6/environment.sh
@@ -217,7 +217,10 @@ atdm_config_add_libs_to_var ATDM_CONFIG_BOOST_LIBS ${BOOST_ROOT}/lib .a \
 
 export ATDM_CONFIG_HDF5_LIBS="-L${HDF5_ROOT}/lib;${HDF5_ROOT}/lib/libhdf5_hl.a;${HDF5_ROOT}/lib/libhdf5.a;-lz;-ldl"
 
-export ATDM_CONFIG_NETCDF_LIBS="-L${BOOST_ROOT}/lib;-L${NETCDF_ROOT}/lib;-L${NETCDF_ROOT}/lib;-L${SEMS_PNETCDF_ROOT}/lib;-L${HDF5_ROOT}/lib;${BOOST_ROOT}/lib/libboost_program_options.a;${BOOST_ROOT}/lib/libboost_system.a;${NETCDF_ROOT}/lib/libnetcdf.a;${PNETCDF_ROOT}/lib/libpnetcdf.a;${HDF5_ROOT}/lib/libhdf5_hl.a;${HDF5_ROOT}/lib/libhdf5.a;-lz;-ldl;-lcurl"
+if [[ "${PNETCDF_ROOT}" == "" ]] ; then
+  export PNETCDF_ROOT=${NETCDF_ROOT}
+fi
+export ATDM_CONFIG_NETCDF_LIBS="-L${NETCDF_ROOT}/lib;${NETCDF_ROOT}/lib/libnetcdf.a;${PNETCDF_ROOT}/lib/libpnetcdf.a;${ATDM_CONFIG_HDF5_LIBS};-lcurl"
 
 # SuperLUDist
 if [[ "${ATDM_CONFIG_SUPERLUDIST_INCLUDE_DIRS}" == "" ]] ; then

diff --git a/cmake/std/atdm/common/toss3/environment_new.sh b/cmake/std/atdm/common/toss3/environment_new.sh
@@ -35,13 +35,13 @@ fi
 sparc_tpl_base=${ATDM_CONFIG_SPARC_TPL_BASE}
 module load cmake/3.12.2
 
-if [ "$ATDM_CONFIG_COMPILER" == "INTEL-18.0.2_OPENMPI-2.0.3" ]; then
+if [ "$ATDM_CONFIG_COMPILER" == "INTEL-18.0.2_OPENMPI-4.0.1" ]; then
     module load intel/18.0.2.199
     module load mkl/18.0.5.274 # Needed to address defect in MKL (#5316, #3992, #3914)
-    module load openmpi-intel/2.0
+    module load openmpi-intel/4.0
 
-    sparc_tpl_ext=cts1-bdw_intel-18.0.2
-    sparc_tpl_mpi_ext=cts1-bdw_intel-18.0.2_openmpi-2.0.3
+    sparc_tpl_ext=cts1-bdw_intel-19.0.5
+    sparc_tpl_mpi_ext=cts1-bdw_intel-19.0.5_openmpi-4.0.1
     # rabartl: ToDo: Above, we need to find a way to extract 'cts1-bdw' out of
     # this file for this to be general!
 
@@ -79,21 +79,21 @@ export OMPI_FC=`which ifort`
 export ATDM_CONFIG_LAPACK_LIBS="-mkl"
 export ATDM_CONFIG_BLAS_LIBS="-mkl"
 
-export BOOST_ROOT=${sparc_tpl_base}/boost-1.65.1/00000000/${sparc_tpl_ext}
+export BOOST_ROOT=${sparc_tpl_base}/boost-1.72.0/00000000/${sparc_tpl_ext}
 export HDF5_ROOT=${sparc_tpl_base}/hdf5-1.10.5/00000000/${sparc_tpl_mpi_ext}
-export CGNS_ROOT=${sparc_tpl_base}/cgns-c09a5cd/27e5681f1b74c679b5dcb337ac71036d16c47977/${sparc_tpl_mpi_ext}
-export PNETCDF_ROOT=${sparc_tpl_base}/pnetcdf-1.10.0/6144dc67b2041e4093063a04e89fc1e33398bd09/${sparc_tpl_mpi_ext}
-export NETCDF_ROOT=${sparc_tpl_base}/netcdf-4.7.0/58bc48d95be2cc9272a18488fea52e1be1f0b42a/${sparc_tpl_mpi_ext}
+export CGNS_ROOT=${sparc_tpl_base}/cgns-c09a5cd/d313cc2f822078e47c7dbdee074ecb0431e573eb/${sparc_tpl_mpi_ext}
+export PNETCDF_ROOT=${sparc_tpl_base}/pnetcdf-1.12.1/6144dc67b2041e4093063a04e89fc1e33398bd09/${sparc_tpl_mpi_ext}
+export NETCDF_ROOT=${sparc_tpl_base}/netcdf-4.7.0/24baa07a3fa1ff9dbc8e70dc591ebbdec56783b2/${sparc_tpl_mpi_ext}
 export PARMETIS_ROOT=${sparc_tpl_base}/parmetis-4.0.3/00000000/${sparc_tpl_mpi_ext}
 export METIS_ROOT=${sparc_tpl_base}/parmetis-4.0.3/00000000/${sparc_tpl_mpi_ext}
 export LIBHIO_ROOT=${sparc_tpl_base}/libhio-1.4.1.2/00000000/${sparc_tpl_mpi_ext}
-export EUCLID_ROOT=${sparc_tpl_base}/euclid-19.30/95b8242ad729449fdb86591b9643c11463b61fa2/${sparc_tpl_mpi_ext}
-export SGM_ROOT=${sparc_tpl_base}/sgm-19.30/00000000/${sparc_tpl_mpi_ext}
+export EUCLID_ROOT=${sparc_tpl_base}/euclid-20.23/8b68b12f72b59648c9a0a962a6d55ea978199860/${sparc_tpl_mpi_ext}
+export SGM_ROOT=${sparc_tpl_base}/sgm-20.23/00000000/${sparc_tpl_mpi_ext}
 export SUPERLUDIST_ROOT=${sparc_tpl_base}/superlu_dist-5.4.0/a3121eaff44f7bf7d44e625c3b3d2a9911e58876/${sparc_tpl_mpi_ext}
 
 export ATDM_CONFIG_USE_HWLOC=OFF
 export ATDM_CONFIG_HDF5_LIBS="-L${HDF5_ROOT}/lib;${HDF5_ROOT}/lib/libhdf5_hl.a;${HDF5_ROOT}/lib/libhdf5.a;-lz;-ldl"
-export ATDM_CONFIG_NETCDF_LIBS="-L${BOOST_ROOT}/lib;-L${NETCDF_ROOT}/lib;-L${PNETCDF_ROOT}/lib;-L${HDF5_ROOT}/lib;${BOOST_ROOT}/lib/libboost_program_options.a;${BOOST_ROOT}/lib/libboost_system.a;${NETCDF_ROOT}/lib/libnetcdf.a;${NETCDF_ROOT}/lib/libpnetcdf.a;${HDF5_ROOT}/lib/libhdf5_hl.a;${HDF5_ROOT}/lib/libhdf5.a;-lz;-ldl;-lcurl"
+export ATDM_CONFIG_NETCDF_LIBS="-L${NETCDF_ROOT}/lib;-L${PNETCDF_ROOT}/lib;${NETCDF_ROOT}/lib/libnetcdf.a;${PNETCDF_ROOT}/lib/libpnetcdf.a;${ATDM_CONFIG_HDF5_LIBS};-lcurl"
 export ATDM_CONFIG_SUPERLUDIST_INCLUDE_DIRS=${SUPERLUDIST_ROOT}/include
 export ATDM_CONFIG_SUPERLUDIST_LIBS=${SUPERLUDIST_ROOT}/lib64/libsuperlu_dist.a
 export ATDM_CONFIG_BINUTILS_LIBS="/usr/lib64/libbfd.so;/usr/lib64/libiberty.a"
@@ -120,4 +120,3 @@ export F90=mpif90
 source $ATDM_SCRIPT_DIR/common/define_run_on_slurm_compute_node_func.sh
 
 export ATDM_CONFIG_COMPLETED_ENV_SETUP=TRUE
-
diff --git a/cmake/std/atdm/common/toss3/environment_tlcc2.sh b/cmake/std/atdm/common/toss3/environment_tlcc2.sh
@@ -37,7 +37,7 @@ fi
 if [ "$ATDM_CONFIG_COMPILER" == "INTEL" ]; then
     module load sems-intel/18.0.0
     module load sems-openmpi/1.10.5
-    module load sems-netcdf/4.4.1/exo_parallel
+    module load sems-netcdf/4.7.3/parallel
     module load sems-parmetis/4.0.3/64bit_parallel
     module load sems-scotch/6.0.3/nopthread_64bit_parallel
     module load sems-superlu/5.2.1/base
@@ -49,9 +49,9 @@ if [ "$ATDM_CONFIG_COMPILER" == "INTEL" ]; then
     module swap mkl/18.0.0.128 mkl/18.0.5.274
     module load gcc/4.9.3
     module unload sems-python/2.7.9
-    export BOOST_ROOT=$SEMS_BOOST_ROOT
     export HDF5_ROOT=$SEMS_HDF5_ROOT
     export NETCDF_ROOT=$SEMS_NETCDF_ROOT
+    export PNETCDF_ROOT=$SEMS_NETCDF_ROOT
     export YAMLCPP_ROOT=$SEMS_YAML_CPP_ROOT
     export OMPI_CXX=`which icpc`
     export OMPI_CC=`which icc`
@@ -67,8 +67,8 @@ else
 fi
 
 export ATDM_CONFIG_USE_HWLOC=OFF
-export ATDM_CONFIG_HDF5_LIBS="-L${SEMS_HDF5_ROOT}/lib;${SEMS_HDF5_ROOT}/lib/libhdf5_hl.a;${SEMS_HDF5_ROOT}/lib/libhdf5.a;-lz;-ldl"
-export ATDM_CONFIG_NETCDF_LIBS="-L${SEMS_BOOST_ROOT}/lib;-L${SEMS_NETCDF_ROOT}/lib;-L${PNETCDF_ROOT}/lib;-L${SEMS_HDF5_ROOT}/lib;${SEMS_BOOST_ROOT}/lib/libboost_program_options.a;${SEMS_BOOST_ROOT}/lib/libboost_system.a;${SEMS_NETCDF_ROOT}/lib/libnetcdf.a;${SEMS_NETCDF_ROOT}/lib/libpnetcdf.a;${SEMS_HDF5_ROOT}/lib/libhdf5_hl.a;${SEMS_HDF5_ROOT}/lib/libhdf5.a;-lz;-ldl;-lcurl"
+export ATDM_CONFIG_HDF5_LIBS="-L${HDF5_ROOT}/lib;${HDF5_ROOT}/lib/libhdf5_hl.a;${HDF5_ROOT}/lib/libhdf5.a;-lz;-ldl"
+export ATDM_CONFIG_NETCDF_LIBS="-L${NETCDF_ROOT}/lib;-L${HDF5_ROOT}/lib;${NETCDF_ROOT}/lib/libnetcdf.a;${PNETCDF_ROOT}/lib/libpnetcdf.a;${ATDM_CONFIG_HDF5_LIBS};-lcurl"
 
 # not sure what below does.  It was in the original environment script
 #unset ATTB_ENV

diff --git a/cmake/std/atdm/cts1/all_supported_builds.sh b/cmake/std/atdm/cts1/all_supported_builds.sh
@@ -2,8 +2,8 @@
 export ATDM_CONFIG_CTEST_S_BUILD_NAME_PREFIX=Trilinos-atdm-
 
 export ATDM_CONFIG_ALL_SUPPORTED_BUILDS=(
-  cts1-intel-18.0.2_openmpi-2.0.3_openmp_static_dbg
-  cts1-intel-18.0.2_openmpi-2.0.3_openmp_static_opt
+  cts1-intel-18.0.2_openmpi-4.0.1_openmp_static_dbg
+  cts1-intel-18.0.2_openmpi-4.0.1_openmp_static_opt
   cts1-intel-19.0.5_openmpi-4.0.1_openmp_static_dbg
   cts1-intel-19.0.5_openmpi-4.0.1_openmp_static_opt
   )
diff --git a/cmake/std/atdm/cts1/custom_builds.sh b/cmake/std/atdm/cts1/custom_builds.sh
@@ -14,21 +14,21 @@ if [[ $ATDM_CONFIG_BUILD_NAME == *"intel-19.0.5-openmpi-4.0.1"* ]] \
   || [[ $ATDM_CONFIG_BUILD_NAME == *"intel-19"* ]] \
   ; then
   export ATDM_CONFIG_COMPILER=INTEL-19.0.5_OPENMPI-4.0.1
-elif [[ $ATDM_CONFIG_BUILD_NAME == *"intel-18.0.2-openmpi-2.0.3"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"intel-18.0.2_openmpi-2.0.3"* ]] \
+elif [[ $ATDM_CONFIG_BUILD_NAME == *"intel-18.0.2-openmpi-4.0.1"* ]] \
+  || [[ $ATDM_CONFIG_BUILD_NAME == *"intel-18.0.2_openmpi-4.0.1"* ]] \
   || [[ $ATDM_CONFIG_BUILD_NAME == *"intel-18.0.2"* ]] \
   || [[ $ATDM_CONFIG_BUILD_NAME == *"intel"* ]] \
   || [[ $ATDM_CONFIG_BUILD_NAME == *"default" ]] \
   ; then
-  export ATDM_CONFIG_COMPILER=INTEL-18.0.2_OPENMPI-2.0.3
+  export ATDM_CONFIG_COMPILER=INTEL-18.0.2_OPENMPI-4.0.1
 else
   echo
   echo "***"
   echo "*** ERROR: A supported compiler was not selected for 'cts1' env"
   echo "***"
   echo "*** Supported compilers include:"
   echo "***"
-  echo "****  intel-18.0.2_openmpi-2.0.3   (default)"
+  echo "****  intel-18.0.2_openmpi-4.0.1   (default)"
   echo "****  intel-19.0.5_openmpi-4.0.1"
   echo "***"
   return

diff --git a/cmake/std/atdm/examples/my-sems-rhel6-config/environment.sh b/cmake/std/atdm/examples/my-sems-rhel6-config/environment.sh
@@ -3,7 +3,7 @@
 
 echo "Using my custom SEMS RHEL6 env for compiler stack $ATDM_CONFIG_COMPILER to build $ATDM_CONFIG_BUILD_TYPE code with Kokkos node type $ATDM_CONFIG_NODE_TYPE"
 
-if [[ "${ATDM_CONFIG_COMPILER}" != "GNU" ]] ; then 
+if [[ "${ATDM_CONFIG_COMPILER}" != "GNU" ]] ; then
   echo "ATDM_CONFIG_COMPILER=${ATDM_CONFIG_COMPILER} not supported!  Only 'gnu' supported currently!"
 fi
 
@@ -18,11 +18,11 @@ module load sems-ninja_fortran/1.8.2
 
 module load sems-gcc/7.2.0
 module load sems-openmpi/1.10.1
-module load sems-netcdf/4.4.1/exo_parallel
-module load sems-hdf5/1.8.12/parallel
+module load sems-netcdf/4.7.3/parallel
+module load sems-hdf5/1.10.6/parallel
 module load sems-zlib/1.2.8/base
 module load sems-boost/1.59.0/base
-module unload sems-python/2.7.9 
+module unload sems-python/2.7.9
 module load sems-superlu/4.3/base
 
 # 2) Set up env vars that will get picked up by ATDMDevEnvSettings.cmake when