223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

more precise file names

This commit is contained in:
Martin Diehl 2016-01-24 21:05:36 +00:00
parent fab1eea6c4
commit 288ab15ef9
7 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/DAMASK_spectral.f90
View File

@ -79,9 +79,9 @@ program DAMASK_spectral_Driver
FIELD_MECH_ID, & FIELD_MECH_ID, &
FIELD_THERMAL_ID, & FIELD_THERMAL_ID, &
FIELD_DAMAGE_ID FIELD_DAMAGE_ID
use DAMASK_spectral_SolverBasicPETSC use spectral_mech_Basic
use DAMASK_spectral_SolverAL use spectral_mech_AL
use DAMASK_spectral_SolverPolarisation use spectral_mech_Polarisation
use spectral_damage use spectral_damage
use spectral_thermal use spectral_thermal

6
code/FEsolving.f90
View File

@ -162,9 +162,9 @@ subroutine FE_init
if (allocated(FEsolving_execIP)) deallocate(FEsolving_execIP) if (allocated(FEsolving_execIP)) deallocate(FEsolving_execIP)
#endif #endif
if (iand(debug_level(debug_FEsolving),debug_levelBasic) /= 0_pInt) then if (iand(debug_level(debug_FEsolving),debug_levelBasic) /= 0_pInt) then
write(6,'(a20,l1)') 'restart writing: ', restartWrite write(6,'(a21,l1)') ' restart writing: ', restartWrite
write(6,'(a20,l1)') 'restart reading: ', restartRead write(6,'(a21,l1)') ' restart reading: ', restartRead
if (restartRead) write(6,'(a,/)') 'restart Job: '//trim(modelName) if (restartRead) write(6,'(a,/)') ' restart Job: '//trim(modelName)
endif endif
end subroutine FE_init end subroutine FE_init

24
code/Makefile
View File

@ -334,16 +334,16 @@ 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
DAMASK_spectral.exe: INTERFACENAME := DAMASK_spectral_interface.f90 DAMASK_spectral.exe: INTERFACENAME := spectral_interface.f90
DAMASK_spectral.o: IGNORE := \# DAMASK_spectral.o: IGNORE := \#
DAMASK_spectral.o: COMPILE += -DSpectral DAMASK_spectral.o: COMPILE += -DSpectral
DAMASK_spectral.o: COMPILE_MAXOPTI += -DSpectral DAMASK_spectral.o: COMPILE_MAXOPTI += -DSpectral
DAMASK_spectral.o: MESHNAME := mesh.f90 DAMASK_spectral.o: MESHNAME := mesh.f90
DAMASK_spectral.o: INTERFACENAME := DAMASK_spectral_interface.f90 DAMASK_spectral.o: INTERFACENAME := spectral_interface.f90
SPECTRAL_SOLVER_FILES = DAMASK_spectral_solverAL.o DAMASK_spectral_solverBasicPETSc.o DAMASK_spectral_solverPolarisation.o \ SPECTRAL_SOLVER_FILES = spectral_mech_AL.o spectral_mech_Basic.o spectral_mech_Polarisation.o \
spectral_thermal.o spectral_damage.o spectral_thermal.o spectral_damage.o
SPECTRAL_FILES = prec.o DAMASK_interface.o IO.o libs.o numerics.o debug.o math.o \ SPECTRAL_FILES = prec.o DAMASK_interface.o IO.o libs.o numerics.o debug.o math.o \
@ -366,13 +366,13 @@ DAMASK_spectral.o: DAMASK_spectral.f90 \
$(SPECTRAL_SOLVER_FILES) $(SPECTRAL_SOLVER_FILES)
$(PREFIX) $(COMPILERNAME) $(COMPILE_MAXOPTI) -c DAMASK_spectral.f90 $(SUFFIX) $(PREFIX) $(COMPILERNAME) $(COMPILE_MAXOPTI) -c DAMASK_spectral.f90 $(SUFFIX)
DAMASK_spectral_solverAL.o: DAMASK_spectral_solverAL.f90 \ spectral_mech_AL.o: spectral_mech_AL.f90 \
spectral_utilities.o spectral_utilities.o
DAMASK_spectral_solverPolarisation.o: DAMASK_spectral_solverPolarisation.f90 \ spectral_mech_Polarisation.o: spectral_mech_Polarisation.f90 \
spectral_utilities.o spectral_utilities.o
DAMASK_spectral_solverBasicPETSc.o: DAMASK_spectral_solverBasicPETSc.f90 \ spectral_mech_Basic.o: spectral_mech_Basic.f90 \
spectral_utilities.o spectral_utilities.o
spectral_thermal.o: spectral_thermal.f90 \ spectral_thermal.o: spectral_thermal.f90 \
@ -381,7 +381,7 @@ spectral_thermal.o: spectral_thermal.f90 \
spectral_damage.o: spectral_damage.f90 \ spectral_damage.o: spectral_damage.f90 \
spectral_utilities.o spectral_utilities.o
spectral_utilities.o: spectral_utilities.f90 \ spectral_utilities.o: spectral_utilities.f90 \
CPFEM2.o CPFEM2.o
##################### #####################
@ -439,13 +439,13 @@ FEZoo.o: $(wildcard FEZoo.f90) \
$(IGNORE) $(PREFIX) $(COMPILERNAME) $(COMPILE) -c ../private/FEM/code/FEZoo.f90 $(SUFFIX) $(IGNORE) $(PREFIX) $(COMPILERNAME) $(COMPILE) -c ../private/FEM/code/FEZoo.f90 $(SUFFIX)
touch FEZoo.o touch FEZoo.o
CPFEM.o: CPFEM.f90\ CPFEM.o: CPFEM.f90 \
homogenization.o homogenization.o
CPFEM2.o: CPFEM2.f90\ CPFEM2.o: CPFEM2.f90 \
homogenization.o homogenization.o
homogenization.o: homogenization.f90\ homogenization.o: homogenization.f90 \
$(THERMAL_FILES) \ $(THERMAL_FILES) \
$(DAMAGE_FILES) \ $(DAMAGE_FILES) \
$(VACANCYFLUX_FILES) \ $(VACANCYFLUX_FILES) \
@ -619,7 +619,7 @@ IO.o: IO.f90 \
DAMASK_interface.o DAMASK_interface.o
ifeq "$(F90)" "gfortran" ifeq "$(F90)" "gfortran"
DAMASK_interface.o: DAMASK_spectral_interface.f90 \ DAMASK_interface.o: spectral_interface.f90 \
$(wildcard DAMASK_FEM_interface.f90) \ $(wildcard DAMASK_FEM_interface.f90) \
prec.o prec.o
$(PREFIX) $(COMPILERNAME) $(COMPILE) -c $(INTERFACENAME) -fall-intrinsics -o DAMASK_interface.o $(SUFFIX) $(PREFIX) $(COMPILERNAME) $(COMPILE) -c $(INTERFACENAME) -fall-intrinsics -o DAMASK_interface.o $(SUFFIX)
@ -636,7 +636,7 @@ prec.o: prec.f90
#-fno-fast-math: #-fno-fast-math:
# --> otherwise, when setting -ffast-math, isnan always evaluates to false (I would call it a bug) # --> otherwise, when setting -ffast-math, isnan always evaluates to false (I would call it a bug)
else else
DAMASK_interface.o: DAMASK_spectral_interface.f90 \ DAMASK_interface.o: spectral_interface.f90 \
$(wildcard DAMASK_FEM_interface.f90) \ $(wildcard DAMASK_FEM_interface.f90) \
prec.o prec.o
$(PREFIX) $(COMPILERNAME) $(COMPILE) -c $(INTERFACENAME) -diag-remark 7410 -stand none -warn nostderrors -o DAMASK_interface.o $(SUFFIX) $(PREFIX) $(COMPILERNAME) $(COMPILE) -c $(INTERFACENAME) -diag-remark 7410 -stand none -warn nostderrors -o DAMASK_interface.o $(SUFFIX)

