Skip to content

Commit

Permalink
Docker and config site file updates for the 3.3.3 release. (#18612)
Browse files Browse the repository at this point in the history
  • Loading branch information
@brugger1
brugger1 committed Mar 29, 2023
1 parent d4a9e49 commit c1f186e
Show file tree
Hide file tree
Showing 16 changed files with 61 additions and 46 deletions.
2 changes: 1 addition & 1 deletion scripts/docker/Dockerfile-debian10
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ WORKDIR /home/visit
# Create the third-party directory
RUN mkdir /home/visit/third-party
# Copy build_visit and the script to run it
COPY build_visit3_3_1 /home/visit
COPY build_visit3_3_3 /home/visit
COPY run_build_visit.sh /home/visit
COPY build_visit_docker_cleanup.py /home/visit
COPY build_test_visit.sh /home/visit
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/Dockerfile-debian11
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ WORKDIR /home/visit
# Create the third-party directory
RUN mkdir /home/visit/third-party
# Copy build_visit and the script to run it
COPY build_visit3_3_1 /home/visit
COPY build_visit3_3_3 /home/visit
COPY run_build_visit.sh /home/visit
COPY build_visit_docker_cleanup.py /home/visit
COPY build_test_visit.sh /home/visit
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/Dockerfile-debian9
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ WORKDIR /home/visit
# Create the third-party directory
RUN mkdir /home/visit/third-party
# Copy build_visit and the script to run it
COPY build_visit3_3_1 /home/visit
COPY build_visit3_3_3 /home/visit
COPY run_build_visit.sh /home/visit
COPY build_visit_docker_cleanup.py /home/visit
COPY build_test_visit.sh /home/visit
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/Dockerfile-fedora31
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ WORKDIR /home/visit
# Create the third-party directory
RUN mkdir third-party
# Copy build_visit and the script to run it
COPY build_visit3_3_1 /home/visit
COPY build_visit3_3_3 /home/visit
COPY run_build_visit_fedora31.sh /home/visit
COPY build_visit_docker_cleanup.py /home/visit
COPY build_test_visit.sh /home/visit
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/Dockerfile-ubuntu18
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ WORKDIR /home/visit
# Create the third-party directory
RUN mkdir third-party
# Copy build_visit and the script to run it
COPY build_visit3_3_1 /home/visit
COPY build_visit3_3_3 /home/visit
COPY run_build_visit.sh /home/visit
COPY build_visit_docker_cleanup.py /home/visit
COPY build_test_visit.sh /home/visit
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/Dockerfile-ubuntu20
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ WORKDIR /home/visit
# Create the third-party directory
RUN mkdir third-party
# Copy build_visit and the script to run it
COPY build_visit3_3_1 /home/visit
COPY build_visit3_3_3 /home/visit
COPY run_build_visit.sh /home/visit
COPY build_visit_docker_cleanup.py /home/visit
COPY build_test_visit.sh /home/visit
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/Dockerfile-ubuntu22
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ WORKDIR /home/visit
# Create the third-party directory
RUN mkdir third-party
# Copy build_visit and the script to run it
COPY build_visit3_3_1 /home/visit
COPY build_visit3_3_3 /home/visit
COPY run_build_visit_ubuntu22.sh /home/visit
COPY build_visit_docker_cleanup.py /home/visit
COPY build_test_visit.sh /home/visit
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/run_build_visit.sh
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
echo "yes" | ./build_visit3_3_1 --required --optional --mesagl --mpich --uintah --no-moab --no-pidx --no-vtkm --no-visit --thirdparty-path /home/visit/third-party --makeflags -j4; python build_visit_docker_cleanup.py
echo "yes" | ./build_visit3_3_3 --required --optional --mesagl --mpich --uintah --no-moab --no-pidx --no-vtkm --no-visit --thirdparty-path /home/visit/third-party --makeflags -j4; python build_visit_docker_cleanup.py
2 changes: 1 addition & 1 deletion scripts/docker/run_build_visit_centos8.sh
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
echo "yes" | ./build_visit3_3_1 --required --optional --mesagl --mpich --uintah --no-moab --no-pidx --no-vtkm --no-visit --thirdparty-path /home/visit/third-party --makeflags -j4; echo "yes" | ./build_visit3_3_1 --required --optional --mesagl --mpich --uintah --no-moab --no-pidx --no-vtkm --no-visit --thirdparty-path /home/visit/third-party --makeflags -j4; python build_visit_docker_cleanup.py
echo "yes" | ./build_visit3_3_3 --required --optional --mesagl --mpich --uintah --no-moab --no-pidx --no-vtkm --no-visit --thirdparty-path /home/visit/third-party --makeflags -j4; echo "yes" | ./build_visit3_3_3 --required --optional --mesagl --mpich --uintah --no-moab --no-pidx --no-vtkm --no-visit --thirdparty-path /home/visit/third-party --makeflags -j4; python build_visit_docker_cleanup.py
2 changes: 1 addition & 1 deletion scripts/docker/run_build_visit_fedora31.sh
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
echo "yes" | ./build_visit3_3_1 --required --optional --mesagl --mpich --uintah --no-moab --no-pidx --no-vtkm --no-visit --thirdparty-path /home/visit/third-party --makeflags -j4; python build_visit_docker_cleanup.py
echo "yes" | ./build_visit3_3_3 --required --optional --mesagl --mpich --uintah --no-moab --no-pidx --no-vtkm --no-visit --thirdparty-path /home/visit/third-party --makeflags -j4; python build_visit_docker_cleanup.py
2 changes: 1 addition & 1 deletion scripts/docker/run_build_visit_ubuntu22.sh
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
echo "yes" | ./build_visit3_3_1 --required --optional --mesagl --mpich --uintah --no-moab --no-pidx --no-vtkm --no-ospray --no-visit --thirdparty-path /home/visit/third-party --makeflags -j4 --cxxflags -std=c++11; python build_visit_docker_cleanup.py
echo "yes" | ./build_visit3_3_3 --required --optional --mesagl --mpich --uintah --no-moab --no-pidx --no-vtkm --no-ospray --no-visit --thirdparty-path /home/visit/third-party --makeflags -j4 --cxxflags -std=c++11; python build_visit_docker_cleanup.py
17 changes: 11 additions & 6 deletions src/config-site/kickit.llnl.gov.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#/usr/gapps/visit/thirdparty_shared/3.3.0/opengl/cmake/3.18.2/linux-x86_64_gcc-9.1/bin/cmake
##
## ./build_visit3_3_0 generated host.cmake
## created: Wed Jun 1 17:21:52 PDT 2022
## system: Linux kickit.llnl.gov 3.10.0-1160.62.1.el7.x86_64 #1 SMP Wed Mar 23 09:04:02 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux
## ./build_visit3_3_3 generated host.cmake
## created: Wed Mar 29 11:46:45 PDT 2023
## system: Linux kickit.llnl.gov 3.10.0-1160.88.1.el7.x86_64 #1 SMP Sat Feb 18 13:27:00 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux
## by: brugger1

##
Expand All @@ -19,7 +19,7 @@ VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER /usr/gapps/gcc/gcc-9.1/bin/g++ TYPE FILE
VISIT_OPTION_DEFAULT(VISIT_CXX_LIBRARY /usr/gapps/gcc/gcc-9.1/lib64/libstdc++.so 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)

##
## Parallel Build Setup.
Expand Down Expand Up @@ -168,8 +168,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)

