diff --git a/m3dc1_scorec/config-files/babbage-real-config.sh b/m3dc1_scorec/config-files/babbage-real-config.sh
deleted file mode 100755
index 2c3616db3..000000000
--- a/m3dc1_scorec/config-files/babbage-real-config.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-cmake .. \
-  -DCMAKE_C_COMPILER="/global/babbage/nsg/opt/intel/impi/4.1.3.048/intel64/bin/mpiicc" \
-  -DCMAKE_CXX_COMPILER="/global/babbage/nsg/opt/intel/impi/4.1.3.048/intel64/bin/mpiicpc" \
-  -DCMAKE_Fortran_COMPILER="/global/babbage/nsg/opt/intel/impi/4.1.3.048/intel64/bin/mpiifort" \
-  -DCMAKE_C_FLAGS="-mmic -O3 -g -opt-assume-safe-padding -opt-streaming-stores always -opt-streaming-cache-evict=0 -I$PETSC_DIR/include" \
-  -DCMAKE_CXX_FLAGS="-mmic -O3 -g -opt-assume-safe-padding -opt-streaming-stores always -opt-streaming-cache-evict=0 -DMPICH_IGNORE_CXX_SEEK -I$PETSC_DIR/include" \
-  -DCMAKE_Fortran_FLAGS="-fpic -mmic -align array64byte -O3 -g -c -r8 -implicitnone -fpp -warn all "\
-  -DCMAKE_EXE_LINKER_FLAGS="-mt_mpi  -align array64byte " \
-  -DSCOREC_INCLUDE_DIR="/chos/global/project/projectdirs/mp288/babbage/scorec/Jun2015/include" \
-  -DSCOREC_LIB_DIR="/chos/global/project/projectdirs/mp288/babbage/scorec/Jun2015/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" \
-  -DHDF5_INCLUDE_DIR="$HDF5_DIR/include" \
-  -DHDF5_LIB_DIR="$HDF5_DIR/lib" \
-  -DCMAKE_INSTALL_PREFIX="/chos/global/project/projectdirs/mp288/babbage/scorec/Jun2015" \
-  -DENABLE_TESTING=OFF \
-  -DENABLE_COMPLEX=OFF \
-  -DCMAKE_BUILD_TYPE=Debug
diff --git a/m3dc1_scorec/config-files/centos7-config.sh b/m3dc1_scorec/config-files/centos7-config.sh
new file mode 100755
index 000000000..da8778ed1
--- /dev/null
+++ b/m3dc1_scorec/config-files/centos7-config.sh
@@ -0,0 +1,41 @@
+# 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}
+SCOREC_COMPLEX=${SCOREC_COMPLEX:-OFF}
+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
+ZOLTAN_DIR=$PETSC_DIR/$PETSC_ARCH
+PREFIX=$SCOREC_DIR
+
+cmake .. \
+  -DCMAKE_C_COMPILER=mpicc \
+  -DCMAKE_CXX_COMPILER=mpicxx \
+  -DCMAKE_Fortran_COMPILER=mpif90 \
+  -DCMAKE_C_FLAGS=" -g -O0 -DPETSCMASTER -I$PETSC_DIR/include" \
+  -DCMAKE_CXX_FLAGS=" -g -O0 -DPETSCMASTER -I$PETSC_DIR/include" \
+  -DCMAKE_Fortran_FLAGS="-fpic "\
+  -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=$SCOREC_COMPLEX \
+  -DENABLE_TESTING=OFF \
+  -DCMAKE_BUILD_TYPE=$CMAKETYPE
diff --git a/m3dc1_scorec/config-files/centos7-real-config.sh b/m3dc1_scorec/config-files/centos7-real-config.sh
deleted file mode 100755
index a955a92ed..000000000
--- a/m3dc1_scorec/config-files/centos7-real-config.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-MPIVER=intel2019u3-openmpi4.0.3
-PETSCVER=petsc3.13.5
-PETSC_VER=petsc-3.13.5
-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
-#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 -DPETSCMASTER -I$PETSC_DIR/include" \
-  -DCMAKE_CXX_FLAGS=" -g -O0 -DPETSCMASTER -I$PETSC_DIR/include" \
-  -DCMAKE_Fortran_FLAGS="-fpic "\
-  -DSCOREC_INCLUDE_DIR="$SCOREC_DIR/include" \
-  -DSCOREC_LIB_DIR="$SCOREC_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_TESTING=OFF \
-  -DCMAKE_BUILD_TYPE=$CMAKETYPE
diff --git a/m3dc1_scorec/config-files/core-babbage-config.sh b/m3dc1_scorec/config-files/core-babbage-config.sh
deleted file mode 100755
index e33bb6961..000000000
--- a/m3dc1_scorec/config-files/core-babbage-config.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-cmake .. \
-  -DCMAKE_C_COMPILER="/global/babbage/nsg/opt/intel/impi/4.1.3.048/intel64/bin/mpiicc" \
-  -DCMAKE_CXX_COMPILER="/global/babbage/nsg/opt/intel/impi/4.1.3.048/intel64/bin/mpiicpc" \
-  -DCMAKE_C_FLAGS="-mmic -O3 -g -opt-assume-safe-padding -opt-streaming-stores always -opt-streaming-cache-evict=0" \
-  -DCMAKE_CXX_FLAGS="-mmic -O3 -g -opt-assume-safe-padding -opt-streaming-stores always -opt-streaming-cache-evict=0 -DMPICH_IGNORE_CXX_SEEK" \
-  -DENABLE_THREADS=ON \
-  -DCMAKE_EXE_LINKER_FLAGS="-mt_mpi " \
-  -DENABLE_ZOLTAN=ON \
-  -DZOLTAN_INCLUDE_DIR="$ZOLTAN_DIR/include" \
-  -DZOLTAN_LIBRARY="$ZOLTAN_DIR/lib/libzoltan.a" \
-  -DPARMETIS_INCLUDE_DIR="$PETSC_DIR/$PETSC_ARCH/include" \
-  -DPARMETIS_LIBRARY="$PETSC_DIR/$PETSC_ARCH/lib/libparmetis.a" \
-  -DMETIS_LIBRARY="$PETSC_DIR/$PETSC_ARCH/lib/libmetis.a" \
-  -DCMAKE_INSTALL_PREFIX="/global/u1/s/seol/babbage" \
-  -DIS_TESTING=OFF \
-  -DCMAKE_BUILD_TYPE=Debug
diff --git a/m3dc1_scorec/config-files/core-portal-openmpi-4.0.1-config.sh b/m3dc1_scorec/config-files/core-portal-openmpi-4.0.1-config.sh
deleted file mode 100755
index a6d142ec6..000000000
--- a/m3dc1_scorec/config-files/core-portal-openmpi-4.0.1-config.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-MPIVER=intel2019u3-openmpi4.0.1
-PETSCVER=petsc3.9.3
-PETSC_VER=petsc-3.9.3
-CMAKETYPE=Release
-PETSC_DIR=/p/tsc/m3dc1/lib/SCORECLib/PETSC/$PETSC_VER
-PETSC_ARCH=real-intel2019u3-openmpi4.0.1
-PARMETIS_INSTALL_DIR=/usr/pppl/intel/2019-pkgs/openmpi-4.0.1-pkgs/petsc-3.12.1/real
-PARMETIS_DIR=$PETSC_DIR/$PETSC_ARCH
-ZOLTAN_INSTALL_DIR=/usr/pppl/intel/2019-pkgs/openmpi-4.0.1-pkgs/petsc-3.12.1/real
-ZOLTAN_DIR=$PETSC_DIR/$PETSC_ARCH
-PREFIX=/p/tsc/m3dc1/lib/SCORECLib/rhel6/$MPIVER/$PETSCVER
-cmake .. \
-  -DCMAKE_C_COMPILER="mpicc" \
-  -DCMAKE_CXX_COMPILER="mpicxx" \
-  -DCMAKE_C_FLAGS=" -g -O2 -Wall -Wextra" \
-  -DCMAKE_CXX_FLAGS=" -g -O2 -Wall -Wextra" \
-  -DSCOREC_ENABLE_CXX11=ON\
-  -DZOLTAN_INCLUDE_DIR="$ZOLTAN_INSTALL_DIR/include" \
-  -DZOLTAN_LIBRARY="$ZOLTAN_INSTALL_DIR/lib/libzoltan.a;$PARMETIS_INSTALL_DIR/lib/libscotch.a;$PARMETIS_INSTALL_DIR/lib/libscotcherr.a;$PARMETIS_INSTALL_DIR/lib/libscotcherrexit.a;$PARMETIS_INSTALL_DIR/lib/libscotchmetis.a;$PARMETIS_INSTALL_DIR/lib/libptscotch.a;$PARMETIS_INSTALL_DIR/lib/libptscotcherr.a;$PARMETIS_INSTALL_DIR/lib/libptscotcherrexit.a;$PARMETIS_INSTALL_DIR/lib/libptscotchparmetis.a" \
-  -DPARMETIS_INCLUDE_DIR="$PARMETIS_INSTALL_DIR/include" \
-  -DPARMETIS_LIBRARY="$PARMETIS_INSTALL_DIR/lib/libparmetis.a" \
-  -DMETIS_INCLUDE_DIR="$PARMETIS_INSTALL_DIR/include" \
-  -DMETIS_LIBRARY="$PARMETIS_INSTALL_DIR/lib/libmetis.a" \
-  -DCMAKE_INSTALL_PREFIX=$PREFIX \
-  -DIS_TESTING=OFF \
-  -DENABLE_ZOLTAN=ON \
-  -DBUILD_EXES=ON \
-  -DCMAKE_BUILD_TYPE=$CMAKETYPE
diff --git a/m3dc1_scorec/config-files/cori-knl-intel-craympich-real-config.h b/m3dc1_scorec/config-files/cori-config.sh
similarity index 50%
rename from m3dc1_scorec/config-files/cori-knl-intel-craympich-real-config.h
rename to m3dc1_scorec/config-files/cori-config.sh
index 2de7ef25a..bb57cb767 100755
--- a/m3dc1_scorec/config-files/cori-knl-intel-craympich-real-config.h
+++ b/m3dc1_scorec/config-files/cori-config.sh
@@ -1,13 +1,25 @@
-#MPIVER=intel2021-intelmpi2021
+# These should be consistent with unstructued/cori.mk,
+# but values there will overwrite these when compiled from M3D-C1 "make scorec"
+PETSC_DIR=${PETSC_DIR:-/global/cfs/cdirs/mp288/jinchen/PETSC/petsc.20220107}
+SCOREC_COMPLEX=${SCOREC_COMPLEX:-OFF}
+if [ $SCOREC_COMPLEX == ON ]
+then
+  PETSC_ARCH=${PETSC_ARCH:-corihsw-PrgEnvintel6010-craympich7719-master-real}
+else
+  PETSC_ARCH=${PETSC_ARCH:-corihsw-PrgEnvintel6010-craympich7719-master-cplx}
+fi
+SCOREC_BASE_DIR=${SCOREC_BASE_DIR:-/global/cfs/cdirs/mp288/jinchen/PETSC/core/upgrade-intel6610-craympich7719-hsw}
+
+# This is different from when compiling with M3D-C1 "make scorec"
+SCOREC_DIR=${SCOREC_DIR:-$SCOREC_BASE_DIR}
+
+# Always defined here
 CMAKETYPE=Release
-PETSC_DIR=/global/cfs/cdirs/mp288/jinchen/PETSC/petsc.20220107
-PETSC_ARCH=coriknl-PrgEnvintel6010-craympich7719-master-real
 PARMETIS_DIR=$PETSC_DIR/$PETSC_ARCH
 ZOLTAN_DIR=$PETSC_DIR/$PETSC_ARCH
-SCOREC_DIR=/global/cfs/cdirs/mp288/jinchen/PETSC/core/upgrade-intel6610-craympich7719-knl
 PREFIX=$SCOREC_DIR
-#add -DPETSCMASTER for petsc 3.8.3 or higher
 
+#add -DPETSCMASTER for petsc 3.8.3 or higher
 cmake .. \
   -DCMAKE_C_COMPILER=cc \
   -DCMAKE_CXX_COMPILER=CC \
@@ -19,12 +31,11 @@ cmake .. \
   -DZOLTAN_LIBRARY="$ZOLTAN_DIR/lib/libzoltan.a" \
   -DPARMETIS_LIBRARY="$PARMETIS_DIR/lib/libparmetis.a" \
   -DMETIS_LIBRARY="$PARMETIS_DIR/lib/libmetis.a" \