0
code/DAMASK_spectral_interface.f90 → code/spectral_interface.f90
View File

4
code/DAMASK_spectral_solverAL.f90 → code/spectral_mech_AL.f90
View File

@ -6,7 +6,7 @@
!> @author Philip Eisenlohr, Max-Planck-Institut für Eisenforschung GmbH !> @author Philip Eisenlohr, Max-Planck-Institut für Eisenforschung GmbH
!> @brief AL scheme solver !> @brief AL scheme solver
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
module DAMASK_spectral_solverAL module spectral_mech_AL
use prec, only: & use prec, only: &
pInt, & pInt, &
pReal pReal
@ -713,4 +713,4 @@ subroutine AL_destroy()
end subroutine AL_destroy end subroutine AL_destroy
end module DAMASK_spectral_SolverAL end module spectral_mech_AL

4
code/DAMASK_spectral_solverBasicPETSc.f90 → code/spectral_mech_Basic.f90
View File

@ -6,7 +6,7 @@
!> @author Philip Eisenlohr, Max-Planck-Institut für Eisenforschung GmbH !> @author Philip Eisenlohr, Max-Planck-Institut für Eisenforschung GmbH
!> @brief Basic scheme PETSc solver !> @brief Basic scheme PETSc solver
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
module DAMASK_spectral_SolverBasicPETSc module spectral_mech_basic
use prec, only: & use prec, only: &
pInt, & pInt, &
pReal pReal
@ -567,4 +567,4 @@ subroutine BasicPETSc_destroy()
end subroutine BasicPETSc_destroy end subroutine BasicPETSc_destroy
end module DAMASK_spectral_SolverBasicPETSc end module spectral_mech_basic

4
code/DAMASK_spectral_solverPolarisation.f90 → code/spectral_mech_Polarisation.f90
View File

@ -6,7 +6,7 @@
!> @author Philip Eisenlohr, Max-Planck-Institut für Eisenforschung GmbH !> @author Philip Eisenlohr, Max-Planck-Institut für Eisenforschung GmbH
!> @brief Polarisation scheme solver !> @brief Polarisation scheme solver
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
module DAMASK_spectral_solverPolarisation module spectral_mech_Polarisation
use prec, only: & use prec, only: &
pInt, & pInt, &
pReal pReal
@ -710,4 +710,4 @@ subroutine Polarisation_destroy()
end subroutine Polarisation_destroy end subroutine Polarisation_destroy
end module DAMASK_spectral_SolverPolarisation end module spectral_mech_Polarisation