Merge branch 'k-mpt-2.23' into 'master'

match FUN3D env See merge request fun3d-developers/refine!769
nasa · Jul 23, 2021 · 2e102af · 2e102af
2 parents 3939d35 + 77f1d82
commit 2e102af
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 35 deletions.
diff --git a/acceptance/boot-modules.sh b/acceptance/boot-modules.sh
@@ -1,18 +1,18 @@
 
 module use --append /u/shared/fun3d/fun3d_users/modulefiles
 
-module load mpt-2.19
+module load mpt-2.23
 
 module load gcc_6.2.0
-module load ESP/119-beta.2021.03.05.1211
+module load ESP/119
 module load tetgen
 
 export module_path="/u/shared/fun3d/fun3d_users/modules"
 
-export mpi_path="/opt/hpe/hpc/mpt/mpt-2.19"
+export mpi_path="/opt/hpe/hpc/mpt/mpt-2.23"
 
-export parmetis_path="${module_path}/ParMETIS/4.0.3-mpt-2.17r14-gcc_6.2.0"
+export parmetis_path="${module_path}/ParMETIS/4.0.3-mpt-2.23-gcc_6.2.0"
 
-export egads_path="${module_path}/ESP/119-beta.2021.03.05.1211/EngSketchPad"
-export opencascade_path="${module_path}/ESP/119-beta.2021.03.05.1211/OpenCASCADE-7.3.1"
+export egads_path="${module_path}/ESP/119/EngSketchPad"
+export opencascade_path="${module_path}/ESP/119/OpenCASCADE-7.4.1"
 
diff --git a/acceptance/cmake.sh b/acceptance/cmake.sh
@@ -16,7 +16,7 @@ set -x # echo commands
 log=`pwd`/../log-build.txt
 trap "cat $log" EXIT
 mkdir -p build
-export CMAKE_PREFIX_PATH=${mpi_path}:${egads_path}:${opencascade_path}
+export CMAKE_PREFIX_PATH="${mpi_path}:${parmetis_path}:${egads_path}:${opencascade_path}"
 ( cd build && \
       cmake \
 	  -DCMAKE_INSTALL_PREFIX=`pwd` \
@@ -34,3 +34,5 @@ export PATH=${PATH}:`pwd`/build/bin
       ./generate.sh >> $log 2>&1 ) || exit 1
 trap - EXIT
 
+cat `pwd`/../log-build.txt
+cat `pwd`/../log-bootstrap.txt
diff --git a/acceptance/pro-modules.sh b/acceptance/pro-modules.sh
@@ -1,15 +1,15 @@
 
 module load intel_2018.3.222
-module load mpt-2.19
+module load mpt-2.23
 
-export mpi_path="/opt/hpe/hpc/mpt/mpt-2.19"
+export mpi_path="/opt/hpe/hpc/mpt/mpt-2.23"
 
 export module_path="/u/shared/fun3d/fun3d_users/modules"
 
-export parmetis32_path="${module_path}/ParMETIS/4.0.3-mpt-2.19-intel_2018.3.222"
-export parmetis64_path="${module_path}/ParMETIS-64/4.0.3-mpt-2.19-intel_2018.3.222"
-export zoltan_path="${module_path}/Zoltan/3.82-mpt-2.19-intel_2018.3.222"
+export parmetis32_path="${module_path}/ParMETIS/4.0.3-mpt-2.23-intel_2018.3.222"
+export parmetis64_path="${module_path}/ParMETIS-64/4.0.3-mpt-2.23-intel_2018.3.222"
+export zoltan_path="${module_path}/Zoltan/3.82-mpt-2.23-intel_2018.3.222"
 
-export egads_path="${module_path}/ESP/119-beta.2020.09.29.1106/EngSketchPad"
-export opencascade_path="${module_path}/ESP/119-beta.2020.09.29.1106/OpenCASCADE-7.3.1"
+export egads_path="${module_path}/ESP/119/EngSketchPad"
+export opencascade_path="${module_path}/ESP/119/OpenCASCADE"
 