-  -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" \
   -DPETSC_INCLUDE_DIR="$PETSC_DIR/$PETSC_ARCH/include" \
   -DPETSC_LIB_DIR="$PETSC_DIR/$PETSC_ARCH/lib" \
   -DENABLE_TESTING=OFF \
-  -DENABLE_COMPLEX=OFF \
+  -DENABLE_COMPLEX=$SCOREC_COMPLEX \
   -DCMAKE_INSTALL_PREFIX="$PREFIX" \
   -DCMAKE_BUILD_TYPE=$CMAKETYPE \
-
diff --git a/m3dc1_scorec/config-files/cori-haswell-intel-craympich-cplx-config.h b/m3dc1_scorec/config-files/cori-haswell-intel-craympich-cplx-config.h
deleted file mode 100755
index c96868e78..000000000
--- a/m3dc1_scorec/config-files/cori-haswell-intel-craympich-cplx-config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#MPIVER=intel2021-intelmpi2021
-CMAKETYPE=Release
-PETSC_DIR=/global/cfs/cdirs/mp288/jinchen/PETSC/petsc.20220107
-PETSC_ARCH=corihsw-PrgEnvintel6010-craympich7719-master-cplx
-PARMETIS_DIR=$PETSC_DIR/$PETSC_ARCH
-ZOLTAN_DIR=$PETSC_DIR/$PETSC_ARCH
-SCOREC_DIR=/global/cfs/cdirs/mp288/jinchen/PETSC/core/upgrade-intel6610-craympich7719-hsw
-PREFIX=$SCOREC_DIR
-#add -DPETSCMASTER for petsc 3.8.3 or higher
-
-cmake .. \
-  -DCMAKE_C_COMPILER=cc \
-  -DCMAKE_CXX_COMPILER=CC \
-  -DCMAKE_Fortran_COMPILER=ftn \
-  -DCMAKE_C_FLAGS=" -g -fPIC -O0 -DPETSCMASTER -I$PETSC_DIR/include" \
-  -DCMAKE_CXX_FLAGS=" -g -fPIC -O0 -DPETSCMASTER -I$PETSC_DIR/include" \
-  -DCMAKE_Fortran_FLAGS="-fPIC "\
-  -DZOLTAN_INCLUDE_DIR="$ZOLTAN_DIR/include" \
-  -DZOLTAN_LIBRARY="$ZOLTAN_DIR/lib/libzoltan.a" \
-  -DPARMETIS_LIBRARY="$PARMETIS_DIR/lib/libparmetis.a" \
-  -DMETIS_LIBRARY="$PARMETIS_DIR/lib/libmetis.a" \
-  -DSCOREC_INCLUDE_DIR="$SCOREC_DIR/include" \
-  -DSCOREC_LIB_DIR="$SCOREC_DIR/lib" \
-  -DPETSC_INCLUDE_DIR="$PETSC_DIR/$PETSC_ARCH/include" \
-  -DPETSC_LIB_DIR="$PETSC_DIR/$PETSC_ARCH/lib" \
-  -DENABLE_TESTING=OFF \
-  -DENABLE_COMPLEX=ON \
-  -DCMAKE_INSTALL_PREFIX="$PREFIX" \
-  -DCMAKE_BUILD_TYPE=$CMAKETYPE \
-
diff --git a/m3dc1_scorec/config-files/cori-knl-intel-craympich-cplx-config.h b/m3dc1_scorec/config-files/cori-knl-intel-craympich-cplx-config.h
deleted file mode 100755
index 59515818b..000000000
--- a/m3dc1_scorec/config-files/cori-knl-intel-craympich-cplx-config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#MPIVER=intel2021-intelmpi2021
-CMAKETYPE=Release
-PETSC_DIR=/global/cfs/cdirs/mp288/jinchen/PETSC/petsc.20220107
-PETSC_ARCH=coriknl-PrgEnvintel6010-craympich7719-master-cplx
-PARMETIS_DIR=$PETSC_DIR/$PETSC_ARCH
-ZOLTAN_DIR=$PETSC_DIR/$PETSC_ARCH
-SCOREC_DIR=/global/cfs/cdirs/mp288/jinchen/PETSC/core/upgrade-intel6610-craympich7719-knl
-PREFIX=$SCOREC_DIR
-#add -DPETSCMASTER for petsc 3.8.3 or higher
-
-cmake .. \
-  -DCMAKE_C_COMPILER=cc \
-  -DCMAKE_CXX_COMPILER=CC \
-  -DCMAKE_Fortran_COMPILER=ftn \
-  -DCMAKE_C_FLAGS=" -g -fPIC -O0 -DPETSCMASTER -I$PETSC_DIR/include" \
-  -DCMAKE_CXX_FLAGS=" -g -fPIC -O0 -DPETSCMASTER -I$PETSC_DIR/include" \
-  -DCMAKE_Fortran_FLAGS="-fPIC "\
-  -DZOLTAN_INCLUDE_DIR="$ZOLTAN_DIR/include" \
-  -DZOLTAN_LIBRARY="$ZOLTAN_DIR/lib/libzoltan.a" \
-  -DPARMETIS_LIBRARY="$PARMETIS_DIR/lib/libparmetis.a" \
-  -DMETIS_LIBRARY="$PARMETIS_DIR/lib/libmetis.a" \
-  -DSCOREC_INCLUDE_DIR="$SCOREC_DIR/include" \
-  -DSCOREC_LIB_DIR="$SCOREC_DIR/lib" \
-  -DPETSC_INCLUDE_DIR="$PETSC_DIR/$PETSC_ARCH/include" \
-  -DPETSC_LIB_DIR="$PETSC_DIR/$PETSC_ARCH/lib" \
-  -DENABLE_TESTING=OFF \
-  -DENABLE_COMPLEX=ON \
-  -DCMAKE_INSTALL_PREFIX="$PREFIX" \
-  -DCMAKE_BUILD_TYPE=$CMAKETYPE \
diff --git a/m3dc1_scorec/config-files/cori-haswell-intel-craympich-real-config.h b/m3dc1_scorec/config-files/cori_knl-config.sh
similarity index 50%
rename from m3dc1_scorec/config-files/cori-haswell-intel-craympich-real-config.h
rename to m3dc1_scorec/config-files/cori_knl-config.sh
index 1463b0b80..f352e886e 100755
--- a/m3dc1_scorec/config-files/cori-haswell-intel-craympich-real-config.h
+++ b/m3dc1_scorec/config-files/cori_knl-config.sh
@@ -1,13 +1,25 @@
-#MPIVER=intel2021-intelmpi2021
+# These should be consistent with unstructued/cori_knl.mk,
+# but values there will overwrite these when compiled from M3D-C1 "make scorec"
+PETSC_DIR=${PETSC_DIR:-/global/cfs/cdirs/mp288/jinchen/PETSC/petsc.20220107}
+SCOREC_COMPLEX=${SCOREC_COMPLEX:-OFF}
+if [ $SCOREC_COMPLEX == ON ]
+then
+  PETSC_ARCH=${PETSC_ARCH:-coriknl-PrgEnvintel6010-craympich7719-master-real}
+else
+  PETSC_ARCH=${PETSC_ARCH:-coriknl-PrgEnvintel6010-craympich7719-master-cplx}
+fi
+SCOREC_BASE_DIR=${SCOREC_BASE_DIR:-/global/cfs/cdirs/mp288/jinchen/PETSC/core/upgrade-intel6610-craympich7719-knl}
+
+# This is different from when compiling with M3D-C1 "make scorec"
+SCOREC_DIR=${SCOREC_DIR:-$SCOREC_BASE_DIR}
+
+# Always defined here
 CMAKETYPE=Release
-PETSC_DIR=/global/cfs/cdirs/mp288/jinchen/PETSC/petsc.20220107
-PETSC_ARCH=corihsw-PrgEnvintel6010-craympich7719-master-real
 PARMETIS_DIR=$PETSC_DIR/$PETSC_ARCH
 ZOLTAN_DIR=$PETSC_DIR/$PETSC_ARCH
-SCOREC_DIR=/global/cfs/cdirs/mp288/jinchen/PETSC/core/upgrade-intel6610-craympich7719-hsw
 PREFIX=$SCOREC_DIR
-#add -DPETSCMASTER for petsc 3.8.3 or higher
 
+#add -DPETSCMASTER for petsc 3.8.3 or higher
 cmake .. \
   -DCMAKE_C_COMPILER=cc \
   -DCMAKE_CXX_COMPILER=CC \
@@ -19,12 +31,11 @@ cmake .. \
   -DZOLTAN_LIBRARY="$ZOLTAN_DIR/lib/libzoltan.a" \
   -DPARMETIS_LIBRARY="$PARMETIS_DIR/lib/libparmetis.a" \
   -DMETIS_LIBRARY="$PARMETIS_DIR/lib/libmetis.a" \
