corrected dependencies for thermal and damage modules in makefile

This commit is contained in:
Pratheek Shanthraj 2014-07-03 13:32:21 +00:00
parent 27d861decc
commit 3ee743ce66
1 changed files with 13 additions and 17 deletions

View File

@ -345,19 +345,12 @@ PRECISION_gfortran :=-fdefault-real-8 -fdefault-double-8 -DFLOAT=8 -DINT=4
COMPILE =$(OPENMP_FLAG_$(F90)) $(COMPILE_OPTIONS_$(F90)) $(STANDARD_CHECK_$(F90)) $(OPTIMIZATION_$(OPTI)_$(F90)) $(INCLUDE_DIRS) $(PRECISION_$(F90)) -DSpectral COMPILE =$(OPENMP_FLAG_$(F90)) $(COMPILE_OPTIONS_$(F90)) $(STANDARD_CHECK_$(F90)) $(OPTIMIZATION_$(OPTI)_$(F90)) $(INCLUDE_DIRS) $(PRECISION_$(F90)) -DSpectral
COMPILE_MAXOPTI =$(OPENMP_FLAG_$(F90)) $(COMPILE_OPTIONS_$(F90)) $(STANDARD_CHECK_$(F90)) $(OPTIMIZATION_$(MAXOPTI)_$(F90)) $(INCLUDE_DIRS) $(PRECISION_$(F90)) -DSpectral COMPILE_MAXOPTI =$(OPENMP_FLAG_$(F90)) $(COMPILE_OPTIONS_$(F90)) $(STANDARD_CHECK_$(F90)) $(OPTIMIZATION_$(MAXOPTI)_$(F90)) $(INCLUDE_DIRS) $(PRECISION_$(F90)) -DSpectral
################################################################################################### ###################################################################################################
CONSTITUTIVE_FILES = constitutive_thermal.o \
constitutive_damage.o \
constitutive_nonlocal.o \
constitutive_titanmod.o \
constitutive_dislotwin.o \
constitutive_phenopowerlaw.o \
constitutive_j2.o \
constitutive_none.o
COMPILED_FILES = prec.o DAMASK_spectral_interface.o IO.o libs.o numerics.o debug.o math.o \ COMPILED_FILES = prec.o DAMASK_spectral_interface.o IO.o libs.o numerics.o debug.o math.o \
FEsolving.o mesh.o material.o lattice.o \ FEsolving.o mesh.o material.o lattice.o \
damage_none.o damage_gradient.o thermal_none.o thermal_conduction.o thermal_adiabatic.o \ damage_none.o damage_gradient.o thermal_none.o thermal_conduction.o \
$(CONSTITUTIVE_FILES) constitutive.o crystallite.o \ constitutive_dislotwin.o constitutive_j2.o constitutive_phenopowerlaw.o \
constitutive_titanmod.o constitutive_nonlocal.o constitutive_none.o \
constitutive_damage.o constitutive_thermal.o constitutive.o crystallite.o \
homogenization_RGC.o homogenization_isostrain.o homogenization_none.o homogenization.o CPFEM.o \ homogenization_RGC.o homogenization_isostrain.o homogenization_none.o homogenization.o CPFEM.o \
DAMASK_spectral_utilities.o DAMASK_spectral_solverBasic.o \ DAMASK_spectral_utilities.o DAMASK_spectral_solverBasic.o \
@ -409,10 +402,17 @@ homogenization_none.o: homogenization_none.f90 \
crystallite.o crystallite.o
crystallite.o: crystallite.f90 \ crystallite.o: crystallite.f90 \
constitutive.o constitutive.o \
constitutive_thermal.o \
constitutive_damage.o
constitutive.o: constitutive.f90 \ constitutive.o: constitutive.f90 \
$(CONSTITUTIVE_FILES) constitutive_nonlocal.o \
constitutive_titanmod.o \
constitutive_dislotwin.o \
constitutive_phenopowerlaw.o \
constitutive_j2.o \
constitutive_none.o
constitutive_nonlocal.o: constitutive_nonlocal.f90 \ constitutive_nonlocal.o: constitutive_nonlocal.f90 \
lattice.o lattice.o
@ -444,7 +444,6 @@ damage_gradient.o: damage_gradient.f90 \
constitutive_thermal.o: constitutive_thermal.f90 \ constitutive_thermal.o: constitutive_thermal.f90 \
thermal_none.o \ thermal_none.o \
thermal_adiabatic.o \
thermal_conduction.o thermal_conduction.o
thermal_none.o: thermal_none.f90 \ thermal_none.o: thermal_none.f90 \
@ -453,9 +452,6 @@ thermal_none.o: thermal_none.f90 \
thermal_conduction.o: thermal_conduction.f90 \ thermal_conduction.o: thermal_conduction.f90 \
lattice.o \ lattice.o \
thermal_adiabatic.o: thermal_adiabatic.f90 \
lattice.o \
lattice.o: lattice.f90 \ lattice.o: lattice.f90 \
material.o material.o