diff --git a/acceptance/ref-modules.sh b/acceptance/ref-modules.sh
@@ -20,6 +20,6 @@ export mpi_path="/usr/local/pkgs-modules/openmpi_2.1.1_intel_2017"
 export parmetis_path="${module_path}/ParMETIS/4.0.3-openmpi-2.1.1-intel_2017.2.174"
 export zoltan_path="${module_path}/Zoltan/3.82-openmpi-1.10.7-intel_2017.2.174"
 
-export egads_path="${module_path}/ESP/119-beta.2021.05.05.1543/EngSketchPad"
-export opencascade_path="${module_path}/ESP/119-beta.2021.05.05.1543/OpenCASCADE-7.3.1"
+export egads_path="${module_path}/ESP/119/EngSketchPad"
+export opencascade_path="${module_path}/ESP/119/OpenCASCADE"
 
diff --git a/acceptance/s2s-modules.sh b/acceptance/s2s-modules.sh
@@ -4,15 +4,15 @@ module use --append /u/shared/fun3d/fun3d_users/test_modulefiles
 
 module load --auto FUN3D_INTG
 module load gcc_6.2.0
-module load ESP/119-beta.2021.03.05.1211
+module load ESP/119
 module load tetgen
 
 export module_path="/u/shared/fun3d/fun3d_users/modules"
 
-export mpi_path="/opt/hpe/hpc/mpt/mpt-2.19"
+export mpi_path="/opt/hpe/hpc/mpt/mpt-2.23"
 
-export parmetis_path="${module_path}/ParMETIS/4.0.3-mpt-2.17r14-gcc_6.2.0"
+export parmetis_path="${module_path}/ParMETIS/4.0.3-mpt-2.23-gcc_6.2.0"
 
-export egads_path="${module_path}/ESP/119-beta.2021.03.05.1211/EngSketchPad"
-export opencascade_path="${module_path}/ESP/119-beta.2021.03.05.1211/OpenCASCADE-7.3.1"
+export egads_path="${module_path}/ESP/119/EngSketchPad"
+export opencascade_path="${module_path}/ESP/119/OpenCASCADE"
 
diff --git a/misc/module-builder/k/common.sh b/misc/module-builder/k/common.sh
@@ -4,11 +4,11 @@
 GROUP='fun3d_users'
 
 GCC_VERSION='6.2.0'
-MPT_VERSION='2.19'
+MPT_VERSION='2.23'
 INTEL_VERSION='2018.3.222'
 PARMETIS_VERSION='4.0.3'
 ZOLTAN_VERSION='3.82'
-ESP_VERSION='119-beta.2021.05.05.1543'
+ESP_VERSION='119'
 
 GCC_MODULE="gcc_${GCC_VERSION}"
 INTEL_MODULE="intel_${INTEL_VERSION}"

diff --git a/misc/module-builder/k/esp.sh b/misc/module-builder/k/esp.sh
@@ -1,7 +1,7 @@
 #! /bin/bash -xue
 
 PACKAGE='ESP'