-  -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" \
   -DPETSC_INCLUDE_DIR="$PETSC_DIR/$PETSC_ARCH/include" \
   -DPETSC_LIB_DIR="$PETSC_DIR/$PETSC_ARCH/lib" \
   -DENABLE_TESTING=OFF \
-  -DENABLE_COMPLEX=OFF \
+  -DENABLE_COMPLEX=$SCOREC_COMPLEX \
   -DCMAKE_INSTALL_PREFIX="$PREFIX" \
   -DCMAKE_BUILD_TYPE=$CMAKETYPE \
-
diff --git a/m3dc1_scorec/config-files/eddy-real-config.sh b/m3dc1_scorec/config-files/eddy-real-config.sh
deleted file mode 100755
index 84c879391..000000000
--- a/m3dc1_scorec/config-files/eddy-real-config.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-MPIVER=intel18.0-mpi2018.3.64
-CMAKETYPE=Release
-PETSC_VER=petsc-3.12.0
-PETSCVER=petsc3.12.0
-PETSC_DIR=/home/jinchen/LIB/$PETSC_VER
-PETSC_ARCH=real-eddy-intelmpi-2019
-SCOREC_DIR=/home/jinchen/LIB/scorec/$MPIVER/$PETSCVER
-PARMETIS_DIR=$PETSC_DIR/$PETSC_ARCH
-ZOLTAN_DIR=$SCOREC_DIR
-PREFIX=$SCOREC_DIR
-#module load intel/18.0/64/18.0.3.222 intel-mpi/intel/2018.3/64 
-#add -DPETSCMASTER for petsc 3.8.3 or higher
-
-cmake3 .. \
-  -DCMAKE_C_COMPILER=mpicc \
-  -DCMAKE_CXX_COMPILER=mpicxx \
-  -DCMAKE_Fortran_COMPILER=mpif90 \
-  -DCMAKE_C_FLAGS=" -g -O0 -DPETSCMASTER -I$PETSC_DIR/include" \
-  -DCMAKE_CXX_FLAGS=" -g -O0 -DPETSCMASTER -I$PETSC_DIR/include" \
-  -DCMAKE_Fortran_FLAGS="-fpic "\
-  -DSCOREC_INCLUDE_DIR="$SCOREC_DIR/include" \
-  -DSCOREC_LIB_DIR="$SCOREC_DIR/lib" \
-  -DZOLTAN_LIBRARY="$ZOLTAN_DIR/lib/libzoltan.a" \
-  -DPARMETIS_LIBRARY="$PARMETIS_DIR/lib/libparmetis.a" \
-  -DMETIS_LIBRARY="$PARMETIS_DIR/lib/libmetis.a" \
-  -DPETSC_INCLUDE_DIR="$PETSC_DIR/$PETSC_ARCH/include" \
-  -DPETSC_LIB_DIR="$PETSC_DIR/$PETSC_ARCH/lib" \
-  -DENABLE_PETSC=ON \
-  -DENABLE_COMPLEX=OFF \
-  -DENABLE_TESTING=OFF \
-  -DCMAKE_BUILD_TYPE=$CMAKETYPE \
-  -DCMAKE_INSTALL_PREFIX="$PREFIX"
diff --git a/m3dc1_scorec/config-files/marconi_scorec-config.sh b/m3dc1_scorec/config-files/marconi-config.sh
similarity index 100%
rename from m3dc1_scorec/config-files/marconi_scorec-config.sh
rename to m3dc1_scorec/config-files/marconi-config.sh
diff --git a/m3dc1_scorec/config-files/perseus-amd-real-config.sh b/m3dc1_scorec/config-files/perseus-amd-real-config.sh
deleted file mode 100755
index 1bd07eec9..000000000
--- a/m3dc1_scorec/config-files/perseus-amd-real-config.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-MPIVER=intel18.0-mpi2018.3-amd
-CMAKETYPE=Release
-PETSC_VER=petsc-3.12.4
-PETSCVER=petsc3.12.4
-PETSC_DIR=/home/jinchen/LIB/petsc
-PETSC_ARCH=perseusamd-intelmpi2018-master
-#PETSC_ARCH=perseusamd-intelmpi2018-master-cplx
-# module load intel/18.0/64/18.0.3.222 intel-mpi/intel/2018.3/64
-# module load hdf5/intel-17.0/intel-mpi/1.10.0
-PARMETIS_DIR=$PETSC_DIR/$PETSC_ARCH
-SCOREC_DIR=/projects/M3DC1/scorec/$MPIVER/$PETSCVER
-ZOLTAN_DIR=$SCOREC_DIR
-PREFIX=$SCOREC_DIR
-cmake .. \
-  -DCMAKE_C_COMPILER="mpicc" \
-  -DCMAKE_CXX_COMPILER="mpicxx" \
-  -DCMAKE_Fortran_COMPILER="mpif90" \
-  -DCMAKE_C_FLAGS="-g -O0 -DPETSCMASTER -I$PETSC_DIR/include" \
-  -DCMAKE_CXX_FLAGS="-g -O0 -DPETSCMASTER -I$PETSC_DIR/include" \
-  -DCMAKE_Fortran_FLAGS="-fpic" \
-  -DZOLTAN_LIBRARY="$ZOLTAN_DIR/lib/libzoltan.a" \
-  -DPARMETIS_LIBRARY="$PARMETIS_DIR/lib/libparmetis.a" \
-  -DMETIS_LIBRARY="$PARMETIS_DIR/lib/libmetis.a" \
-  -DSCOREC_INCLUDE_DIR="$SCOREC_DIR/include" \
-  -DSCOREC_LIB_DIR="$SCOREC_DIR/lib" \
-  -DPETSC_INCLUDE_DIR="$PETSC_DIR/$PETSC_ARCH/include" \
-  -DPETSC_LIB_DIR="$PETSC_DIR/$PETSC_ARCH/lib" \
-  -DENABLE_TESTING=OFF \
-  -DENABLE_COMPLEX=OFF \
-  -DCMAKE_INSTALL_PREFIX="$PREFIX" \
-  -DCMAKE_BUILD_TYPE=$CMAKETYPE
diff --git a/m3dc1_scorec/config-files/perseus-complex-config.sh b/m3dc1_scorec/config-files/perseus-complex-config.sh
deleted file mode 100755
index b7c36d165..000000000
--- a/m3dc1_scorec/config-files/perseus-complex-config.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-HOST=perseus
-CMAKETYPE=Release
-MPIVER=intel18.0-mpi2018.3
-PETSC_VER=petsc-3.12.4
-PETSCVER=petsc3.12.4
-PETSC_DIR=/home/jinchen/LIB/petsc
-PETSC_ARCH=perseus-intelmpi2018-master-cplx
-PARMETIS_DIR=$PETSC_DIR/$PETSC_ARCH
-BUILD_ROOT=/projects/M3DC1/scorec/$MPIVER/$PETSCVER
-ZOLTAN_DIR=$BUILD_ROOT
-PREFIX=$BUILD_ROOT
-#add -DPETSCMASTER for petsc 3.8.3 or higher
-cmake3 .. \
-  -DCMAKE_C_COMPILER="mpicc" \
-  -DCMAKE_CXX_COMPILER="mpicxx" \
-  -DCMAKE_Fortran_COMPILER="mpif90" \
-  -DCMAKE_C_FLAGS="-g -O0 -DPETSCMASTER -I$PETSC_DIR/include" \
-  -DCMAKE_CXX_FLAGS="-g -O0 -DPETSCMASTER -I$PETSC_DIR/include" \
-  -DCMAKE_Fortran_FLAGS="-fpic" \
-  -DZOLTAN_LIBRARY="$ZOLTAN_DIR/lib/libzoltan.a" \
-  -DPARMETIS_LIBRARY="$PARMETIS_DIR/lib/libparmetis.a" \
-  -DMETIS_LIBRARY="$PARMETIS_DIR/lib/libmetis.a" \
-  -DSCOREC_INCLUDE_DIR="$BUILD_ROOT/include" \
-  -DSCOREC_LIB_DIR="$BUILD_ROOT/lib" \
-  -DPETSC_INCLUDE_DIR="$PETSC_DIR/$PETSC_ARCH/include" \
-  -DPETSC_LIB_DIR="$PETSC_DIR/$PETSC_ARCH/lib" \
-  -DENABLE_TESTING=OFF \
-  -DENABLE_COMPLEX=ON \
-  -DCMAKE_INSTALL_PREFIX="$PREFIX" \
-  -DCMAKE_BUILD_TYPE=$CMAKETYPE
diff --git a/m3dc1_scorec/config-files/perseus-real-config.sh b/m3dc1_scorec/config-files/perseus-real-config.sh
deleted file mode 100755
index 3b0a59040..000000000
--- a/m3dc1_scorec/config-files/perseus-real-config.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-HOST=perseus
-CMAKETYPE=Release
-MPIVER=intel18.0-mpi2018.3
-PETSC_VER=petsc-3.12.4
-PETSCVER=petsc3.12.4
-PETSC_DIR=/home/jinchen/LIB/petsc
-PETSC_ARCH=real-intelmpi
-PARMETIS_DIR=$PETSC_DIR/$PETSC_ARCH
-BUILD_ROOT=/projects/M3DC1/scorec/$MPIVER/$PETSCVER
-ZOLTAN_DIR=$BUILD_ROOT
-PREFIX=$BUILD_ROOT
-#add -DPETSCMASTER for petsc 3.8.3 or higher
-#module load intel/18.0/64/18.0.3.222  intel-mpi/intel/2018.3/64
-cmake3 .. \
-  -DCMAKE_C_COMPILER="mpicc" \
-  -DCMAKE_CXX_COMPILER="mpicxx" \
-  -DCMAKE_Fortran_COMPILER="mpif90" \
-  -DCMAKE_C_FLAGS="-g -O0 -DPETSCMASTER -I$PETSC_DIR/include" \
-  -DCMAKE_CXX_FLAGS="-g -O0 -DPETSCMASTER -I$PETSC_DIR/include" \
-  -DCMAKE_Fortran_FLAGS="-fpic" \
-  -DZOLTAN_LIBRARY="$ZOLTAN_DIR/lib/libzoltan.a" \
-  -DPARMETIS_LIBRARY="$PARMETIS_DIR/lib/libparmetis.a" \
-  -DMETIS_LIBRARY="$PARMETIS_DIR/lib/libmetis.a" \
-  -DSCOREC_INCLUDE_DIR="$BUILD_ROOT/include" \
-  -DSCOREC_LIB_DIR="$BUILD_ROOT/lib" \
-  -DPETSC_INCLUDE_DIR="$PETSC_DIR/$PETSC_ARCH/include" \
-  -DPETSC_LIB_DIR="$PETSC_DIR/$PETSC_ARCH/lib" \
-  -DENABLE_TESTING=OFF \
-  -DENABLE_COMPLEX=OFF \
-  -DCMAKE_INSTALL_PREFIX="$PREFIX" \
-  -DCMAKE_BUILD_TYPE=$CMAKETYPE
diff --git a/m3dc1_scorec/config-files/portal-openmpi-1.10.3-real-config.sh b/m3dc1_scorec/config-files/portal-openmpi-1.10.3-real-config.sh
deleted file mode 100644
index 9ac592cce..000000000
--- a/m3dc1_scorec/config-files/portal-openmpi-1.10.3-real-config.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-MPIVER=intel2015-openmpi1.10.3-gcc4.4.7
-PETSCVER=petsc3.7.6
-PETSC_VER=petsc-3.7.6
-SWTYPE=release 
-CMAKETYPE=Release
-PETSC_DIR=/p/tsc/m3dc1/lib/SCORECLib/rhel6/$PETSC_VER
-PETSC_ARCH=real-intel2015-openmpi1.10.3-gcc4.4.7
-PARMETIS_DIR=$PETSC_DIR/$PETSC_ARCH
-ZOLTAN_DIR=/p/tsc/m3dc1/lib/SCORECLib/rhel6/$MPIVER
-SCOREC_DIR=$ZOLTAN_DIR/$PETSCVER
-PREFIX=$ZOLTAN_DIR/$PETSCVER
-HDF5_DIR=/usr/pppl/intel/2015-pkgs/openmpi-1.10.3-pkgs/hdf5-parallel-1.8.17
-cmake .. \
-  -DCMAKE_C_COMPILER=mpicc \
-  -DCMAKE_CXX_COMPILER=mpicxx \
-  -DCMAKE_Fortran_COMPILER=mpif90 \
-  -DCMAKE_C_FLAGS=" -g -O2 -I$PETSC_DIR/include" \
-  -DCMAKE_CXX_FLAGS=" -g -O2 -I$PETSC_DIR/include" \
-  -DCMAKE_Fortran_FLAGS="-fpic "\
-  -DSCOREC_INCLUDE_DIR="$SCOREC_DIR/include" \
-  -DSCOREC_LIB_DIR="$SCOREC_DIR/lib" \
-  -DZOLTAN_LIBRARY="$ZOLTAN_DIR/lib/libzoltan.a" \
-  -DPARMETIS_LIBRARY="$PARMETIS_DIR/lib/libparmetis.a" \
-  -DMETIS_LIBRARY="$PARMETIS_DIR/lib/libmetis.a" \
-  -DPETSC_INCLUDE_DIR="$PETSC_DIR/$PETSC_ARCH/include" \
-  -DPETSC_LIB_DIR="$PETSC_DIR/$PETSC_ARCH/lib" \
-  -DHDF5_INCLUDE_DIR="$HDF5_DIR/include" \
-  -DHDF5_LIB_DIR="$HDF5_DIR/lib" \
-  -DENABLE_PETSC=ON \
-  -DCMAKE_INSTALL_PREFIX="$PREFIX" \
-  -DENABLE_COMPLEX=OFF \
-  -DENABLE_TESTING=OFF \
-  -DCMAKE_BUILD_TYPE=$CMAKETYPE
diff --git a/m3dc1_scorec/config-files/portal-openmpi-4.0.3-pumi-config.sh b/m3dc1_scorec/config-files/portal-openmpi-4.0.3-pumi-config.sh
deleted file mode 100755
index 0f18715b5..000000000
--- a/m3dc1_scorec/config-files/portal-openmpi-4.0.3-pumi-config.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-MPIVER=intel2019u3-openmpi4.0.3
-PETSCVER=petsc3.13.5
-PETSC_VER=petsc-3.13.5
-CMAKETYPE=Release
-PETSC_DIR=/p/tsc/m3dc1/lib/SCORECLib/PETSC/$PETSC_VER
-PETSC_ARCH=real-rhel6-intel2019u3-openmpi4.0.3
-PARMETIS_DIR=$PETSC_DIR/$PETSC_ARCH
-ZOLTAN_DIR=$PETSC_DIR/$PETSC_ARCH
-SCOREC_DIR=/p/tsc/m3dc1/lib/SCORECLib/rhel6/$MPIVER/$PETSCVER
-PREFIX=$SCOREC_DIR
-#module load intel/2019.u3 openmpi/4.0.1 gsl szip scalapack
-cmake .. \
-  -DCMAKE_C_COMPILER=mpicc \
-  -DCMAKE_CXX_COMPILER=mpicxx \
-  -DENABLE_ZOLTAN=ON \
-  -DZOLTAN_INCLUDE_DIR="$ZOLTAN_DIR/include" \
-  -DZOLTAN_LIBRARY="$ZOLTAN_DIR/lib/libzoltan.a" \
-  -DPARMETIS_INCLUDE_DIR="$PARMETIS_DIR/include" \
-  -DPARMETIS_LIBRARY="$PARMETIS_DIR/lib/libparmetis.a" \
-  -DMETIS_INCLUDE_DIR="$PARMETIS_DIR/include" \
-  -DMETIS_LIBRARY="$PARMETIS_DIR/lib/libmetis.a" \
-  -DSCOREC_CXX_WARNINGS=OFF \
-  -DSCOREC_CXX_OPTIMIZE=OFF \
-  -DBUILD_EXES=ON \
-  -DIS_TESTING=OFF \
-  -DCMAKE_BUILD_TYPE=$CMAKETYPE \
-  -DCMAKE_INSTALL_PREFIX=$PREFIX
diff --git a/m3dc1_scorec/config-files/portal-openmpi-4.0.3-real-config.sh b/m3dc1_scorec/config-files/portal-openmpi-4.0.3-real-config.sh
deleted file mode 100755
index 7c6f907b3..000000000
--- a/m3dc1_scorec/config-files/portal-openmpi-4.0.3-real-config.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-MPIVER=intel2019u3-openmpi4.0.3
-PETSCVER=petsc3.13.5
-PETSC_VER=petsc-3.13.5
-CMAKETYPE=Release
-PETSC_DIR=/p/tsc/m3dc1/lib/SCORECLib/PETSC/$PETSC_VER
-PETSC_ARCH=real-rhel6-intel2019u3-openmpi4.0.3
-PARMETIS_DIR=$PETSC_DIR/$PETSC_ARCH
-ZOLTAN_DIR=$PETSC_DIR/$PETSC_ARCH
-SCOREC_DIR=/p/tsc/m3dc1/lib/SCORECLib/rhel6/$MPIVER/$PETSCVER
-PREFIX=$SCOREC_DIR
-#module load intel/2019.u3 openmpi/4.0.3 gsl szip scalapack
-cmake .. \
-  -DCMAKE_C_COMPILER=mpicc \
-  -DCMAKE_CXX_COMPILER=mpicxx \
-  -DCMAKE_Fortran_COMPILER=mpif90 \
-  -DCMAKE_C_FLAGS=" -g -O2 -DOLDMA -DPETSCMASTER -I$PETSC_DIR/include" \
-  -DCMAKE_CXX_FLAGS=" -g -O2 -DOLDMA -DPETSCMASTER -I$PETSC_DIR/include" \
-  -DCMAKE_Fortran_FLAGS="-fpic "\
-  -DSCOREC_INCLUDE_DIR="$SCOREC_DIR/include" \
-  -DSCOREC_LIB_DIR="$SCOREC_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" \
-  -DENABLE_PETSC=ON \
-  -DPETSC_INCLUDE_DIR="$PETSC_DIR/$PETSC_ARCH/include" \
-  -DPETSC_LIB_DIR="$PETSC_DIR/$PETSC_ARCH/lib" \
-  -DCMAKE_INSTALL_PREFIX="$PREFIX" \
-  -DENABLE_COMPLEX=OFF \
-  -DENABLE_TESTING=OFF \
-  -DCMAKE_BUILD_TYPE=$CMAKETYPE
diff --git a/m3dc1_scorec/config-files/romulus-pumi-config.sh b/m3dc1_scorec/config-files/romulus-pumi-config.sh
deleted file mode 100755
index 9a4ff46c7..000000000
--- a/m3dc1_scorec/config-files/romulus-pumi-config.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-PETSC_DIR=/lore/seol/petsc-3.13.5
-PETSC_ARCH=real-gcc4.8.5-v5m6xwi-mpich3.2.1-geowaxe
-PARMETIS_INSTALL_DIR=$PETSC_DIR/$PETSC_ARCH
-ZOLTAN_INSTALL_DIR=$PETSC_DIR/$PETSC_ARCH
-PREFIX=/lore/seol/rhel7-gcc4.8.5-v5m6xwi-mpich3.2.1-geowaxe
-#module load gcc/4.8.5-v5m6xwi mpich/3.2.1-geowaxe cmake
-#module unload zlib/1.2.11-vhzh5cf
-cmake .. \
-  -DCMAKE_C_COMPILER=mpicc \
-  -DCMAKE_CXX_COMPILER=mpicxx \
-  -DCMAKE_C_FLAGS=" -g -O0" \
-  -DCMAKE_CXX_FLAGS=" -g -O0" \
-  -DENABLE_ZOLTAN=ON \
-  -DZOLTAN_INCLUDE_DIR="$ZOLTAN_INSTALL_DIR/include" \
-  -DZOLTAN_LIBRARY="$ZOLTAN_INSTALL_DIR/lib/libzoltan.a" \
-  -DMETIS_INCLUDE_DIR="$PARMETIS_INSTALL_DIR/include" \
-  -DMETIS_LIBRARY="$PARMETIS_INSTALL_DIR/lib/libmetis.a" \
-  -DPARMETIS_INCLUDE_DIR="$PARMETIS_INSTALL_DIR/include" \
-  -DPARMETIS_LIBRARY="$PARMETIS_INSTALL_DIR/lib/libparmetis.a" \
-  -DENABLE_SIMMETRIX=OFF \
-  -DCMAKE_INSTALL_PREFIX=$PREFIX \
-  -DSCOREC_CXX_WARNINGS=OFF \
-  -DSCOREC_CXX_OPTIMIZE=OFF \
-  -DUSE_XSDK_DEFAULTS=OFF \
-  -DSCOREC_ENABLE_CXX11=ON \
-  -DBUILD_EXES=ON \
-  -DIS_TESTING=OFF \
-  -DCMAKE_BUILD_TYPE=Debug
diff --git a/m3dc1_scorec/config-files/romulus-real-config.sh b/m3dc1_scorec/config-files/romulus-real-config.sh
deleted file mode 100755
index 59d570381..000000000
--- a/m3dc1_scorec/config-files/romulus-real-config.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-PETSC_DIR=/lore/seol/petsc-3.13.5
-PETSC_ARCH=real-gcc4.8.5-v5m6xwi-mpich3.2.1-geowaxe
-PARMETIS_INSTALL_DIR=$PETSC_DIR/$PETSC_ARCH
-ZOLTAN_INSTALL_DIR=$PETSC_DIR/$PETSC_ARCH
-PREFIX=/lore/seol/rhel7-gcc4.8.5-v5m6xwi-mpich3.2.1-geowaxe
-#module load gcc/4.8.5-v5m6xwi mpich/3.2.1-geowaxe cmake gsl/2.5-px4dg7h
-#module unload zlib/1.2.11-vhzh5cf
-#add -DPETSCMASTER for petsc 3.8.3 or higher
-cmake .. \
-  -DCMAKE_C_COMPILER=mpicc \
-  -DCMAKE_CXX_COMPILER=mpicxx \
-  -DCMAKE_Fortran_COMPILER=mpif90 \
-  -DCMAKE_C_FLAGS=" -g -O0 -DPETSCMASTER -I$PETSC_DIR/include" \
-  -DCMAKE_CXX_FLAGS=" -g -O0 -DPETSCMASTER -I$PETSC_DIR/include" \
-  -DCMAKE_Fortran_FLAGS="-fpic "\
-  -DSCOREC_INCLUDE_DIR=$PREFIX/include \
-  -DSCOREC_LIB_DIR=$PREFIX/lib \
-  -DZOLTAN_LIBRARY="$ZOLTAN_INSTALL_DIR/lib/libzoltan.a" \
-  -DPARMETIS_LIBRARY="$PARMETIS_INSTALL_DIR/lib/libparmetis.a" \
-  -DMETIS_LIBRARY="$PARMETIS_INSTALL_DIR/lib/libmetis.a" \
-  -DENABLE_PETSC=ON \
-  -DPETSC_INCLUDE_DIR="$PETSC_DIR/$PETSC_ARCH/include" \
-  -DPETSC_LIB_DIR="$PETSC_DIR/$PETSC_ARCH/lib" \
-  -DENABLE_COMPLEX=OFF \
-  -DCMAKE_BUILD_TYPE=Debug \
-  -DCMAKE_INSTALL_PREFIX=$PREFIX
diff --git a/m3dc1_scorec/config-files/sdumont-core-config.sh b/m3dc1_scorec/config-files/sdumont-core-config.sh
deleted file mode 100755
index 0e737e472..000000000
--- a/m3dc1_scorec/config-files/sdumont-core-config.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#export RLM_LICENSE=sdumont12@2800
-#export LD_LIBRARY_PATH=/scratch/ntm/software/Simmetrix/extra-libs:$LD_LIBRARY_PATH
-#source /scratch/app/modulos/intel-psxe-2019.sh
-#module load openmpi/icc/4.0.4
-SWTYPE=debug
-CMAKETYPE=Debug
-PETSCVER=3.9.4
-MPIVER=intel-psxe2019-openmpiicc4.0.4
-PETSC_DIR=/scratch/ntm/software/petsc/petsc-$PETSCVER
-PETSC_ARCH=real-$MPIVER
-SCOREC_DIR=/scratch/ntm/software/scorec/$MPIVER
-PARMETIS_DIR=$PETSC_DIR/$PETSC_ARCH
-ZOLTAN_DIR=$PETSC_DIR/$PETSC_ARCH
-SIM_VER=12.0-181027
-SIM_DIR=/scratch/ntm/software/Simmetrix/$SIMVER
-#/scratch/ntm/software/Simmetrix/12.0-181027
-SIM_ARCHOS=x64_rhel6_gcc44
-PREFIX=$SCOREC_DIR/petsc$PETSCVER
-#PREFIX=$SCOREC_DIR/sim$SIM_VER
-cmake .. \
-  -DCMAKE_C_COMPILER=mpicc \
-  -DCMAKE_CXX_COMPILER=mpicxx \
-  -DCMAKE_C_FLAGS="-ftz -fPIC -O" \
-  -DCMAKE_CXX_FLAGS="-shared-intel -ftz -fPIC -O" \
-  -DZOLTAN_INCLUDE_DIR="$ZOLTAN_DIR/include" \
-  -DZOLTAN_LIBRARY="$ZOLTAN_DIR/lib/libzoltan.a" \
-  -DPARMETIS_INCLUDE_DIR="$PARMETIS_DIR/include" \
-  -DPARMETIS_LIBRARY="$PARMETIS_DIR/lib/libparmetis.a" \
-  -DMETIS_INCLUDE_DIR="$PARMETIS_DIR/include" \
-  -DMETIS_LIBRARY="$PARMETIS_DIR/lib/libmetis.a" \
-  -DBUILD_EXES=ON \
-  -DIS_TESTING=OFF \
-  -DENABLE_ZOLTAN=ON \
-  -DENABLE_SIMMETRIX=OFF \
-  -DSIMMETRIX_INCLUDE_DIR=$SIM_DIR/include \
-  -DSIMMETRIX_LIB_DIR=$SIM_DIR/lib/$SIM_ARCHOS \
-  -DCMAKE_INSTALL_PREFIX=$PREFIX \
-  -DCMAKE_BUILD_TYPE=$CMAKETYPE
diff --git a/m3dc1_scorec/config-files/sdumont-real-config.sh b/m3dc1_scorec/config-files/sdumont-real-config.sh
deleted file mode 100755
index 401e6fab6..000000000
--- a/m3dc1_scorec/config-files/sdumont-real-config.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#export RLM_LICENSE=sdumont12@2800
-#export LD_LIBRARY_PATH=/scratch/ntm/software/Simmetrix/extra-libs:$LD_LIBRARY_PATH
-#source /scratch/app/modulos/intel-psxe-2019.sh
-#module load openmpi/icc/4.0.4 cmake git intel_psxe/2019
-SWTYPE=debug
-CMAKETYPE=Debug
-PETSCVER=3.9.4
-MPIVER=intel-psxe2019-openmpiicc4.0.4
-PETSC_DIR=/scratch/ntm/software/petsc/petsc-$PETSCVER
-PETSC_ARCH=cplx-$MPIVER
-PREFIX=/scratch/ntm/software/scorec/$MPIVER/petsc$PETSCVER
-PARMETIS_DIR=$PETSC_ARCH/$PETSC_VER
-ZOLTAN_DIR=$PETSC_ARCH/$PETSC_VER
-
-HDF5_DIR=$PETSC_DIR/$PETSC_ARCH
-cmake .. \
-  -DCMAKE_C_COMPILER=mpicc \
-  -DCMAKE_CXX_COMPILER=mpicxx \
-  -DCMAKE_Fortran_COMPILER=mpif90 \
-  -DCMAKE_C_FLAGS=" -ftz -fPIC -O -DPETSCMASTER -I$PETSC_DIR/include" \
-  -DCMAKE_CXX_FLAGS=" -shared-intel -ftz -fPIC -O -DPETSCMASTER -I$PETSC_DIR/include" \
-  -DCMAKE_Fortran_FLAGS="-assume no2underscores -ftz -fPIC -O" \
-  -DSCOREC_INCLUDE_DIR="$PREFIX/include" \
-  -DSCOREC_LIB_DIR="$PREFIX/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 \
-  -DENABLE_TRILINOS=OFF \
-  -DCMAKE_INSTALL_PREFIX="$PREFIX" \
-  -DENABLE_COMPLEX=ON \
-  -DENABLE_TESTING=OFF \
-  -DCMAKE_BUILD_TYPE=$CMAKETYPE
diff --git a/m3dc1_scorec/config-files/stellar-config.sh b/m3dc1_scorec/config-files/stellar-config.sh
new file mode 100755
index 000000000..45d809c1f
--- /dev/null
+++ b/m3dc1_scorec/config-files/stellar-config.sh
@@ -0,0 +1,42 @@
+# These should be consistent with unstructued/stellar.mk,
+# but values there will overwrite these when compiled from M3D-C1 "make scorec"
+MPIVER=${MPIVER:-intel2021.1.2-intelmpi2021.3.1}
+PETSC_VER=${PETSC_VER:-petsc-3.15.5}
+PETSCVER=${PETSCVER:-petsc3.15.5}
+PETSC_DIR=${PETSC_DIR:-/projects/M3DC1/PETSC/$PETSC_VER}
+SCOREC_COMPLEX=${SCOREC_COMPLEX:-OFF}
+if [ $SCOREC_COMPLEX == ON ]
+then
+  PETSC_ARCH=${PETSC_ARCH:-cplx-$MPIVER}
+else
+  PETSC_ARCH=${PETSC_ARCH:-real-$MPIVER}
+fi
+SCOREC_BASE_DIR=${SCOREC_BASE_DIR:-/projects/M3DC1/scorec/$MPIVER/$PETSCVER/202209}
+
+# This is different from when compiling with M3D-C1 "make scorec"
+SCOREC_DIR=${SCOREC_DIR:-$SCORE_BASE_DIR}
+
+# Always defined here
+CMAKETYPE=Release
+PARMETIS_DIR=$PETSC_DIR/$PETSC_ARCH
+ZOLTAN_DIR=$PETSC_DIR/$PETSC_ARCH
+PREFIX=$SCOREC_DIR
+
+cmake3 .. \
+  -DCMAKE_C_COMPILER="mpiicc" \
+  -DCMAKE_CXX_COMPILER="mpiicpc" \
+  -DCMAKE_Fortran_COMPILER="mpiifort" \
+  -DCMAKE_C_FLAGS="-g -O0 -DPETSCMASTER -I$PETSC_DIR/include" \
+  -DCMAKE_CXX_FLAGS="-g -O0 -DPETSCMASTER -I$PETSC_DIR/include" \
+  -DCMAKE_Fortran_FLAGS="-fpic" \
+  -DZOLTAN_LIBRARY="$ZOLTAN_DIR/lib/libzoltan.a" \
+  -DPARMETIS_LIBRARY="$PARMETIS_DIR/lib/libparmetis.a" \
+  -DMETIS_LIBRARY="$PARMETIS_DIR/lib/libmetis.a" \
+  -DSCOREC_INCLUDE_DIR="$SCOREC_BASE_DIR/include" \
+  -DSCOREC_LIB_DIR="$SCOREC_BASE_DIR/lib" \
+  -DPETSC_INCLUDE_DIR="$PETSC_DIR/$PETSC_ARCH/include" \
+  -DPETSC_LIB_DIR="$PETSC_DIR/$PETSC_ARCH/lib" \
+  -DENABLE_TESTING=OFF \
+  -DENABLE_COMPLEX=$SCOREC_COMPLEX \
+  -DCMAKE_INSTALL_PREFIX="$PREFIX" \
+  -DCMAKE_BUILD_TYPE=$CMAKETYPE
diff --git a/m3dc1_scorec/config-files/stellar-intelmpi-real-config.sh b/m3dc1_scorec/config-files/stellar-intelmpi-real-config.sh
deleted file mode 100755
index e200d5994..000000000
--- a/m3dc1_scorec/config-files/stellar-intelmpi-real-config.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-HOST=stellar
-CMAKETYPE=Release
-MPIVER=intel2021.1.2-intelmpi2021.3.1
-PETSC_VER=petsc-3.15.5
-PETSCVER=petsc3.15.5
-PETSC_DIR=/projects/M3DC1/PETSC/$PETSC_VER
-PETSC_ARCH=real-$MPIVER
-PARMETIS_DIR=$PETSC_DIR/$PETSC_ARCH
-BUILD_ROOT=/projects/M3DC1/scorec/$MPIVER/$PETSCVER
-ZOLTAN_DIR=$PETSC_DIR/$PETSC_ARCH
-PREFIX=$BUILD_ROOT
-#add -DPETSCMASTER for petsc 3.8.3 or higher
-# module load cmake/3.19.7 intel/2021.1.2 intel-mpi/intel/2021.3.1
-cmake3 .. \
-  -DCMAKE_C_COMPILER="mpiicc" \
-  -DCMAKE_CXX_COMPILER="mpiicpc" \
-  -DCMAKE_Fortran_COMPILER="mpiifort" \
-  -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" \
-  -DZOLTAN_LIBRARY="$ZOLTAN_DIR/lib/libzoltan.a" \
-  -DPARMETIS_LIBRARY="$PARMETIS_DIR/lib/libparmetis.a" \
-  -DMETIS_LIBRARY="$PARMETIS_DIR/lib/libmetis.a" \
-  -DSCOREC_INCLUDE_DIR="$BUILD_ROOT/include" \
-  -DSCOREC_LIB_DIR="$BUILD_ROOT/lib" \
-  -DPETSC_INCLUDE_DIR="$PETSC_DIR/$PETSC_ARCH/include" \
-  -DPETSC_LIB_DIR="$PETSC_DIR/$PETSC_ARCH/lib" \
-  -DENABLE_TESTING=OFF \
-  -DENABLE_COMPLEX=OFF \
-  -DCMAKE_INSTALL_PREFIX="$PREFIX" \
-  -DCMAKE_BUILD_TYPE=$CMAKETYPE
diff --git a/m3dc1_scorec/config-files/stellar-openmpi-real-config.sh b/m3dc1_scorec/config-files/stellar-openmpi-real-config.sh
deleted file mode 100755
index 6d0502b00..000000000
--- a/m3dc1_scorec/config-files/stellar-openmpi-real-config.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-HOST=stellar
-CMAKETYPE=Release
-MPIVER=intel2021.1.2-openmpi4.1.0
-PETSC_VER=petsc-3.13.5
-PETSCVER=petsc3.13.5
-PETSC_DIR=/projects/M3DC1/PETSC/$PETSC_VER
-PETSC_ARCH=real-$MPIVER
-PARMETIS_DIR=$PETSC_DIR/$PETSC_ARCH
-ZOLTAN_DIR=$PETSC_DIR/$PETSC_ARCH
-BUILD_ROOT=/projects/M3DC1/scorec/$MPIVER/$PETSCVER
-PREFIX=$BUILD_ROOT
-#add -DPETSCMASTER for petsc 3.8.3 or higher
-# module load intel/2021.1.2 openmpi/intel-2021.1/4.1.0
-cmake .. \
-  -DCMAKE_C_COMPILER=/usr/local/openmpi/4.1.0/intel20211/bin/mpicc \
-  -DCMAKE_CXX_COMPILER=/usr/local/openmpi/4.1.0/intel20211/bin/mpicxx \
-  -DCMAKE_Fortran_COMPILER=/usr/local/openmpi/4.1.0/intel20211/bin/mpif90 \
-  -DCMAKE_C_FLAGS="-g -O0 -DPETSCMASTER -I$PETSC_DIR/include" \
-  -DCMAKE_CXX_FLAGS="-g -O0 -DPETSCMASTER -I$PETSC_DIR/include" \
-  -DCMAKE_Fortran_FLAGS="-fpic" \
-  -DZOLTAN_LIBRARY="$ZOLTAN_DIR/lib/libzoltan.a" \
-  -DPARMETIS_LIBRARY="$PARMETIS_DIR/lib/libparmetis.a" \
-  -DMETIS_LIBRARY="$PARMETIS_DIR/lib/libmetis.a" \
-  -DSCOREC_INCLUDE_DIR="$BUILD_ROOT/include" \
-  -DSCOREC_LIB_DIR="$BUILD_ROOT/lib" \
-  -DPETSC_INCLUDE_DIR="$PETSC_DIR/$PETSC_ARCH/include" \
-  -DPETSC_LIB_DIR="$PETSC_DIR/$PETSC_ARCH/lib" \
-  -DENABLE_TESTING=OFF \
-  -DENABLE_COMPLEX=OFF \
-  -DCMAKE_INSTALL_PREFIX="$PREFIX" \
-  -DCMAKE_BUILD_TYPE=$CMAKETYPE
diff --git a/m3dc1_scorec/config-files/sunfire-meshgen-config.sh b/m3dc1_scorec/config-files/sunfire-meshgen-config.sh
deleted file mode 100755
index 475e242cf..000000000
--- a/m3dc1_scorec/config-files/sunfire-meshgen-config.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-cmake .. \
-  -DCMAKE_C_COMPILER="/usr/pppl/intel/2015-pkgs/openmpi-1.8.4/bin/mpicc" \
-  -DCMAKE_CXX_COMPILER="/usr/pppl/intel/2015-pkgs/openmpi-1.8.4/bin/mpicxx" \
-  -DCMAKE_Fortran_COMPILER="/usr/pppl/intel/2015-pkgs/openmpi-1.8.4/bin/mpif90" \
-  -DCMAKE_C_FLAGS=" -g -O2 -DDEBUG" \
-  -DCMAKE_CXX_FLAGS=" -g -O2 -DDEBUG" \
-  -DCMAKE_Fortran_FLAGS="-fpic "\
-  -DSCOREC_INCLUDE_DIR="/p/tsc/m3dc1/lib/SCORECLib/sunfire/Apr2015-jin/include" \
-  -DSCOREC_LIB_DIR="/p/tsc/m3dc1/lib/SCORECLib/sunfire/Apr2015-jin/lib" \
-  -DZOLTAN_INCLUDE_DIR="/p/tsc/m3dc1/lib/SCORECLib/sunfire/Apr2015-jin/include" \
-  -DZOLTAN_LIBRARY="/p/tsc/m3dc1/lib/SCORECLib/sunfire/Apr2015-jin/lib/libzoltan.a" \
-  -DPARMETIS_INCLUDE_DIR="/p/swim/jchen/PETSC/petsc-3.5.3/portalr6-intel-openmpi-1.8.4/include" \
-  -DPARMETIS_LIBRARY="/p/swim/jchen/PETSC/petsc-3.5.3/portalr6-intel-openmpi-1.8.4/lib/libparmetis.a" \
-  -DMETIS_LIBRARY="/p/swim/jchen/PETSC/petsc-3.5.3/portalr6-intel-openmpi-1.8.4/lib/libmetis.a" \
-  -DLAPACK_LIB_DIR="/p/tsc/m3dc1/lib/SCORECLib/sunfire/utilities/create_mesh/lib" \
-  -DCMAKE_INSTALL_PREFIX="/p/tsc/m3dc1/lib/SCORECLib/sunfire/utilities/create_mesh" \
-  -DENABLE_COMPLEX=OFF \
-  -DENABLE_MESHGEN=ON \
-  -DSIMMETRIX_INCLUDE_DIR=/usr/pppl/Simmetrix/9.0-150404/include \
-  -DSIMMETRIX_LIB_DIR=/usr/pppl/Simmetrix/9.0-150404/lib/x64_rhel5_gcc41 \
-  -DENABLE_TESTING=OFF \
-  -DCMAKE_BUILD_TYPE=Debug
-
diff --git a/m3dc1_scorec/config-files/traverse-pgi-real-config.sh b/m3dc1_scorec/config-files/traverse-config.sh
similarity index 100%
rename from m3dc1_scorec/config-files/traverse-pgi-real-config.sh
rename to m3dc1_scorec/config-files/traverse-config.sh
diff --git a/m3dc1_scorec/config-files/trilinos-edison-real-config.sh b/m3dc1_scorec/config-files/trilinos-edison-real-config.sh
deleted file mode 100755
index 1911bd2a3..000000000
--- a/m3dc1_scorec/config-files/trilinos-edison-real-config.sh
+++ /dev/null
@@ -1,157 +0,0 @@
-# Modify these paths for your system.
-setenv MPIHOME /opt/cray/mpt/7.2.1/gni/mpich2-intel/140
-setenv BLAS_DIR /usr/common/usg/gsl/1.16/intel
-setenv NETCDF_DIR /opt/cray/netcdf-hdf5parallel/4.3.3.1/INTEL/140
-#/opt/cray/netcdf/4.3.3.1/INTEL/140
-setenv HDF5_DIR /opt/cray/hdf5-parallel/1.8.14/INTEL/140
-setenv BOOST_DIR /usr/common/usg/boost/1.54/intel
-setenv TPSL_DIR /global/project/projectdirs/mp288/edison/petsc-3.5.4-real/cray-mpich-7.2 
-setenv MKL_DIR /opt/intel/composer_xe_2013.5.192/mkl
-setenv PNETCDF_DIR /opt/cray/parallel-netcdf/1.6.0/INTEL/14.0
-
-#/global/project/projectdirs/mp288/edison/cmake-3.3.2/bin/cmake \
-cmake \
-\
- -D Trilinos_DISABLE_ENABLED_FORWARD_DEP_PACKAGES=ON \
- -D CMAKE_INSTALL_PREFIX:PATH="/global/project/projectdirs/mp288/edison/trilinos-12.2.1/real-install" \
- -D CMAKE_BUILD_TYPE:STRING=DEBUG \
- -D TPL_ENABLE_MPI:BOOL=ON \
- -D MPI_BASE_DIR:PATH=$MPIHOME \
- -D CMAKE_C_COMPILER:STRING="/opt/cray/craype/2.2.1/bin/cc" \
- -D CMAKE_CXX_COMPILER:STRING="/opt/cray/craype/2.2.1/bin/CC" \
- -D CMAKE_Fortran_COMPILER:STRING="/opt/cray/craype/2.2.1/bin/ftn" \
- -D CMAKE_C_FLAGS:STRING="-O3 -g " \
- -D CMAKE_CXX_FLAGS:STRING="-O3 -g " \
- -D Trilinos_ENABLE_CXX11:BOOL=ON \
- -D Trilinos_CXX11_FLAGS:STRING="-std=c++11" \
- -D CMAKE_ENABLE_Fortran:BOOL=ON \
- -D CMAKE_Fortran_FLAGS:STRING="-O3 -g -fpic" \
- -D CMAKE_VERBOSE_MAKEFILE:BOOL=OFF \
- -D BUILD_SHARED_LIBS:BOOL=OFF \
- -D TPL_FIND_SHARED_LIBS:BOOL=ON \
- -D Trilinos_LINK_SEARCH_START_STATIC:BOOL=ON \
-# -D Trilinos_EXTRA_LINK_FLAGS:STRING="-ldl" \
-# -D CMAKE_FIND_LIBRARY_SUFFIXES:STRING=".a" \
-# -D CMAKE_EXE_LINKER_FLAGS:STRING="-static -static-libgcc -static-libstdc++" \
-\
- -D Trilinos_ENABLE_SECONDARY_TESTED_CODE:BOOL=OFF \
-\
- -D Trilinos_ENABLE_ALL_PACKAGES:BOOL=OFF \
- -D Trilinos_ENABLE_TESTS:BOOL=OFF \
- -D Trilinos_ENABLE_Gtest:BOOL=OFF \
- -D Trilinos_WARNINGS_AS_ERRORS_FLAGS:STRING="" \
- -D Trilinos_ENABLE_Teuchos:BOOL=ON \
- -D Trilinos_ENABLE_Shards:BOOL=ON \
- -D Trilinos_ENABLE_Sacado:BOOL=ON \
- -D Trilinos_ENABLE_Epetra:BOOL=ON \
- -D Trilinos_ENABLE_EpetraExt:BOOL=ON \
- -D Trilinos_ENABLE_Ifpack:BOOL=ON \
- -D Trilinos_ENABLE_AztecOO:BOOL=ON \
- -D Trilinos_ENABLE_Amesos:BOOL=ON \
- -D Trilinos_ENABLE_Anasazi:BOOL=ON \
- -D Trilinos_ENABLE_Belos:BOOL=ON \
- -D Trilinos_ENABLE_ML:BOOL=ON \
- -D Trilinos_ENABLE_Phalanx:BOOL=ON \
- -D Trilinos_ENABLE_Intrepid:BOOL=ON \
- -D Trilinos_ENABLE_NOX:BOOL=ON \
- -D Trilinos_ENABLE_Stratimikos:BOOL=ON \
- -D Trilinos_ENABLE_Thyra:BOOL=ON \
- -D Trilinos_ENABLE_Rythmos:BOOL=ON \
- -D Trilinos_ENABLE_MOOCHO:BOOL=ON \
- -D Trilinos_ENABLE_Stokhos:BOOL=ON \
- -D Trilinos_ENABLE_Piro:BOOL=ON \
- -D Trilinos_ENABLE_Teko:BOOL=ON \
-\
- -D Trilinos_ENABLE_STKIO:BOOL=ON \
- -D Trilinos_ENABLE_STKMesh:BOOL=ON \
- -D TPL_ENABLE_Boost:BOOL=ON \
- -D Boost_INCLUDE_DIRS:FILEPATH="$BOOST_DIR/include" \
- -D Boost_LIBRARY_DIRS:FILEPATH="$BOOST_DIR/lib" \
- -D TPL_ENABLE_BoostLib:BOOL=ON \
- -D BoostLib_INCLUDE_DIRS:FILEPATH="$BOOST_DIR/include" \
- -D BoostLib_LIBRARY_DIRS:FILEPATH="$BOOST_DIR/lib" \
-\
- -D Trilinos_ENABLE_SEACAS:BOOL=ON \
- -D TPL_ENABLE_X11:BOOL=OFF \
- -D TPL_ENABLE_Matio:BOOL=OFF \
- -D Trilinos_ENABLE_SEACASIoss:BOOL=ON \
- -D Trilinos_ENABLE_SEACASExodus:BOOL=ON \
- -D TPL_ENABLE_Netcdf:BOOL=ON \
- -D Netcdf_INCLUDE_DIRS:PATH="$NETCDF_DIR/include" \
- -D Netcdf_LIBRARY_DIRS:PATH="$NETCDF_DIR/lib" \
- -D TPL_Netcdf_LIBRARIES:FILEPATH="$NETCDF_DIR/lib/libnetcdf.a" \
- -D TPL_ENABLE_Pnetcdf:BOOL=ON \
- -D Pnetcdf_INCLUDE_DIRS:PATH="$PNETCDF_DIR/include" \
- -D Pnetcdf_LIBRARY_DIRS:PATH="$PNETCDF_DIR/lib" \
- -D TPL_ENABLE_HDF5:BOOL=ON \
- -D HDF5_INCLUDE_DIRS:PATH="$HDF5_DIR/include" \
- -D HDF5_LIBRARY_DIRS:PATH="$HDF5_DIR/lib" \
- -D TPL_HDF5_LIBRARIES:FILEPATH="$HDF5_DIR/lib/libhdf5.a" \
-\
- -D Trilinos_ENABLE_Tpetra:BOOL=ON \
- -D Trilinos_ENABLE_Kokkos:BOOL=ON \
- -D HAVE_INTREPID_KOKKOSCORE:BOOL=ON \
- -D Trilinos_ENABLE_Ifpack2:BOOL=ON \
- -D Trilinos_ENABLE_Amesos2:BOOL=ON \
- -D Trilinos_ENABLE_Zoltan2:BOOL=ON \
- -D Trilinos_ENABLE_MueLu:BOOL=ON \
- -D Amesos2_ENABLE_KLU2:BOOL=ON \
- -D Amesos2_ENABLE_MUMPS:BOOL=ON \
- -D Amesos2_ENABLE_SuperLU:BOOL=ON \
- -D Amesos2_ENABLE_SuperLUDist:BOOL=ON \
-\
- -D TPL_ENABLE_MKL:BOOL=ON \
- -D MKL_INCLUDE_DIRS:PATH="$MKL_DIR/include" \
- -D MKL_LIBRARY_DIRS:PATH="$MKL_DIR/lib/intel64" \
- -D MKL_LIBRARY_NAMES:STRING="mkl_intel_lp64" \
- -D TPL_ENABLE_LAPACK:BOOL=ON \
- -D LAPACK_INCLUDE_DIRS:PATH="$MKL_DIR/include" \
- -D LAPACK_LIBRARY_DIRS:PATH="$MKL_DIR/lib/intel64" \
- -D LAPACK_LIBRARY_NAMES:STRING="mkl_lapack95_lp64" \
- -D TPL_ENABLE_BLAS:BOOL=ON \
- -D BLAS_INCLUDE_DIRS:PATH="$MKL_DIR/include" \
- -D BLAS_LIBRARY_DIRS:PATH="$MKL_DIR/lib/intel64" \
- -D BLAS_LIBRARY_NAMES:STRING="mkl_blas95_lp64" \
- -D TPL_ENABLE_HYPRE:STRING=OFF \
- -D HYPRE_INCLUDE_DIRS:PATH="$TPSL_DIR/include" \
- -D HYPRE_LIBRARY_DIRS:PATH="$TPSL_DIR/lib" \
- -D TPL_ENABLE_SuperLU:STRING=OFF \
- -D SuperLU_INCLUDE_DIRS:PATH="$TPSL_DIR/include" \
- -D SuperLU_LIBRARY_DIRS:PATH="$TPSL_DIR/lib" \
- -D SuperLU_LIBRARY_NAMES:STRING="superlu_4.3" \
- -D TPL_ENABLE_SuperLUDist:BOOL=OFF \
- -D SuperLUDist_INCLUDE_DIRS:PATH="$TPSL_DIR/include" \
- -D SuperLUDist_LIBRARY_DIRS:PATH="$TPSL_DIR/lib" \
- -D SuperLUDist_LIBRARY_NAMES:STRING="superlu_dist_3.3" \
- -D TPL_ENABLE_MUMPS:BOOL=ON \
- -D MUMPS_INCLUDE_DIRS:PATH="$TPSL_DIR/include" \
- -D MUMPS_LIBRARY_DIRS:PATH="$TPSL_DIR/lib" \
-\
- -D Trilinos_ENABLE_SCOREC:BOOL=ON \
- -D PCU_COMPRESS:BOOL=ON \
- -D SCOREC_DISABLE_STRONG_WARNINGS:BOOL=ON \
- -D Trilinos_ENABLE_EXPORT_MAKEFILES:BOOL=OFF \
- -D Trilinos_ASSERT_MISSING_PACKAGES:BOOL=OFF \
-\
- -D TPL_ENABLE_ParMETIS:STRING=ON \
- -D ParMETIS_INCLUDE_DIRS:PATH="$TPSL_DIR/include" \
- -D ParMETIS_LIBRARY_DIRS:PATH="$TPSL_DIR/lib" \
- -D TPL_ParMETIS_LIBRARIES:FILEPATH="$TPSL_DIR/lib/libparmetis.a" \
- -D TPL_ENABLE_METIS:STRING=ON \
- -D METIS_INCLUDE_DIRS:PATH="$TPSL_DIR/include" \
- -D METIS_LIBRARY_DIRS:PATH="$TPSL_DIR/lib" \
- -D TPL_METIS_LIBRARIES:FILEPATH="$TPSL_DIR/lib/libmetis.a" \
- -D Zoltan_ENABLE_ULLONG_IDS:BOOL=OFF \
- -D Teuchos_ENABLE_LONG_LONG_INT:BOOL=OFF \
-\
- -D Trilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON \
- -D Tpetra_INST_FLOAT=OFF \
- -D Tpetra_INST_INT_INT=ON \
- -D Tpetra_INST_DOUBLE=ON \
- -D Tpetra_INST_COMPLEX_FLOAT=OFF \
- -D Tpetra_INST_COMPLEX_DOUBLE=OFF \
- -D Tpetra_INST_INT_LONG=OFF \
- -D Tpetra_INST_INT_UNSIGNED=OFF \
- -D Tpetra_INST_INT_LONG_LONG=OFF \
-\
-../
diff --git a/m3dc1_scorec/config-files/trilinos-portalr6-real-config.sh b/m3dc1_scorec/config-files/trilinos-portalr6-real-config.sh
deleted file mode 100755
index fe0cbdf6e..000000000
--- a/m3dc1_scorec/config-files/trilinos-portalr6-real-config.sh
+++ /dev/null
@@ -1,146 +0,0 @@
-# Modify these paths for your system.
-setenv MPIHOME /usr/pppl/intel/2015-pkgs/openmpi-1.8.4
-setenv PETSC_DIR /p/swim/jchen/PETSC/petsc-3.5.3
-setenv PETSC_ARCH portalr6-intel-openmpi-1.8.4
-setenv BOOST_DIR /usr/pppl/boost/1.52.0
-setenv HDF5_HOME /usr/pppl/intel/2015-pkgs/openmpi-1.8-pkgs/hdf5-1.8.14-parallel
-setenv NETCDF_DIR /p/tsc/m3dc1/lib/SCORECLib/rhel6/trilinos
-setenv MKL_DIR /usr/pppl/intel/2015.u1/composerxe/mkl
-setenv INTEL_LICENSE_FILE /usr/pppl/intel/licenses/server.lic
-
-/p/tsc/m3dc1/lib/SCORECLib/rhel6/cmake-3.3.2/bin/cmake \
-\
- -D Trilinos_DISABLE_ENABLED_FORWARD_DEP_PACKAGES=ON \
- -D CMAKE_INSTALL_PREFIX:PATH="/p/tsc/m3dc1/lib/SCORECLib/rhel6/trilinos/real" \
- -D CMAKE_BUILD_TYPE:STRING=DEBUG \
- -D TPL_ENABLE_MPI:BOOL=ON \
- -D MPI_BASE_DIR:PATH=$MPIHOME \
- -D CMAKE_C_COMPILER:STRING="/usr/pppl/intel/2015.u1/bin/icc" \
- -D CMAKE_CXX_COMPILER:STRING="/usr/pppl/intel/2015.u1/bin/icpc" \
- -D CMAKE_Fortran_COMPILER:STRING="/usr/pppl/intel/2015.u1/bin/ifort" \
-# -D CMAKE_C_COMPILER:STRING="/usr/pppl/intel/2015-pkgs/openmpi-1.8.4/bin/mpicc" \
-# -D CMAKE_CXX_COMPILER:STRING="/usr/pppl/intel/2015-pkgs/openmpi-1.8.4/bin/mpicxx" \
-# -D CMAKE_Fortran_COMPILER:STRING="/usr/pppl/intel/2015-pkgs/openmpi-1.8.4/bin/mpif90" \
- -D CMAKE_C_FLAGS:STRING="-O2 -g " \
- -D CMAKE_CXX_FLAGS:STRING="-O2 -std=c++11 -ggdb -Wno-sign-compare" \
- -D Trilinos_ENABLE_CXX11:BOOL=ON \
- -D Trilinos_CXX11_FLAGS:STRING="-std=c++11" \
- -D CMAKE_ENABLE_Fortran:BOOL=ON \
- -D CMAKE_VERBOSE_MAKEFILE:BOOL=OFF \
- -D BUILD_SHARED_LIBS:BOOL=ON \
-# -D TPL_FIND_SHARED_LIBS:BOOL=OFF \
-# -D Trilinos_LINK_SEARCH_START_STATIC:BOOL=ON \
- -D Trilinos_EXTRA_LINK_FLAGS:STRING="-ldl" \
-\
- -D Trilinos_ENABLE_SECONDARY_TESTED_CODE:BOOL=OFF \
-\
- -D Trilinos_ENABLE_ALL_PACKAGES:BOOL=OFF \
- -D Trilinos_ENABLE_TESTS:BOOL=OFF \
- -D Trilinos_WARNINGS_AS_ERRORS_FLAGS:STRING="" \
- -D Trilinos_ENABLE_Teuchos:BOOL=ON \
- -D Trilinos_ENABLE_Shards:BOOL=ON \
- -D Trilinos_ENABLE_Sacado:BOOL=ON \
- -D Trilinos_ENABLE_Epetra:BOOL=ON \
- -D Trilinos_ENABLE_EpetraExt:BOOL=ON \
- -D Trilinos_ENABLE_Ifpack:BOOL=ON \
- -D Trilinos_ENABLE_AztecOO:BOOL=ON \
- -D Trilinos_ENABLE_Amesos:BOOL=ON \
- -D Trilinos_ENABLE_Anasazi:BOOL=ON \
- -D Trilinos_ENABLE_Belos:BOOL=ON \
- -D Trilinos_ENABLE_ML:BOOL=ON \
- -D Trilinos_ENABLE_Phalanx:BOOL=ON \
- -D Trilinos_ENABLE_Intrepid:BOOL=ON \
- -D Trilinos_ENABLE_NOX:BOOL=ON \
- -D Trilinos_ENABLE_Stratimikos:BOOL=ON \
- -D Trilinos_ENABLE_Thyra:BOOL=ON \
- -D Trilinos_ENABLE_Rythmos:BOOL=ON \
- -D Trilinos_ENABLE_MOOCHO:BOOL=ON \
- -D Trilinos_ENABLE_Stokhos:BOOL=ON \
- -D Trilinos_ENABLE_Piro:BOOL=ON \
- -D Trilinos_ENABLE_Teko:BOOL=ON \
-\
- -D Trilinos_ENABLE_STKIO:BOOL=ON \
- -D Trilinos_ENABLE_STKMesh:BOOL=ON \
- -D TPL_ENABLE_Boost:BOOL=ON \
- -D Boost_INCLUDE_DIRS:FILEPATH="$BOOST_DIR/include" \
- -D Boost_LIBRARY_DIRS:FILEPATH="$BOOST_DIR/lib" \
- -D TPL_ENABLE_BoostLib:BOOL=ON \
- -D BoostLib_INCLUDE_DIRS:FILEPATH="$BOOST_DIR/include" \
- -D BoostLib_LIBRARY_DIRS:FILEPATH="$BOOST_DIR/lib" \
-\
- -D Trilinos_ENABLE_SEACAS:BOOL=ON \
- -D TPL_ENABLE_X11:BOOL=OFF \
- -D TPL_ENABLE_Matio:BOOL=OFF \
- -D Trilinos_ENABLE_SEACASIoss:BOOL=ON \
- -D Trilinos_ENABLE_SEACASExodus:BOOL=ON \
- -D TPL_ENABLE_Netcdf:BOOL=ON \
- -D Netcdf_INCLUDE_DIRS:PATH="$NETCDF_DIR/include" \
- -D Netcdf_LIBRARY_DIRS:PATH="$NETCDF_DIR/lib" \
- -D TPL_ENABLE_HDF5:BOOL=ON \
- -D HDF5_INCLUDE_DIRS:PATH="$HDF5_HOME/include" \
- -D HDF5_LIBRARY_DIRS:PATH="$HDF5_HOME/lib" \
-\
- -D Trilinos_ENABLE_Tpetra:BOOL=ON \
- -D Trilinos_ENABLE_Kokkos:BOOL=ON \
- -D HAVE_INTREPID_KOKKOSCORE:BOOL=ON \
- -D Trilinos_ENABLE_Ifpack2:BOOL=ON \
- -D Trilinos_ENABLE_Amesos2:BOOL=ON \
- -D Trilinos_ENABLE_Zoltan2:BOOL=ON \
- -D Trilinos_ENABLE_MueLu:BOOL=ON \
- -D Amesos2_ENABLE_KLU2:BOOL=ON \
- -D Amesos2_ENABLE_MUMPS:BOOL=ON \
- -D Amesos2_ENABLE_SuperLU:BOOL=ON \
- -D Amesos2_ENABLE_SuperLUDist:BOOL=ON \
-\
- -D TPL_ENABLE_MKL:BOOL=ON \
- -D MKL_INCLUDE_DIRS:PATH="$MKL_DIR/include" \
- -D MKL_LIBRARY_DIRS:PATH="$MKL_DIR/lib/intel64" \
- -D TPL_ENABLE_LAPACK:BOOL=ON \
- -D LAPACK_INCLUDE_DIRS:PATH="$MKL_DIR/include" \
- -D LAPACK_LIBRARY_DIRS:PATH="$MKL_DIR/lib/intel64" \
- -D LAPACK_LIBRARY_NAMES:STRING="mkl_lapack95_lp64" \
- -D TPL_ENABLE_BLAS:BOOL=ON \
- -D BLAS_INCLUDE_DIRS:PATH="$MKL_DIR/include" \
- -D BLAS_LIBRARY_DIRS:PATH="$MKL_DIR/lib/intel64" \
- -D BLAS_LIBRARY_NAMES:STRING="mkl_blas95_lp64" \
- -D TPL_ENABLE_HYPRE:STRING=ON \
- -D HYPRE_INCLUDE_DIRS:PATH="$PETSC_DIR/$PETSC_ARCH/include" \
- -D HYPRE_LIBRARY_DIRS:PATH="$PETSC_DIR/$PETSC_ARCH/lib" \
- -D TPL_ENABLE_SuperLU:STRING=ON \
- -D SuperLU_INCLUDE_DIRS:PATH="$PETSC_DIR/$PETSC_ARCH/include" \
- -D SuperLU_LIBRARY_DIRS:PATH="$PETSC_DIR/$PETSC_ARCH/lib" \
- -D SuperLU_LIBRARY_NAMES:STRING="superlu_4.3" \
- -D TPL_ENABLE_SuperLUDist:BOOL=ON \
- -D SuperLUDist_INCLUDE_DIRS:PATH="$PETSC_DIR/$PETSC_ARCH/include" \
- -D SuperLUDist_LIBRARY_DIRS:PATH="$PETSC_DIR/$PETSC_ARCH/lib" \
- -D SuperLUDist_LIBRARY_NAMES:STRING="superlu_dist_3.3" \
- -D TPL_ENABLE_MUMPS:BOOL=ON \
- -D MUMPS_INCLUDE_DIRS:PATH="$PETSC_DIR/$PETSC_ARCH/include" \
- -D MUMPS_LIBRARY_DIRS:PATH="$PETSC_DIR/$PETSC_ARCH/lib" \
-\
- -D Trilinos_ENABLE_SCOREC:BOOL=ON \
- -D PCU_COMPRESS:BOOL=ON \
- -D SCOREC_DISABLE_STRONG_WARNINGS:BOOL=ON \
- -D Trilinos_ENABLE_EXPORT_MAKEFILES:BOOL=OFF \
- -D Trilinos_ASSERT_MISSING_PACKAGES:BOOL=OFF \
-\
- -D TPL_ENABLE_ParMETIS:STRING=ON \
- -D ParMETIS_INCLUDE_DIRS:PATH="$PETSC_DIR/$PETSC_ARCH/include" \
- -D ParMETIS_LIBRARY_DIRS:PATH="$PETSC_DIR/$PETSC_ARCH/lib" \
- -D TPL_ENABLE_METIS:STRING=ON \
- -D METIS_INCLUDE_DIRS:PATH="$PETSC_DIR/$PETSC_ARCH/include" \
- -D METIS_LIBRARY_DIRS:PATH="$PETSC_DIR/$PETSC_ARCH/lib" \
- -D Zoltan_ENABLE_ULLONG_IDS:BOOL=OFF \
- -D Teuchos_ENABLE_LONG_LONG_INT:BOOL=OFF \
-\
- -D Trilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON \
- -D Tpetra_INST_FLOAT=OFF \
- -D Tpetra_INST_INT_INT=ON \
- -D Tpetra_INST_DOUBLE=ON \
- -D Tpetra_INST_COMPLEX_FLOAT=OFF \
- -D Tpetra_INST_COMPLEX_DOUBLE=OFF \
- -D Tpetra_INST_INT_LONG=OFF \
- -D Tpetra_INST_INT_UNSIGNED=OFF \
- -D Tpetra_INST_INT_LONG_LONG=OFF \
-\
-../
diff --git a/unstructured/centos7.mk b/unstructured/centos7.mk
index 064b0d2f1..5d675f273 100644
--- a/unstructured/centos7.mk
+++ b/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
diff --git a/unstructured/cori.mk b/unstructured/cori.mk
index cecaa0c40..6ba8867cc 100644
--- a/unstructured/cori.mk
+++ b/unstructured/cori.mk
@@ -17,10 +17,29 @@ ifeq ($(HPCTK), 1)
   OPTS := $(OPTS) -gopt
   LOADER := hpclink $(LOADER)
 endif
