next try to make the makefile work in all possible cases for FEM and spectral

This commit is contained in:
Martin Diehl 2014-09-11 09:51:38 +00:00
parent 7c60c45f80
commit 4aa2c65d1e
1 changed files with 4 additions and 4 deletions

View File

@ -377,6 +377,7 @@ HOMOGENIZATION_FILES = \
##################### #####################
# Spectral Solver # Spectral Solver
##################### #####################
DAMASK_spectral.exe: IGNORE := \#
DAMASK_spectral.exe: COMPILE += -DSpectral DAMASK_spectral.exe: COMPILE += -DSpectral
DAMASK_spectral.exe: COMPILE_MAXOPTI += -DSpectral DAMASK_spectral.exe: COMPILE_MAXOPTI += -DSpectral
DAMASK_spectral.exe: MESHNAME := mesh.f90 DAMASK_spectral.exe: MESHNAME := mesh.f90
@ -421,7 +422,7 @@ DAMASK_spectral_utilities.o: DAMASK_spectral_utilities.f90 \
##################### #####################
# FEM Solver # FEM Solver
##################### #####################
DAMASK_FEM.exe: VPATH = ../private/FEM/code VPATH := ../private/FEM/code
DAMASK_FEM.exe: COMPILE += -DFEM -DmultiphysicsOut DAMASK_FEM.exe: COMPILE += -DFEM -DmultiphysicsOut
DAMASK_FEM.exe: COMPILE_MAXOPTI += -DFEM -DmultiphysicsOut DAMASK_FEM.exe: COMPILE_MAXOPTI += -DFEM -DmultiphysicsOut
DAMASK_FEM.exe: MESHNAME := ../private/FEM/code/meshFEM.f90 DAMASK_FEM.exe: MESHNAME := ../private/FEM/code/meshFEM.f90
@ -454,10 +455,9 @@ FEM_damage.o: FEM_damage.f90 \
FEM_utilities.o: FEM_utilities.f90 \ FEM_utilities.o: FEM_utilities.f90 \
CPFEM.o CPFEM.o
FEZoo.o: $(wildcard FEzoo.f90) \ FEZoo.o: $(wildcard FEZoo.f90) \
IO.o IO.o
$(IGNORE) $(PREFIX) $(COMPILERNAME) $(COMPILE) -c ../private/FEM/code/FEZoo.f90 $(SUFFIX)
CPFEM.o: CPFEM.f90\ CPFEM.o: CPFEM.f90\
homogenization.o homogenization.o