-VERSION='118'
+VERSION='119'
 
 if [ $# -gt 0 ] ; then
    . common.sh  $1
@@ -15,10 +15,13 @@ echo Build ${PACKAGE} ${VERSION}
 # https://acdl.mit.edu/ESP/archive/
 
 rm -f ESP${VERSION}Lin.tgz
-wget --no-check-certificate https://acdl.mit.edu/ESP/archive/ESP${VERSION}Lin.tgz
+wget --no-check-certificate https://acdl.mit.edu/ESP/PreBuilts/ESP${VERSION}Lin.tgz
 mkdir ${MODULE_DEST}
 tar xzf ESP${VERSION}Lin.tgz -C ${MODULE_DEST} --strip-components=1
 
+# insulate linking from OpenCASCADE path version
+(cd ${MODULE_DEST} && ln -s OpenCASCADE-* OpenCASCADE)
+
 mkdir -p ${MODFILE_BASE}
 cat > ${MODFILE_DEST} << EOF
 #%Module#
@@ -44,12 +47,12 @@ if { \$modmode != "switch3" } {
 }
 
 setenv ESP_ROOT \$base/\$version/EngSketchPad
-setenv CASROOT \$base/\$version/OpenCASCADE-7.3.1
+setenv CASROOT \$base/\$version/OpenCASCADE
 
 prepend-path PATH \$base/\$version/EngSketchPad/bin
 
 prepend-path LD_LIBRARY_PATH \$base/\$version/EngSketchPad/lib
-prepend-path LD_LIBRARY_PATH \$base/\$version/OpenCASCADE-7.3.1/lib
+prepend-path LD_LIBRARY_PATH \$base/\$version/OpenCASCADE/lib
 
 EOF
 

diff --git a/misc/module-builder/k/refine.sh b/misc/module-builder/k/refine.sh
@@ -27,11 +27,11 @@ cd       _build_$VERSION
 
 ../${TOPDIR}/configure \
   --prefix=${MODULE_DEST} \
-  --with-mpi=/opt/hpe/hpc/mpt/mpt-2.19 \
+  --with-mpi=/opt/hpe/hpc/mpt/mpt-${MPT_VERSION} \
   --with-metis=${MODULE_ROOT}/${PARMETIS} \
   --with-parmetis=${MODULE_ROOT}/${PARMETIS} \
   --with-EGADS=${MODULE_ROOT}/${ESP}/EngSketchPad \
-  --with-OpenCASCADE=${MODULE_ROOT}/${ESP}/OpenCASCADE-7.3.1 \
+  --with-OpenCASCADE=${MODULE_ROOT}/${ESP}/OpenCASCADE \
   CC=icc \
   CFLAGS='-g -O2 -traceback -Wall -w3 -wd1418,2259,2547,981,11074,11076,1572,49,1419 -ftrapuv'
 

diff --git a/misc/setup-k.sh b/misc/setup-k.sh
@@ -5,15 +5,15 @@ set -x
 ./bootstrap
 
 module_path="/u/shared/fun3d/fun3d_users/modules"
-zoltan_path="${module_path}/Zoltan/3.82-mpt-2.19-intel_2018.3.222"
-parmetis_path="${module_path}/ParMETIS/4.0.3-mpt-2.19-intel_2018.3.222"
-gcc_parmetis_path="${module_path}/ParMETIS/4.0.3-mpt-2.17r14-gcc_6.2.0"
-egads_path="${module_path}/ESP/119-beta.2021.05.05.1543/EngSketchPad"
+zoltan_path="${module_path}/Zoltan/3.82-mpt-2.23-intel_2018.3.22"
+parmetis_path="${module_path}/ParMETIS/4.0.3-mpt-2.23-intel_2018.3.222"
+gcc_parmetis_path="${module_path}/ParMETIS/4.0.3-mpt-2.23-gcc_6.2.0"
+egads_path="${module_path}/ESP/119/EngSketchPad"
 egads_svn_path="/u/mpark/local/pkgs/EGADS/trunk"
-occ_path="${module_path}/ESP/119-beta.2021.05.05.1543/OpenCASCADE-7.3.1"
+occ_path="${module_path}/ESP/119/OpenCASCADE-7.3.1"
 meshlink_path="/u/mpark/local/pkgs/MeshLink"
 
-mpi_path="/opt/hpe/hpc/mpt/mpt-2.19"
+mpi_path="/opt/hpe/hpc/mpt/mpt-2.23"
 
 gcc_flags="-g -O2 -pedantic-errors -Wall -Wextra -Werror -Wunused -Wuninitialized"
 icc_flags="-g -O2 -traceback -Wall -w3 -wd1418,2259,2547,981,11074,11076,1572,49,1419 -ftrapuv"