- 
+
 OPTS := $(OPTS) -DUSEADIOS -DPETSC_VERSION=39 -DUSEBLAS
 
-#SCOREC_BASE_DIR=/global/project/projectdirs/mp288/cori/scorec/intel6.0.5-mpich7.7.10/hsw-petsc3.12.4/
+PETSC_DIR=/global/cfs/cdirs/mp288/jinchen/PETSC/petsc.20220609
+ifeq ($(COM), 1)
+  PETSC_ARCH=corihsw-PrgEnvintel6010-craympich7719-master-cplx
+  PETSC_WITH_EXTERNAL_LIB = -L${PETSC_DIR}/${PETSC_ARCH}/lib -Wl,-rpath,/global/cfs/cdirs/mp288/jinchen/PETSC/petsc.20220609/corihsw-PrgEnvintel6010-craympich7719-master-cplx/lib -L/global/cfs/cdirs/mp288/jinchen/PETSC/petsc.20220609/corihsw-PrgEnvintel6010-craympich7719-master-cplx/lib -lpetsc -lcmumps -ldmumps -lsmumps -lzmumps -lmumps_common -lpord -lscalapack -lsuperlu -lsuperlu_dist -lfftw3_mpi -lfftw3 -lflapack -lfblas -lzoltan -lhdf5hl_fortran -lhdf5_fortran -lhdf5_hl -lhdf5 -lparmetis -lmetis -lz -lgsl -lgslcblas -lquadmath -lstdc++ -ldl
+M3DC1_SCOREC_LIB=-lm3dc1_scorec_complex
+  M3DC1_SCOREC_LIBA=libm3dc1_scorec_complex.a
+  SCOREC_COMPLEX=ON
+else
+  ifeq ($(ST), 1)
+    PETSC_ARCH=corihsw-PrgEnvintel6010-craympich7719-master-real-st
+    PETSC_WITH_EXTERNAL_LIB = -L${PETSC_DIR}/${PETSC_ARCH}/lib -Wl,-rpath,/global/cfs/cdirs/mp288/jinchen/PETSC/petsc.20220609/corihsw-PrgEnvintel6010-craympich7719-master-real-st/lib -L/global/cfs/cdirs/mp288/jinchen/PETSC/petsc.20220609/corihsw-PrgEnvintel6010-craympich7719-master-real-st/lib -lpetsc -lcmumps -ldmumps -lsmumps -lzmumps -lmumps_common -lpord -lscalapack -lsuperlu -lsuperlu_dist -lfftw3_mpi -lfftw3 -lflapack -lfblas -lzoltan -lparmetis -lmetis -lz -lgsl -lgslcblas -lquadmath -lstdc++ -ldl
+  else
+    PETSC_ARCH=corihsw-PrgEnvintel6010-craympich7719-master-real
+    PETSC_WITH_EXTERNAL_LIB = -L${PETSC_DIR}/${PETSC_ARCH}/lib -Wl,-rpath,/global/cfs/cdirs/mp288/jinchen/PETSC/petsc.20220609/corihsw-PrgEnvintel6010-craympich7719-master-real/lib -L/global/cfs/cdirs/mp288/jinchen/PETSC/petsc.20220609/corihsw-PrgEnvintel6010-craympich7719-master-real/lib -lpetsc -lcmumps -ldmumps -lsmumps -lzmumps -lmumps_common -lpord -lscalapack -lsuperlu -lsuperlu_dist -lfftw3_mpi -lfftw3 -lflapack -lfblas -lzoltan -lhdf5hl_fortran -lhdf5_fortran -lhdf5_hl -lhdf5 -lparmetis -lmetis -lz -lgsl -lgslcblas -lquadmath -lstdc++ -ldl
+  endif
+  M3DC1_SCOREC_LIB=-lm3dc1_scorec
+  M3DC1_SCOREC_LIBA=libm3dc1_scorec.a
+  SCOREC_COMPLEX=OFF
+endif
+
 SCOREC_BASE_DIR=/global/cfs/cdirs/mp288/jinchen/PETSC/core/upgrade-intel6610-craympich7719-hsw2
 SCOREC_UTIL_DIR=$(SCOREC_BASE_DIR)/bin
 
