makefile

Makefile.in

@@ -2,13 +2,10 @@
 WORK_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 
 # Package directories (shouldn't need to change these)
-PETSC_DIR = $(WORK_DIR)/packages/petsc-3.19.6
-PETSC_ARCH = $(PETSC_DIR)/petsc_configure
+PETSC_DIR = /usr/local/pace-apps/spack/packages/linux-rhel7-x86_64/gcc-10.3.0/petsc-3.17.1-pt6slgja7jrvkmthcu7kuml7vuhpworc
 
 SPHEREPACK_DIR = $(WORK_DIR)/packages/spherepack3.2
 
-LAPACK_DIR = $(WORK_DIR)/packages/lapack-3.11
-
 # Makedependf90 binary
 MAKEDEPEND_BIN = $(WORK_DIR)/packages/makedepf90/makedepf90
 
@@ -20,18 +17,17 @@ vpath $(WORK_DIR)/common
 
 # Includes
 PETSC_INCLUDE = $(PETSC_DIR)/include
-PETSC_ARCH_INCLUDE = $(PETSC_ARCH)/include
 NETCDF_INCLUDE = $(NETCDF_FORTRANROOT)/include
 
 COMMON_INCLUDE = -I$(WORK_DIR)/common
-INCLUDE = $(COMMON_INCLUDE) -I$(PETSC_INCLUDE) -I$(PETSC_ARCH_INCLUDE) -I$(NETCDF_INCLUDE)
+INCLUDE = $(COMMON_INCLUDE) -I$(PETSC_INCLUDE) -I$(NETCDF_INCLUDE)
 
 # Libraries
 COMMON_LIB = $(WORK_DIR)/common/libcommon.a
 SPHPK_LIB = -L$(SPHEREPACK_DIR)/lib -lspherepack
 FFTW_LIB = -L$(FFTWROOT)/lib -lfftw3
 NETCDF_LIB = -L$(NETCDF_FORTRANROOT)/lib -lnetcdff
-PETSC_LIB = -Wl,-rpath,$(PETSC_ARCH)/lib -L$(PETSC_ARCH)/lib -lpetsc -lstdc++
+PETSC_LIB = -L$(PETSC_DIR)/lib -lpetsc
 MKL_LIB = -L$(MKL_ROOT)lib/intel64/ -lmkl_gf_lp64 -lmkl_core -lmkl_sequential -lpthread -lm -ldl
 BLAS_LIB = -L$(BLAS_DIR) -lrefblas
 LAPACK_LIB = -L$(LAPACK_DIR) -llapack -lrefblas

Makefile2.in → Makefile3.in

@@ -2,10 +2,13 @@
 WORK_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 
 # Package directories (shouldn't need to change these)
-PETSC_DIR = /usr/local/pace-apps/spack/packages/linux-rhel7-x86_64/gcc-10.3.0/petsc-3.17.1-pt6slgja7jrvkmthcu7kuml7vuhpworc
+PETSC_DIR = $(WORK_DIR)/packages/petsc-3.19.6
+PETSC_ARCH = $(PETSC_DIR)/petsc_configure
 
 SPHEREPACK_DIR = $(WORK_DIR)/packages/spherepack3.2
 
+LAPACK_DIR = $(WORK_DIR)/packages/lapack-3.11
+
 # Makedependf90 binary
 MAKEDEPEND_BIN = $(WORK_DIR)/packages/makedepf90/makedepf90
 
@@ -17,17 +20,18 @@ vpath $(WORK_DIR)/common
 
 # Includes
 PETSC_INCLUDE = $(PETSC_DIR)/include
+PETSC_ARCH_INCLUDE = $(PETSC_ARCH)/include
 NETCDF_INCLUDE = $(NETCDF_FORTRANROOT)/include
 
 COMMON_INCLUDE = -I$(WORK_DIR)/common
-INCLUDE = $(COMMON_INCLUDE) -I$(PETSC_INCLUDE) -I$(NETCDF_INCLUDE)
+INCLUDE = $(COMMON_INCLUDE) -I$(PETSC_INCLUDE) -I$(PETSC_ARCH_INCLUDE) -I$(NETCDF_INCLUDE)
 
 # Libraries
 COMMON_LIB = $(WORK_DIR)/common/libcommon.a
 SPHPK_LIB = -L$(SPHEREPACK_DIR)/lib -lspherepack
 FFTW_LIB = -L$(FFTWROOT)/lib -lfftw3
 NETCDF_LIB = -L$(NETCDF_FORTRANROOT)/lib -lnetcdff
-PETSC_LIB = -L$(PETSC_DIR)/lib -lpetsc
+PETSC_LIB = -Wl,-rpath,$(PETSC_ARCH)/lib -L$(PETSC_ARCH)/lib -lpetsc -lstdc++
 MKL_LIB = -L$(MKL_ROOT)lib/intel64/ -lmkl_gf_lp64 -lmkl_core -lmkl_sequential -lpthread -lm -ldl
 BLAS_LIB = -L$(BLAS_DIR) -lrefblas
 LAPACK_LIB = -L$(LAPACK_DIR) -llapack -lrefblas