From a9fa7764e0224c5d4e55950b1fa99e9e593690ad Mon Sep 17 00:00:00 2001
From: Mike Park <Mike.Park@NASA.gov>
Date: Fri, 23 Jul 2021 09:12:54 -0400
Subject: [PATCH] makes the OpenCASCADE version generic

---
 misc/module-builder/k/esp.sh    | 7 +++++--
 misc/module-builder/k/refine.sh | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/misc/module-builder/k/esp.sh b/misc/module-builder/k/esp.sh
index bd2d78ff4..4a4de4868 100755
--- a/misc/module-builder/k/esp.sh
+++ b/misc/module-builder/k/esp.sh
@@ -19,6 +19,9 @@ wget --no-check-certificate https://acdl.mit.edu/ESP/PreBuilts/ESP${VERSION}Lin.
 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
index c0877add4..f597ab32c 100755
--- 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'