@@ -28,37 +47,10 @@ ZOLTAN_LIB=-L$(SCOREC_BASE_DIR)/lib -lzoltan
 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
 
-#PETSC_DIR=/global/cfs/cdirs/mp288/jinchen/PETSC/petsc.20220107
-PETSC_DIR=/global/cfs/cdirs/mp288/jinchen/PETSC/petsc.20220609
-ifeq ($(COM), 1)
-  PETSC_ARCH=corihsw-PrgEnvintel6010-craympich7719-master-cplx
-  PETSC_WITH_EXTERNAL_LIB = -L${PETSC_DIR}/${PETSC_ARCH}/lib -Wl,-rpath,/global/cfs/cdirs/mp288/jinchen/PETSC/petsc.20220609/corihsw-PrgEnvintel6010-craympich7719-master-cplx/lib -L/global/cfs/cdirs/mp288/jinchen/PETSC/petsc.20220609/corihsw-PrgEnvintel6010-craympich7719-master-cplx/lib -lpetsc -lcmumps -ldmumps -lsmumps -lzmumps -lmumps_common -lpord -lscalapack -lsuperlu -lsuperlu_dist -lfftw3_mpi -lfftw3 -lflapack -lfblas -lzoltan -lhdf5hl_fortran -lhdf5_fortran -lhdf5_hl -lhdf5 -lparmetis -lmetis -lz -lgsl -lgslcblas -lquadmath -lstdc++ -ldl
-else
-  ifeq ($(ST), 1)
-  PETSC_ARCH=corihsw-PrgEnvintel6010-craympich7719-master-real-st
-  PETSC_WITH_EXTERNAL_LIB = -L${PETSC_DIR}/${PETSC_ARCH}/lib -Wl,-rpath,/global/cfs/cdirs/mp288/jinchen/PETSC/petsc.20220609/corihsw-PrgEnvintel6010-craympich7719-master-real-st/lib -L/global/cfs/cdirs/mp288/jinchen/PETSC/petsc.20220609/corihsw-PrgEnvintel6010-craympich7719-master-real-st/lib -lpetsc -lcmumps -ldmumps -lsmumps -lzmumps -lmumps_common -lpord -lscalapack -lsuperlu -lsuperlu_dist -lfftw3_mpi -lfftw3 -lflapack -lfblas -lzoltan -lparmetis -lmetis -lz -lgsl -lgslcblas -lquadmath -lstdc++ -ldl
-  else
-  PETSC_ARCH=corihsw-PrgEnvintel6010-craympich7719-master-real
-  PETSC_WITH_EXTERNAL_LIB = -L${PETSC_DIR}/${PETSC_ARCH}/lib -Wl,-rpath,/global/cfs/cdirs/mp288/jinchen/PETSC/petsc.20220609/corihsw-PrgEnvintel6010-craympich7719-master-real/lib -L/global/cfs/cdirs/mp288/jinchen/PETSC/petsc.20220609/corihsw-PrgEnvintel6010-craympich7719-master-real/lib -lpetsc -lcmumps -ldmumps -lsmumps -lzmumps -lmumps_common -lpord -lscalapack -lsuperlu -lsuperlu_dist -lfftw3_mpi -lfftw3 -lflapack -lfblas -lzoltan -lhdf5hl_fortran -lhdf5_fortran -lhdf5_hl -lhdf5 -lparmetis -lmetis -lz -lgsl -lgslcblas -lquadmath -lstdc++ -ldl
-  endif
-endif
-
 MKL_LIB = -Wl,--start-group ${MKLROOT}/lib/intel64/libmkl_intel_lp64.a ${MKLROOT}/lib/intel64/libmkl_sequential.a ${MKLROOT}/lib/intel64/libmkl_core.a -Wl,--end-group -lpthread -lm -ldl
 
 ADIOS_DIR=/global/homes/j/jinchen/project/LIB/adios-1.13.0/build-mpi
