Update centos7 make/config files

Author: bclyons12

m3dc1_scorec/config-files/centos7-config.sh

@@ -1,30 +1,40 @@
-MPIVER=intel2019u3-openmpi4.0.3
-PETSCVER=petsc3.13.5
-PETSC_VER=petsc-3.13.5
+# These should be consistent with unstructued/centos7.mk,
+# but values there will overwrite these when compiled from M3D-C1 "make scorec"
+MPIVER=${MPIVER:-intel2019u3-openmpi4.0.3}
+PETSCVER=${PETSC_VER:-petsc3.13.5}
+PETSC_VER=${PETSCVER:-petsc-3.13.5}
+PETSC_DIR=${PETSC_DIR:-/p/tsc/m3dc1/lib/SCORECLib/PETSC/$PETSC_VER}
+if [ $SCOREC_COMPLEX == ON ]
+then
+  PETSC_ARCH=${PETSC_ARCH:-cplx-rhel7-$MPIVER}
+else
+  PETSC_ARCH=${PETSC_ARCH:-real-rhel7-$MPIVER}
+fi
+
+# This is different from when compiling with M3D-C1 "make scorec"
+SCOREC_DIR=${SCOREC_DIR:-/p/tsc/m3dc1/lib/SCORECLib/rhel7/$MPIVER/$PETSCVER}
+
+# Always defined here
 CMAKETYPE=Release
-PETSC_DIR=/p/tsc/m3dc1/lib/SCORECLib/PETSC/$PETSC_VER
-PETSC_ARCH=cplx-rhel7-$MPIVER
 ZOLTAN_DIR=$PETSC_DIR/$PETSC_ARCH
-SCOREC_DIR=/p/tsc/m3dc1/lib/SCORECLib/rhel7/$MPIVER/$PETSCVER
 PREFIX=$SCOREC_DIR
-#/p/tsc/m3dc1/lib/SCORECLib/rhel7/$MPIVER/$PETSC_VER/adapt2
-#module load intel/2019.u3 openmpi/4.0.3 hdf5-parallel/1.10.5
+
 cmake .. \
   -DCMAKE_C_COMPILER=mpicc \
   -DCMAKE_CXX_COMPILER=mpicxx \
   -DCMAKE_Fortran_COMPILER=mpif90 \
   -DCMAKE_C_FLAGS=" -g -O0 -DOLDMA -DPETSCMASTER -I$PETSC_DIR/include" \
   -DCMAKE_CXX_FLAGS=" -g -O0 -DOLDMA -DPETSCMASTER -I$PETSC_DIR/include" \
   -DCMAKE_Fortran_FLAGS="-fpic "\
-  -DSCOREC_INCLUDE_DIR="$SCOREC_DIR/include" \
-  -DSCOREC_LIB_DIR="$SCOREC_DIR/lib" \
+  -DSCOREC_INCLUDE_DIR="$SCOREC_BASE_DIR/include" \
+  -DSCOREC_LIB_DIR="$SCOREC_BASE_DIR/lib" \
   -DZOLTAN_LIBRARY="$ZOLTAN_DIR/lib/libzoltan.a" \
   -DPARMETIS_LIBRARY="$PETSC_DIR/$PETSC_ARCH/lib/libparmetis.a" \
   -DMETIS_LIBRARY="$PETSC_DIR/$PETSC_ARCH/lib/libmetis.a" \
   -DPETSC_INCLUDE_DIR="$PETSC_DIR/$PETSC_ARCH/include" \
   -DPETSC_LIB_DIR="$PETSC_DIR/$PETSC_ARCH/lib" \
   -DENABLE_PETSC=ON \
   -DCMAKE_INSTALL_PREFIX="$PREFIX" \
-  -DENABLE_COMPLEX=ON \
+  -DENABLE_COMPLEX=$SCOREC_COMPLEX \
   -DENABLE_TESTING=OFF \
   -DCMAKE_BUILD_TYPE=$CMAKETYPE

unstructured/centos7.mk

@@ -47,9 +47,15 @@ PETSCVER=petsc3.13.5
 
 PETSC_DIR=/p/tsc/m3dc1/lib/SCORECLib/PETSC/$(PETSC_VER)
 ifeq ($(COM), 1)
-PETSC_ARCH=cplx-rhel7-$(MPIVER)
+  PETSC_ARCH=cplx-rhel7-$(MPIVER)
+  M3DC1_SCOREC_LIB=-lm3dc1_scorec_complex
+  M3DC1_SCOREC_LIBA=libm3dc1_scorec_complex.a
+  SCOREC_COMPLEX=ON
 else
-PETSC_ARCH=real-rhel7-$(MPIVER)
+  PETSC_ARCH=real-rhel7-$(MPIVER)
+  M3DC1_SCOREC_LIB=-lm3dc1_scorec
+  M3DC1_SCOREC_LIBA=libm3dc1_scorec.a
+  SCOREC_COMPLEX=OFF
 endif
 
 SCOREC_BASE_DIR=/p/tsc/m3dc1/lib/SCORECLib/rhel7/$(MPIVER)/$(PETSCVER)
@@ -58,18 +64,6 @@ SCOREC_UTIL_DIR=$(SCOREC_BASE_DIR)/bin
 PUMI_DIR=$(SCOREC_BASE_DIR)
 PUMI_LIB = -lpumi -lapf -lapf_zoltan -lcrv -lsam -lspr -lmth -lgmi -lma -lmds -lparma -lpcu -lph -llion
 
-ifdef SCORECVER
-  SCOREC_DIR=$(SCOREC_BASE_DIR)/$(SCORECVER)
-else
-  SCOREC_DIR=$(SCOREC_BASE_DIR)
-endif
-
-ifeq ($(COM), 1)
-  M3DC1_SCOREC_LIB=-lm3dc1_scorec_complex
-else
-  M3DC1_SCOREC_LIB=-lm3dc1_scorec
-endif
-
 SCOREC_LIB = -L$(SCOREC_DIR)/lib $(M3DC1_SCOREC_LIB) \
             -Wl,--start-group,-rpath,$(PUMI_DIR)/lib -L$(PUMI_DIR)/lib \
            $(PUMI_LIB) -Wl,--end-group