##
Expand Down Expand Up @@ -261,6 +261,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
##
Expand Down
17 changes: 11 additions & 6 deletions src/config-site/kickit.mesagl.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#/usr/gapps/visit/thirdparty_shared/3.3.0/mesagl/cmake/3.18.2/linux-x86_64_gcc-9.1/bin/cmake
##
## ./build_visit3_3_0 generated host.cmake
## created: Tue May 31 18:02:36 PDT 2022
## system: Linux kickit.llnl.gov 3.10.0-1160.62.1.el7.x86_64 #1 SMP Wed Mar 23 09:04:02 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux
## ./build_visit3_3_3 generated host.cmake
## created: Wed Mar 29 11:29:47 PDT 2023
## system: Linux kickit.llnl.gov 3.10.0-1160.88.1.el7.x86_64 #1 SMP Sat Feb 18 13:27:00 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux
## by: brugger1

##
Expand All @@ -19,7 +19,7 @@ VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER /usr/gapps/gcc/gcc-9.1/bin/g++ TYPE FILE
VISIT_OPTION_DEFAULT(VISIT_CXX_LIBRARY /usr/gapps/gcc/gcc-9.1/lib64/libstdc++.so 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)

##
## Parallel Build Setup.
Expand Down Expand Up @@ -178,8 +178,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)