@@ -68,10 +60,8 @@ ADIOS_FLIB = -L${ADIOS_DIR}/lib -ladiosf_v1 -ladiosreadf_v1 \
 
 INCLUDE := $(INCLUDE) -I$(SCOREC_BASE_DIR)/include \
 	   -I$(PETSC_DIR)/$(PETSC_ARCH)/include -I$(PETSC_DIR)/include \
-	   -I$(GSL_DIR)/include # \
-#        -I$(HYBRID_HOME)/include
-#           -I$(CRAY_TPSL_DIR)/INTEL/150/haswell/include \
-#
+	   -I$(GSL_DIR)/include
+
 LIBS := $(LIBS) \
         -L$(PETSC_DIR)/$(PETSC_ARCH)/lib \
         $(SCOREC_LIB) \
@@ -81,7 +71,6 @@ LIBS := $(LIBS) \
 	-L$(GSL_DIR)/lib -lgsl -lhugetlbfs \
 	$(ADIOS_FLIB) \
 	$(MKL_LIB)
-#        $(HYBRID_LIBS) \
 
 ifeq ($(ST), 1)
   LIBS += -Wl,--start-group -L/global/homes/j/jinchen/project/NETCDF/buildhsw/lib -Wl,-rpath,/global/homes/j/jinchen/project/NETCDF/buildhsw/lib -lhdf5hl_fortran -lhdf5_fortran -lhdf5_hl -lhdf5 -lnetcdf -lnetcdff -lz -Wl,--end-group
