From 855c16d612e76c1adc6c83435f47211192f89288 Mon Sep 17 00:00:00 2001 From: rmcdermo Date: Thu, 26 Sep 2024 15:11:32 -0400 Subject: [PATCH] Makefile: add missing imkl.o to obj_mpi; add hypre and sundials flags for gnu openmpi targets --- Build/makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Build/makefile b/Build/makefile index 9d3b6e6f51..37cb520599 100644 --- a/Build/makefile +++ b/Build/makefile @@ -117,7 +117,7 @@ ifdef HYPRE_HOME # This assumes the HYPRE library is available. endif obj_mpi = prec.o cons.o chem.o prop.o devc.o type.o data.o mesh.o func.o gsmv.o smvv.o rcal.o turb.o soot.o \ - pois.o geom.o ccib.o radi.o part.o vege.o ctrl.o hvac.o mass.o \ + pois.o geom.o ccib.o radi.o part.o vege.o ctrl.o hvac.o mass.o imkl.o \ wall.o fire.o velo.o pres.o init.o dump.o read.o divg.o main.o objwin_mpi = $(obj_mpi:.o=.obj) @@ -328,24 +328,24 @@ ompi_intel_osx_openmp_dv : setup $(obj_mpi) #*** GNU Compilers *** -ompi_gnu_linux : FFLAGS = -m64 -O2 -std=f2018 -frecursive -ffpe-summary=none -fall-intrinsics $(GITINFOGNU) $(FFLAGSMKL_GNU_OPENMPI) $(GFORTRAN_OPTIONS) -ompi_gnu_linux : LFLAGSMKL = $(LFLAGSMKL_GNU_OPENMPI) +ompi_gnu_linux : FFLAGS = -m64 -O2 -std=f2018 -frecursive -ffpe-summary=none -fall-intrinsics $(GITINFOGNU) $(FFLAGSMKL_GNU_OPENMPI) $(GFORTRAN_OPTIONS) $(FFLAGS_HYPRE) $(FFLAGS_SUNDIALS) +ompi_gnu_linux : LFLAGSMKL = $(LFLAGSMKL_GNU_OPENMPI) $(LFLAGS_HYPRE) $(LFLAGS_SUNDIALS) ompi_gnu_linux : FCOMPL = mpifort ompi_gnu_linux : FOPENMPFLAGS = -fopenmp ompi_gnu_linux : obj = fds_ompi_gnu_linux ompi_gnu_linux : setup $(obj_mpi) $(FCOMPL) $(FFLAGS) $(FOPENMPFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL) -ompi_gnu_linux_db : FFLAGS = -m64 -O0 -std=f2018 -ggdb -Wall -Werror -Wunused-parameter -Wcharacter-truncation -Wno-target-lifetime -fcheck=all -fbacktrace -ffpe-trap=invalid,zero,overflow -frecursive -ffpe-summary=none -fall-intrinsics -fbounds-check $(GITINFOGNU) $(FFLAGSMKL_GNU_OPENMPI) $(GFORTRAN_OPTIONS) -ompi_gnu_linux_db : LFLAGSMKL = $(LFLAGSMKL_GNU_OPENMPI) +ompi_gnu_linux_db : FFLAGS = -m64 -O0 -std=f2018 -ggdb -Wall -Werror -Wunused-parameter -Wcharacter-truncation -Wno-target-lifetime -fcheck=all -fbacktrace -ffpe-trap=invalid,zero,overflow -frecursive -ffpe-summary=none -fall-intrinsics -fbounds-check $(GITINFOGNU) $(FFLAGSMKL_GNU_OPENMPI) $(GFORTRAN_OPTIONS) $(FFLAGS_HYPRE) $(FFLAGS_SUNDIALS) +ompi_gnu_linux_db : LFLAGSMKL = $(LFLAGSMKL_GNU_OPENMPI) $(LFLAGS_HYPRE) $(LFLAGS_SUNDIALS) ompi_gnu_linux_db : FCOMPL = mpifort ompi_gnu_linux_db : FOPENMPFLAGS = -fopenmp ompi_gnu_linux_db : obj = fds_ompi_gnu_linux_db ompi_gnu_linux_db : setup $(obj_mpi) $(FCOMPL) $(FFLAGS) $(FOPENMPFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL) -ompi_gnu_linux_dv : FFLAGS = -m64 -O1 -fbacktrace -std=f2018 -frecursive -ffpe-summary=none -fall-intrinsics $(GITINFOGNU) $(FFLAGSMKL_GNU_OPENMPI) $(GFORTRAN_OPTIONS) -ompi_gnu_linux_dv : LFLAGSMKL = $(LFLAGSMKL_GNU_OPENMPI) +ompi_gnu_linux_dv : FFLAGS = -m64 -O1 -fbacktrace -std=f2018 -frecursive -ffpe-summary=none -fall-intrinsics $(GITINFOGNU) $(FFLAGSMKL_GNU_OPENMPI) $(GFORTRAN_OPTIONS) $(FFLAGS_HYPRE) $(FFLAGS_SUNDIALS) +ompi_gnu_linux_dv : LFLAGSMKL = $(LFLAGSMKL_GNU_OPENMPI) $(LFLAGS_HYPRE) $(LFLAGS_SUNDIALS) ompi_gnu_linux_dv : FCOMPL = mpifort ompi_gnu_linux_dv : FOPENMPFLAGS = -fopenmp ompi_gnu_linux_dv : obj = fds_ompi_gnu_linux_dv