##
Expand Down Expand Up @@ -261,6 +261,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
##
Expand Down
19 changes: 12 additions & 7 deletions src/config-site/lassen708.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#/usr/workspace/wsa/visit/visit/thirdparty_shared/3.3.2/blueos/cmake/3.18.2/linux-ppc64le_gcc-7.3/bin/cmake
##
## ./build_visit3_3_2 generated host.cmake
## created: Fri Feb 3 18:23:47 PST 2023
## system: Linux lassen708 4.14.0-115.35.1.3chaos.ch6a.ppc64le #1 SMP Wed Jul 21 17:12:16 PDT 2021 ppc64le ppc64le ppc64le GNU/Linux
## ./build_visit3_3_3 generated host.cmake
## created: Wed Mar 29 10:51:06 PDT 2023
## system: Linux lassen709 4.14.0-115.35.1.3chaos.ch6a.ppc64le #1 SMP Wed Jul 21 17:12:16 PDT 2021 ppc64le ppc64le ppc64le GNU/Linux
## by: brugger

##
Expand Down Expand Up @@ -153,8 +153,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)

##
Expand Down Expand Up @@ -195,9 +195,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)

##
Expand Down Expand Up @@ -225,6 +225,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
##
Expand Down
16 changes: 8 additions & 8 deletions src/config-site/poodle18.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#/usr/workspace/wsa/visit/visit/thirdparty_shared/3.3.2/toss4/cmake/3.18.2/linux-x86_64_gcc-10.3/bin/cmake
##
## ./build_visit3_3_2 generated host.cmake
## created: Fri Feb 17 14:52:57 PST 2023
## system: Linux poodle18 4.18.0-425.3.1.1toss.t4.x86_64 #1 SMP Fri Nov 11 20:07:48 PST 2022 x86_64 x86_64 x86_64 GNU/Linux
## ./build_visit3_3_3 generated host.cmake
## created: Wed Mar 29 10:38:47 PDT 2023
## system: Linux poodle18 4.18.0-425.13.1.1toss.t4.x86_64 #1 SMP Tue Feb 21 12:18:04 PST 2023 x86_64 x86_64 x86_64 GNU/Linux
## by: brugger

##
Expand All @@ -18,7 +18,7 @@ VISIT_OPTION_DEFAULT(VISIT_C_COMPILER gcc TYPE FILEPATH)
VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER 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)

##
## Parallel Build Setup.
Expand Down Expand Up @@ -182,8 +182,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)

##
Expand Down Expand Up @@ -224,9 +224,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)

##
Expand Down
16 changes: 8 additions & 8 deletions src/config-site/quartz386.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#/usr/workspace/wsa/visit/visit/thirdparty_shared/3.3.2/toss3/cmake/3.18.2/linux-x86_64_gcc-7.3/bin/cmake
##
## ./build_visit3_3_2 generated host.cmake
## created: Fri Feb 3 16:02:10 PST 2023
## system: Linux quartz188 3.10.0-1160.76.1.1chaos.ch6.x86_64 #1 SMP Tue Aug 9 16:18:25 PDT 2022 x86_64 x86_64 x86_64 GNU/Linux
## ./build_visit3_3_3 generated host.cmake
## created: Wed Mar 29 10:35:57 PDT 2023
## system: Linux quartz2300 3.10.0-1160.76.1.1chaos.ch6.x86_64 #1 SMP Tue Aug 9 16:18:25 PDT 2022 x86_64 x86_64 x86_64 GNU/Linux
## by: brugger

##
Expand All @@ -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)

##
## Parallel Build Setup.
Expand Down Expand Up @@ -182,8 +182,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)

##
Expand Down Expand Up @@ -224,9 +224,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)

##
Expand Down

0 comments on commit c1f186e

Please sign in to comment.