diff --git a/unstructured/cori_knl.mk b/unstructured/cori_knl.mk
index c733b590c..c003bb998 100644
--- a/unstructured/cori_knl.mk
+++ b/unstructured/cori_knl.mk
@@ -1,4 +1,4 @@
-ifeq ($(TAU), 1)
+addifeq ($(TAU), 1)
   TAU_OPTIONS = -optCPPOpts=-DUSETAU -optVerbose -optPreProcess -optMpi -optTauSelectFile=select.tau
   CPP    = tau_cxx.sh $(TAU_OPTIONS)
   CC     = tau_cc.sh  $(TAU_OPTIONS)
@@ -24,12 +24,17 @@ PETSC_DIR=/global/cfs/cdirs/mp288/jinchen/PETSC/petsc.20220609
 ifeq ($(COM), 1)
   PETSC_ARCH = coriknl-PrgEnvintel6010-craympich7719-master-cplx
   PETSC_WITH_EXTERNAL_LIB = -L${PETSC_DIR}/${PETSC_ARCH}/lib -Wl,-rpath,/global/cfs/cdirs/mp288/jinchen/PETSC/petsc.20220609/coriknl-PrgEnvintel6010-craympich7719-master-cplx/lib -L/global/cfs/cdirs/mp288/jinchen/PETSC/petsc.20220609/coriknl-PrgEnvintel6010-craympich7719-master-cplx/lib -lpetsc -lcmumps -ldmumps -lsmumps -lzmumps -lmumps_common -lpord -lscalapack -lsuperlu -lsuperlu_dist -lfftw3_mpi -lfftw3 -lflapack -lfblas -lzoltan -lparmetis -lmetis -lgsl -lgslcblas -lquadmath -lstdc++ -ldl
