diff --git a/code/Makefile b/code/Makefile index 6ef85e6a2..d0d69b8d3 100644 --- a/code/Makefile +++ b/code/Makefile @@ -336,7 +336,7 @@ 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_MAXOPTI =$(OPENMP_FLAG_$(F90)) $(COMPILE_OPTIONS_$(F90)) $(STANDARD_CHECK_$(F90)) $(OPTIMIZATION_$(MAXOPTI)_$(F90)) $(INCLUDE_DIRS) $(PRECISION_$(F90)) -DSpectral ################################################################################################### -COMPILED_FILES = prec.o DAMASK_spectral_interface.o IO.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 \ constitutive_dislotwin.o constitutive_j2.o constitutive_phenopowerlaw.o \ constitutive_titanmod.o constitutive_nonlocal.o constitutive_none.o constitutive.o crystallite.o \ @@ -430,10 +430,14 @@ debug.o: debug.f90 \ numerics.o numerics.o: numerics.f90 \ - IO.o + libs.o +libs.o: libs.f90 \ + IO.o + IO.o: IO.f90 \ DAMASK_spectral_interface.o + ifeq "$(F90)" "gfortran" DAMASK_spectral_interface.o: DAMASK_spectral_interface.f90 \ prec.o diff --git a/code/libs.f90 b/code/libs.f90 new file mode 100644 index 000000000..37a8bb94c --- /dev/null +++ b/code/libs.f90 @@ -0,0 +1,33 @@ +! Copyright 2011-13 Max-Planck-Institut für Eisenforschung GmbH +! +! This file is part of DAMASK, +! the Düsseldorf Advanced Material Simulation Kit. +! +! DAMASK is free software: you can redistribute it and/or modify +! it under the terms of the GNU General Public License as published by +! the Free Software Foundation, either version 3 of the License, or +! (at your option) any later version. +! +! DAMASK is distributed in the hope that it will be useful, +! but WITHOUT ANY WARRANTY; without even the implied warranty of +! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +! GNU General Public License for more details. +! +! You should have received a copy of the GNU General Public License +! along with DAMASK. If not, see . +! +!-------------------------------------------------------------------------------------------------- +! $Id$ +!-------------------------------------------------------------------------------------------------- +!> @author Martin Diehl, Max-Planck-Institut für Eisenforschung GmbH +!> @brief dummy source for inclusion of Library files +!-------------------------------------------------------------------------------------------------- + +#ifdef Spectral +#include "kdtree2.f90" +#include "IR_Precision.f90" +#include "Lib_VTK_IO.f90" +#endif + +module libs +end module libs diff --git a/code/math.f90 b/code/math.f90 index cd522716f..f0daa583f 100644 --- a/code/math.f90 +++ b/code/math.f90 @@ -16,9 +16,6 @@ ! You should have received a copy of the GNU General Public License ! along with DAMASK. If not, see . ! -#ifdef Spectral -#include "kdtree2.f90" -#endif !-------------------------------------------------------------------------------------------------- ! $Id$ !--------------------------------------------------------------------------------------------------