Update the config site file for rztopaz. (#18675) (#18676)

visit-dav · May 3, 2023 · 2464615 · 2464615
1 parent 5caa912
commit 2464615
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/src/config-site/rztopaz194.cmake b/src/config-site/rztopaz194.cmake
@@ -1,8 +1,8 @@
-#/usr/workspace/visit/visit/thirdparty_shared/3.3.0/toss3/cmake/3.18.2/linux-x86_64_gcc-7.3/bin/cmake
+#/usr/workspace/visit/visit/thirdparty_shared/3.3.0/toss3/cmake/3.24.3/linux-x86_64_gcc-7.3/bin/cmake
 ##
-## ./build_visit3_3_0 generated host.cmake
-## created: Tue May 31 15:37:45 PDT 2022
-## system: Linux rztopaz194 3.10.0-1160.62.1.1chaos.ch6.x86_64 #1 SMP Wed Apr 6 12:39:56 PDT 2022 x86_64 x86_64 x86_64 GNU/Linux
+## ./build_visit3_3_4 generated host.cmake
+## created: Tue May  2 12:04:58 PDT 2023
+## system: Linux rztrona5 3.10.0-1160.83.1.1chaos.ch6.x86_64 #1 SMP Tue Jan 24 17:36:15 PST 2023 x86_64 x86_64 x86_64 GNU/Linux
 ## by: brugger
 
 ##
@@ -18,7 +18,7 @@ VISIT_OPTION_DEFAULT(VISIT_C_COMPILER /usr/tce/packages/gcc/gcc-7.3.0/bin/gcc TY
 VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER /usr/tce/packages/gcc/gcc-7.3.0/bin/g++ TYPE FILEPATH)
 VISIT_OPTION_DEFAULT(VISIT_FORTRAN_COMPILER no TYPE FILEPATH)
 VISIT_OPTION_DEFAULT(VISIT_C_FLAGS " -m64 -fPIC -fvisibility=hidden" TYPE STRING)
-VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS "-std=c++11  -m64 -fPIC -fvisibility=hidden" TYPE STRING)
+VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS " -m64 -fPIC -fvisibility=hidden" TYPE STRING)
 SET(CMAKE_INSTALL_RPATH "/usr/tce/packages/gcc/gcc-7.3.0/lib64")
 
 ##
@@ -183,8 +183,8 @@ VISIT_OPTION_DEFAULT(VISIT_CGNS_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP
 ##
 ## Conduit
 ##
-SETUP_APP_VERSION(CONDUIT 0.8.4)
-VISIT_OPTION_DEFAULT(VISIT_CONDUIT_DIR ${VISITHOME}/conduit/v0.8.4/${VISITARCH})
+SETUP_APP_VERSION(CONDUIT 0.8.7)
+VISIT_OPTION_DEFAULT(VISIT_CONDUIT_DIR ${VISITHOME}/conduit/v0.8.7/${VISITARCH})
 VISIT_OPTION_DEFAULT(VISIT_CONDUIT_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP} TYPE STRING)
 
 ##
@@ -225,9 +225,9 @@ VISIT_OPTION_DEFAULT(VISIT_MILI_DIR ${VISITHOME}/mili/22.1/${VISITARCH})
 ##
 ## MOAB 
 ##
-VISIT_OPTION_DEFAULT(VISIT_MOAB_DIR ${VISITHOME}/moab/5.3.1/${VISITARCH})
+VISIT_OPTION_DEFAULT(VISIT_MOAB_DIR ${VISITHOME}/moab/5.4.1/${VISITARCH})
 VISIT_OPTION_DEFAULT(VISIT_MOAB_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP} TYPE STRING)
-VISIT_OPTION_DEFAULT(VISIT_MOAB_MPI_DIR ${VISITHOME}/moab_mpi/5.3.1/${VISITARCH})
+VISIT_OPTION_DEFAULT(VISIT_MOAB_MPI_DIR ${VISITHOME}/moab_mpi/5.4.1/${VISITARCH})
 VISIT_OPTION_DEFAULT(VISIT_MOAB_MPI_LIBDEP HDF5_MPI_LIBRARY_DIR hdf5_mpi ${VISIT_HDF5_MPI_LIBDEP} TYPE STRING)
 
 ##
@@ -259,6 +259,11 @@ VISIT_OPTION_DEFAULT(VISIT_SILO_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP
 SETUP_APP_VERSION(UINTAH 2.6.1)
 VISIT_OPTION_DEFAULT(VISIT_UINTAH_DIR ${VISITHOME}/uintah/${UINTAH_VERSION}/${VISITARCH})
 
+##
+## VTKM
+##
+VISIT_OPTION_DEFAULT(VISIT_VTKM_DIR ${VISITHOME}/vtkm/v1.9.0/${VISITARCH})
+
 ##
 ## Xdmf
 ##

diff --git a/src/tools/dev/scripts/visit-build-open b/src/tools/dev/scripts/visit-build-open
@@ -199,6 +199,9 @@
 #   Eric Brugger, Fri Feb 17 15:25:36 PST 2023
 #   I added poodle.
 #
+#   Eric Brugger, Tue May  2 14:55:44 PDT 2023
+#   I updated the path to cmake for building on rztrona.
+#
 #-----------------------------------------------------------------------
 
 test=no
@@ -601,7 +604,7 @@ cd $dist/src
 ver=\`cat VERSION\`
 ver2=\`echo \$ver | tr "." "_"\`
 export PATH=\$PATH:/usr/bin/X11
-/usr/workspace/visit/visit/thirdparty_shared/3.3.0/toss3/cmake/3.18.2/linux-x86_64_gcc-7.3/bin/cmake . -DCMAKE_BUILD_TYPE:STRING=Release -DVISIT_INSTALL_THIRD_PARTY:BOOL=ON -DVISIT_PARADIS:BOOL=ON >> ../../buildlog 2>&1
+/usr/workspace/visit/visit/thirdparty_shared/3.3.0/toss3/cmake/3.24.3/linux-x86_64_gcc-7.3/bin/cmake . -DCMAKE_BUILD_TYPE:STRING=Release -DVISIT_INSTALL_THIRD_PARTY:BOOL=ON -DVISIT_PARADIS:BOOL=ON >> ../../buildlog 2>&1
 make manuals >> ../../buildlog 2>&1
 make -j 12 package >> ../../buildlog 2>&1
 mv visit\$ver2.linux-x86_64.tar.gz ../..