+  M3DC1_SCOREC_LIB=-lm3dc1_scorec_complex
+  M3DC1_SCOREC_LIBA=libm3dc1_scorec_complex.a
+  SCOREC_COMPLEX=ON
 else
   PETSC_ARCH = coriknl-PrgEnvintel6010-craympich7719-master-real
   PETSC_WITH_EXTERNAL_LIB = -L${PETSC_DIR}/${PETSC_ARCH}/lib -Wl,-rpath,/global/cfs/cdirs/mp288/jinchen/PETSC/petsc.20220609/coriknl-PrgEnvintel6010-craympich7719-master-real/lib -L/global/cfs/cdirs/mp288/jinchen/PETSC/petsc.20220609/coriknl-PrgEnvintel6010-craympich7719-master-real/lib -lpetsc -lcmumps -ldmumps -lsmumps -lzmumps -lmumps_common -lpord -lscalapack -lsuperlu -lsuperlu_dist -lfftw3_mpi -lfftw3 -lflapack -lfblas -lzoltan -lparmetis -lmetis -lgsl -lgslcblas -lquadmath -lstdc++ -ldl
+  M3DC1_SCOREC_LIB=-lm3dc1_scorec
+  M3DC1_SCOREC_LIBA=libm3dc1_scorec.a
+  SCOREC_COMPLEX=OFF
 endif
 
-#SCOREC_BASE_DIR=/global/project/projectdirs/mp288/cori/scorec/intel19.1.0-mpich7.7.10/knl-petsc3.13.4/
 SCOREC_BASE_DIR=/global/cfs/cdirs/mp288/jinchen/PETSC/core/upgrade-intel6610-craympich7719-knl2
 SCOREC_UTIL_DIR=$(SCOREC_BASE_DIR)/bin
 
@@ -37,18 +42,6 @@ ZOLTAN_LIB=-L$(SCOREC_BASE_DIR)/lib -lzoltan
 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
@@ -57,11 +50,7 @@ MKL_LIB =  -Wl,--start-group ${MKLROOT}/lib/intel64/libmkl_intel_lp64.a ${MKLROO
 
 INCLUDE += -I$(SCOREC_BASE_DIR)/include \
 	   -I$(PETSC_DIR)/$(PETSC_ARCH)/include -I$(PETSC_DIR)/include \
-	   -I$(GSL_DIR)/include # \
-
-ifdef SCORECVER
-  INCLUDE += -I$(SCOREC_DIR)/include
-endif
+	   -I$(GSL_DIR)/include
 
 LIBS += $(SCOREC_LIB) \
         $(ZOLTAN_LIB)\
@@ -88,9 +77,6 @@ else
 
 # Optimization flags
 ifeq ($(OPT), 1)
-#  LDOPTS := $(LDOPTS) -dynamic -ipo -qopt-report  -qopt-report-phase=vec #-h profile_generate 
-#  FOPTS  := $(FOPTS)  -O3 -ipo -qopt-report  -qopt-report-phase=vec #-h profile_generate 
-#  CCOPTS := $(CCOPTS) -O3 -ipo -qopt-report  -qopt-report-phase=vec #-h profile_generate 
   LDOPTS := $(LDOPTS) -static -qopt-report=5 -qopt-report-phase=vec,loop
   FOPTS  := $(FOPTS)  -qopt-report=5 -qopt-report-phase=vec,loop
   CCOPTS := $(CCOPTS) -qopt-report=5 -qopt-report-phase=vec,loop
diff --git a/unstructured/makefile b/unstructured/makefile
index 9709f92d7..586e496ca 100644
--- a/unstructured/makefile
+++ b/unstructured/makefile
@@ -113,6 +113,9 @@ OOPTS := $(OPTS) -DPETSC_FORTRAN_PETSCTRUTH_INT #-DCJ_MATRIX_DUMP
 # add date stamp
 OPTS := $(OPTS) -DDATE_BUILT='"$(shell date)"' -DRELEASE_VERSION='"$(shell cat release_version)"' #-DBUILD_INFO="'$(shell svn info)'"
 
+SCOREC_DIR=${M3DC1_DIR}/m3dc1_scorec/_$(M3DC1_ARCH)
+SCOREC_BUILD=${M3DC1_DIR}/m3dc1_scorec/_$(M3DC1_ARCH)_build
+
 export OPT
 export OPTS
 export SCORECOPT
@@ -123,6 +126,8 @@ export USE3D
 export USERW
 export TAU
 export HPCTK
+export SCOREC_DIR
+export SCOREC_BUILD
 
 include target.mk
 
@@ -134,6 +139,7 @@ else
 
 VPATH=$(SRCDIR)
 
+
 include $(SRCDIR)/$(ARCH).mk
 BIN = m3dc1
 
@@ -227,6 +233,25 @@ kprad : kprad.f90 kprad_test.f90
 test_region : region.o test_region.o
 	$(F90) $^ -o $@
 
+.PHONY: scorec
+scorec :
+	mkdir -p $(SCOREC_BUILD)
+	cd $(SCOREC_BUILD) ;\
+	PETSC_DIR=$(PETSC_DIR) \
+	PETSC_ARCH=$(PETSC_ARCH) \
+	SCOREC_DIR=$(SCOREC_DIR) \
+	SCOREC_BASE_DIR=$(SCOREC_BASE_DIR) \
+	SCOREC_COMPLEX=$(SCOREC_COMPLEX) \
+	${M3DC1_DIR}/m3dc1_scorec/config-files/$(M3DC1_ARCH)-config.sh
+	make -C $(SCOREC_BUILD) -j
+	make -C $(SCOREC_BUILD) install
+	# Uncomment this and change library names in $(M3DC1_ARCH).mk for testing
+	#if [ $(SCOREC_COMPLEX) == ON ]; then \
+	#  /bin/mv $(SCOREC_DIR)/lib/libm3dc1_scorec_complex.a $(SCOREC_DIR)/lib/libm3dc1_scored_complex.a ; \
+	#else \
+	#  /bin/mv $(SCOREC_DIR)/lib/libm3dc1_scorec.a $(SCOREC_DIR)/lib/libm3dc1_scored.a ; \
+	#fi
+
 .PHONY : bin
 bin : a2cc mackenbach_profiles
 	rm -fr bin
diff --git a/unstructured/stellar.mk b/unstructured/stellar.mk
index 102287ab6..12b2e3f98 100644
--- a/unstructured/stellar.mk
+++ b/unstructured/stellar.mk
@@ -29,10 +29,14 @@ PETSCVER=petsc3.13.5
 PETSC_DIR=/projects/M3DC1/PETSC/$(PETSC_VER)
 ifeq ($(COM), 1)
   PETSC_ARCH=cplx-$(MPIVER)
-  M3DC1_SCOREC_LIB=-lm3dc1_scorec_complex 
+  M3DC1_SCOREC_LIB=-lm3dc1_scorec_complex
+  M3DC1_SCOREC_LIBA=libm3dc1_scorec_complex.a
+  SCOREC_COMPLEX=ON
 else
   PETSC_ARCH=real-$(MPIVER)
   M3DC1_SCOREC_LIB=-lm3dc1_scorec
+  M3DC1_SCOREC_LIBA=libm3dc1_scorec.a
+  SCOREC_COMPLEX=OFF
 endif
 
 PETSC_WITH_EXTERNAL_LIB = -L${PETSC_DIR}/${PETSC_ARCH}/lib \
@@ -49,16 +53,11 @@ PETSC_WITH_EXTERNAL_LIB = -L${PETSC_DIR}/${PETSC_ARCH}/lib \
 
 SCOREC_BASE_DIR=/projects/M3DC1/scorec/$(MPIVER)/$(PETSCVER)/202209
 SCOREC_UTIL_DIR=$(SCOREC_BASE_DIR)/bin
-ifdef SCORECVER
-  SCOREC_DIR=$(SCOREC_BASE_DIR)/$(SCORECVER)
-else
-  SCOREC_DIR=$(SCOREC_BASE_DIR)
-endif
 
 ZOLTAN_LIB=-L$(PETSC_DIR)/$(PETSC_ARCH)/lib -lzoltan
 
 SCOREC_LIBS= -L$(SCOREC_DIR)/lib $(M3DC1_SCOREC_LIB) \
-             -Wl,--start-group,-rpath,$(SCOREC_DIR)/lib -L$(SCOREC_DIR)/lib \
+             -Wl,--start-group,-rpath,$(SCOREC_BASE_DIR)/lib -L$(SCOREC_BASE_DIR)/lib \
              -lpumi -lapf -lapf_zoltan -lgmi -llion -lma -lmds -lmth -lparma \
              -lpcu -lph -lsam -lspr -lcrv -Wl,--end-group
 
diff --git a/unstructured/target.mk b/unstructured/target.mk
index db61ba0ea..38d69aa81 100644
--- a/unstructured/target.mk
+++ b/unstructured/target.mk
@@ -21,7 +21,7 @@ INSTALL_DIR = $(M3DC1_INSTALL_DIR)/m3dc1-$(ARCH)-$(VERSION)
 
 MAKETARGET = $(MAKE) --no-print-directory -C $@ -f $(CURDIR)/makefile \
 	SRCDIR=$(CURDIR) ARCH=$(ARCH) BIN_POSTFIX=$(BIN_POSTFIX) \
-	$(MAKECMDGOALS) 
+	$(MAKECMDGOALS)
 
 include $(ARCH).mk
 
@@ -37,6 +37,8 @@ makefile : ;
 
 .PHONY: all
 all :
+	make scorec
+	make scorec COM=1
 	make OPT=1
 	make OPT=1 COM=1
 	make OPT=1 3D=1 MAX_PTS=60
@@ -46,13 +48,15 @@ all :
 
 .PHONY: cleanall
 cleanall : 
-	rm -fr _$(ARCH)*
+	make clean
 	cd templates ; make clean
 
 .PHONY: clean
-clean : 
+clean :
 	rm -fr _$(ARCH)
 	rm -fr _$(ARCH)-*
+	rm -fr $(SCOREC_DIR)
+	rm -fr $(SCOREC_BUILD)
 
 .PHONY: templates
 templates :