From 15dd860de9855a1907f841db98158e2ab45d7873 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 21 Mar 2012 18:01:25 +0000 Subject: [PATCH] new switch "SOLVER", set it to SOLVER=AL to compile the Augmented Lagrange version of the spectral solver --- code/Makefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/code/Makefile b/code/Makefile index 877e1b5a5..2af8ac481 100644 --- a/code/Makefile +++ b/code/Makefile @@ -265,7 +265,8 @@ COMPILED_FILES = prec.o DAMASK_spectral_interface.o IO.o numerics.o debug.o math constitutive_dislotwin.o constitutive_j2.o constitutive_phenopowerlaw.o \ constitutive_titanmod.o constitutive_nonlocal.o constitutive.o \ homogenization_RGC.o homogenization_isostrain.o homogenization.o CPFEM.o crystallite.o - + +ifneq "$(SOLVER)" "AL" DAMASK_spectral.exe: DAMASK_spectral.o $(PREFIX) $(COMPILERNAME) $(OPENMP_FLAG_$(F90)) $(OPTIMIZATION_$(MAXOPTI)_$(F90)) $(STANDARD_CHECK_$(F90)) \ -o DAMASK_spectral.exe DAMASK_spectral.o \ @@ -273,7 +274,15 @@ DAMASK_spectral.exe: DAMASK_spectral.o DAMASK_spectral.o: DAMASK_spectral.f90 CPFEM.o $(PREFIX) $(COMPILERNAME) $(COMPILE_MAXOPTI) -c DAMASK_spectral.f90 $(SUFFIX) +else +DAMASK_spectral_AL.exe: DAMASK_spectral_AL.o + $(PREFIX) $(COMPILERNAME) $(OPENMP_FLAG_$(F90)) $(OPTIMIZATION_$(MAXOPTI)_$(F90)) $(STANDARD_CHECK_$(F90)) \ + -o DAMASK_spectral_AL.exe DAMASK_spectral_AL.o \ + $(COMPILED_FILES) $(LIB_DIRS) $(LIBRARIES) $(SUFFIX) +DAMASK_spectral_AL.o: DAMASK_spectral_AL.f90 CPFEM.o + $(PREFIX) $(COMPILERNAME) $(COMPILE_MAXOPTI) -c DAMASK_spectral_AL.f90 $(SUFFIX) +endif CPFEM.o: CPFEM.f90\ homogenization.o