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

more general name (should include parsing of debug and numerics)

This commit is contained in:
Martin Diehl 2018-06-14 06:39:49 +02:00
parent a11c6e0fea
commit 9c12ce5539
46 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -41,7 +41,7 @@ add_library(CHAINED_LIST OBJECT "linked_list.f90")
add_dependencies(CHAINED_LIST DEBUG)
list(APPEND OBJECTFILES $<TARGET_OBJECTS:CHAINED_LIST>)
add_library(CONFIG_MATERIAL OBJECT "config_material.f90")
add_library(CONFIG_MATERIAL OBJECT "config.f90")
add_dependencies(CONFIG_MATERIAL CHAINED_LIST)
list(APPEND OBJECTFILES $<TARGET_OBJECTS:CONFIG_MATERIAL>)

10
src/CPFEM.f90
View File

@ -62,8 +62,8 @@ subroutine CPFEM_initAll(el,ip)
numerics_init
use debug, only: &
debug_init
use config_material, only: &
config_material_init
use config, only: &
config_init
use FEsolving, only: &
FE_init
use math, only: &
@ -95,7 +95,7 @@ subroutine CPFEM_initAll(el,ip)
call IO_init
call numerics_init
call debug_init
call config_material_init
call config_init
call math_init
call FE_init
call mesh_init(ip, el) ! pass on coordinates to alter calcMode of first ip
@ -147,7 +147,7 @@ subroutine CPFEM_init
homogState, &
phase_plasticity, &
plasticState
use config_material, only: &
use config, only: &
material_Nhomogenization
use crystallite, only: &
crystallite_F0, &
@ -315,7 +315,7 @@ subroutine CPFEM_general(mode, parallelExecution, ffn, ffn1, temperature_inp, dt
THERMAL_conduction_ID, &
phase_Nsources, &
material_homog
use config_material, only: &
use config, only: &
material_Nhomogenization
use crystallite, only: &
crystallite_partionedF,&

10
src/CPFEM2.f90
View File

@ -27,8 +27,8 @@ subroutine CPFEM_initAll(el,ip)
numerics_init
use debug, only: &
debug_init
use config_material, only: &
config_material_init
use config, only: &
config_init
use FEsolving, only: &
FE_init
use math, only: &
@ -66,7 +66,7 @@ subroutine CPFEM_initAll(el,ip)
#endif
call numerics_init
call debug_init
call config_material_init
call config_init
call math_init
call FE_init
call mesh_init(ip, el) ! pass on coordinates to alter calcMode of first ip
@ -112,7 +112,7 @@ subroutine CPFEM_init
homogState, &
phase_plasticity, &
plasticState
use config_material, only: &
use config, only: &
material_Nhomogenization
use crystallite, only: &
crystallite_F0, &
@ -233,7 +233,7 @@ subroutine CPFEM_age()
material_phase, &
phase_plasticity, &
phase_Nsources
use config_material, only: &
use config, only: &
material_Nhomogenization
use crystallite, only: &
crystallite_partionedF,&

2
src/commercialFEM_fileList.f90
View File

@ -7,7 +7,7 @@
#include "numerics.f90"
#include "debug.f90"
#include "linked_list.f90"
#include "config_material.f90"
#include "config.f90"
#include "math.f90"
#include "FEsolving.f90"
#include "mesh.f90"

10
src/config_material.f90 → src/config.f90
View File

@ -5,7 +5,7 @@
!! precedence over material.config. Stores the raw strings and the positions of delimiters for the
!! parts 'homogenization', 'crystallite', 'phase', 'texture', and 'microstucture'
!--------------------------------------------------------------------------------------------------
module config_material
module config
use linked_list
use prec, only: &
pReal, &
@ -48,11 +48,11 @@ module config_material
MATERIAL_configFile = 'material.config', & !< generic name for material configuration file
MATERIAL_localFileExt = 'materialConfig' !< extension of solver job name depending material configuration file
public :: config_material_init
public :: config_init
contains
subroutine config_material_init()
subroutine config_init()
#if defined(__GFORTRAN__) || __INTEL_COMPILER >= 1800
use, intrinsic :: iso_fortran_env, only: &
compiler_version, &
@ -136,7 +136,7 @@ subroutine config_material_init()
if (material_Ntexture < 1_pInt) call IO_error(160_pInt,ext_msg=material_partTexture)
end subroutine config_material_init
end subroutine config_init
!--------------------------------------------------------------------------------------------------
!> @brief parses the homogenization part in the material configuration file
@ -202,4 +202,4 @@ subroutine parseFile(line,&
end if
end subroutine parseFile
end module config_material
end module config

2
src/constitutive.f90
View File

@ -59,7 +59,7 @@ subroutine constitutive_init()
IO_timeStamp
use mesh, only: &
FE_geomtype
use config_material, only: &
use config, only: &
material_Nphase, &
material_localFileExt, &
phase_name, &

4
src/crystallite.f90
View File

@ -171,7 +171,7 @@ subroutine crystallite_init
IO_write_jobFile, &
IO_error
use material
use config_material
use config
use constitutive, only: &
constitutive_initialFi, &
constitutive_microstructure ! derived (shortcut) quantities of given state
@ -1238,7 +1238,7 @@ subroutine crystallite_integrateStateRK4()
sourceState, &
phase_Nsources, &
phaseAt, phasememberAt
use config_material, only: &
use config, only: &
material_Nphase
use constitutive, only: &
constitutive_collectDotState, &

2
src/damage_local.f90
View File

@ -71,7 +71,7 @@ subroutine damage_local_init(fileUnit)
damageMapping, &
damage, &
damage_initialPhi
use config_material, only: &
use config, only: &
material_partHomogenization
implicit none

2
src/damage_none.f90
View File

@ -26,7 +26,7 @@ subroutine damage_none_init()
use IO, only: &
IO_timeStamp
use material
use config_material
use config
implicit none
integer(pInt) :: &

2
src/damage_nonlocal.f90
View File

@ -76,7 +76,7 @@ subroutine damage_nonlocal_init(fileUnit)
damageMapping, &
damage, &
damage_initialPhi
use config_material, only: &
use config, only: &
material_partHomogenization
implicit none

2
src/homogenization.f90
View File

@ -101,7 +101,7 @@ subroutine homogenization_init
crystallite_maxSizePostResults
#endif
use material
use config_material
use config
use homogenization_none
use homogenization_isostrain
use homogenization_RGC

2
src/homogenization_RGC.f90
View File

@ -100,7 +100,7 @@ subroutine homogenization_RGC_init(fileUnit)
FE_geomtype
use IO
use material
use config_material
use config
implicit none
integer(pInt), intent(in) :: fileUnit !< file pointer to material configuration

2
src/homogenization_isostrain.f90
View File

@ -62,7 +62,7 @@ subroutine homogenization_isostrain_init(fileUnit)
debug_levelBasic
use IO
use material
use config_material
use config
implicit none
integer(pInt), intent(in) :: fileUnit

2
src/homogenization_none.f90
View File

@ -29,7 +29,7 @@ subroutine homogenization_none_init()
use IO, only: &
IO_timeStamp
use material
use config_material
use config
implicit none
integer(pInt) :: &

2
src/hydrogenflux_cahnhilliard.f90
View File

@ -82,7 +82,7 @@ subroutine hydrogenflux_cahnhilliard_init(fileUnit)
hydrogenConc, &
hydrogenConcRate, &
hydrogenflux_initialCh
use config_material, only: &
use config, only: &
material_partHomogenization, &
material_partPhase

2
src/hydrogenflux_isoconc.f90
View File

@ -27,7 +27,7 @@ subroutine hydrogenflux_isoconc_init()
use IO, only: &
IO_timeStamp
use material
use config_material
use config
implicit none
integer(pInt) :: &

2
src/kinematics_cleavage_opening.f90
View File

@ -79,7 +79,7 @@ subroutine kinematics_cleavage_opening_init(fileUnit)
phase_Noutput, &
KINEMATICS_cleavage_opening_label, &
KINEMATICS_cleavage_opening_ID
use config_material, only: &
use config, only: &
material_Nphase, &
MATERIAL_partPhase
use lattice, only: &

2
src/kinematics_hydrogen_strain.f90
View File

@ -69,7 +69,7 @@ subroutine kinematics_hydrogen_strain_init(fileUnit)
phase_Noutput, &
KINEMATICS_hydrogen_strain_label, &
KINEMATICS_hydrogen_strain_ID
use config_material, only: &
use config, only: &
material_Nphase, &
MATERIAL_partPhase

2
src/kinematics_slipplane_opening.f90
View File

@ -79,7 +79,7 @@ subroutine kinematics_slipplane_opening_init(fileUnit)
phase_Noutput, &
KINEMATICS_slipplane_opening_label, &
KINEMATICS_slipplane_opening_ID
use config_material, only: &
use config, only: &
material_Nphase, &
MATERIAL_partPhase
use lattice, only: &

2
src/kinematics_thermal_expansion.f90
View File

@ -69,7 +69,7 @@ subroutine kinematics_thermal_expansion_init(fileUnit)
phase_Noutput, &
KINEMATICS_thermal_expansion_label, &
KINEMATICS_thermal_expansion_ID
use config_material, only: &
use config, only: &
material_Nphase, &
MATERIAL_partPhase

2
src/kinematics_vacancy_strain.f90
View File

@ -69,7 +69,7 @@ subroutine kinematics_vacancy_strain_init(fileUnit)
phase_Noutput, &
KINEMATICS_vacancy_strain_label, &
KINEMATICS_vacancy_strain_ID
use config_material, only: &
use config, only: &
material_Nphase, &
MATERIAL_partPhase

2
src/lattice.f90
View File

@ -1263,7 +1263,7 @@ subroutine lattice_init
IO_stringPos, &
IO_stringValue, &
IO_floatValue
use config_material, only: &
use config, only: &
material_configfile, &
material_localFileExt, &
material_partPhase

4
src/material.f90
View File

@ -7,7 +7,7 @@
!! 'phase', 'texture', and 'microstucture'
!--------------------------------------------------------------------------------------------------
module material
use config_material
use config
use linked_list
use prec, only: &
pReal, &
@ -508,7 +508,7 @@ end subroutine material_init
!> @brief parses the homogenization part from the material configuration
!--------------------------------------------------------------------------------------------------
subroutine material_parseHomogenization
use config_material, only : &
use config, only : &
homogenizationConfig
use IO, only: &
IO_error

2
src/plastic_disloUCLA.f90
View File

@ -153,7 +153,7 @@ subroutine plastic_disloUCLA_init(fileUnit)
PLASTICITY_DISLOUCLA_ID, &
material_phase, &
plasticState
use config_material, only: &
use config, only: &
MATERIAL_partPhase
use lattice
use numerics,only: &

2
src/plastic_dislotwin.f90
View File

@ -240,7 +240,7 @@ subroutine plastic_dislotwin_init(fileUnit)
PLASTICITY_DISLOTWIN_ID, &
material_phase, &
plasticState
use config_material, only: &
use config, only: &
MATERIAL_partPhase
use lattice
use numerics,only: &

2
src/plastic_isotropic.f90
View File

@ -98,7 +98,7 @@ use IO
PLASTICITY_ISOTROPIC_ID, &
material_phase, &
plasticState
use config_material, only: &
use config, only: &
MATERIAL_partPhase, &
phaseConfig

2
src/plastic_kinematichardening.f90
View File

@ -146,7 +146,7 @@ subroutine plastic_kinehardening_init(fileUnit)
phase_Noutput, &
material_phase, &
plasticState
use config_material, only: &
use config, only: &
MATERIAL_partPhase
use lattice
use numerics,only: &

2
src/plastic_nonlocal.f90
View File

@ -292,7 +292,7 @@ use material, only: phase_plasticity, &
PLASTICITY_NONLOCAL_ID, &
plasticState, &
material_phase
use config_material, only: MATERIAL_partPhase
use config, only: MATERIAL_partPhase
use lattice
use numerics,only: &
numerics_integrator

2
src/plastic_phenopowerlaw.f90
View File

@ -158,7 +158,7 @@ subroutine plastic_phenopowerlaw_init(fileUnit)
PLASTICITY_PHENOPOWERLAW_ID, &
material_phase, &
plasticState
use config_material, only: &
use config, only: &
MATERIAL_partPhase
use lattice
use numerics,only: &

2
src/porosity_none.f90
View File

@ -27,7 +27,7 @@ subroutine porosity_none_init()
use IO, only: &
IO_timeStamp
use material
use config_material
use config
implicit none
integer(pInt) :: &

2
src/porosity_phasefield.f90
View File

@ -78,7 +78,7 @@ subroutine porosity_phasefield_init(fileUnit)
porosityMapping, &
porosity, &
porosity_initialPhi
use config_material, only: &
use config, only: &
material_partHomogenization, &
material_partPhase

2
src/source_damage_anisoBrittle.f90
View File

@ -93,7 +93,7 @@ subroutine source_damage_anisoBrittle_init(fileUnit)
SOURCE_damage_anisoBrittle_ID, &
material_phase, &
sourceState
use config_material, only: &
use config, only: &
material_Nphase, &
MATERIAL_partPhase
use numerics,only: &

2
src/source_damage_anisoDuctile.f90
View File

@ -97,7 +97,7 @@ subroutine source_damage_anisoDuctile_init(fileUnit)
SOURCE_damage_anisoDuctile_ID, &
material_phase, &
sourceState
use config_material, only: &
use config, only: &
material_Nphase, &
MATERIAL_partPhase
use numerics,only: &

2
src/source_damage_isoBrittle.f90
View File

@ -83,7 +83,7 @@ subroutine source_damage_isoBrittle_init(fileUnit)
SOURCE_damage_isoBrittle_ID, &
material_phase, &
sourceState
use config_material, only: &
use config, only: &
material_Nphase, &
MATERIAL_partPhase
use numerics,only: &

2
src/source_damage_isoDuctile.f90
View File

@ -83,7 +83,7 @@ subroutine source_damage_isoDuctile_init(fileUnit)
SOURCE_damage_isoDuctile_ID, &
material_phase, &
sourceState
use config_material, only: &
use config, only: &
material_Nphase, &
MATERIAL_partPhase

2
src/source_thermal_dissipation.f90
View File

@ -69,7 +69,7 @@ subroutine source_thermal_dissipation_init(fileUnit)
SOURCE_thermal_dissipation_ID, &
material_phase, &
sourceState
use config_material, only: &
use config, only: &
material_Nphase, &
MATERIAL_partPhase
use numerics,only: &

2
src/source_thermal_externalheat.f90
View File

@ -75,7 +75,7 @@ subroutine source_thermal_externalheat_init(fileUnit)
SOURCE_thermal_externalheat_ID, &
material_phase, &
sourceState
use config_material, only: &
use config, only: &
material_Nphase, &
MATERIAL_partPhase
use numerics,only: &

2
src/source_vacancy_irradiation.f90
View File

@ -71,7 +71,7 @@ subroutine source_vacancy_irradiation_init(fileUnit)
SOURCE_vacancy_irradiation_ID, &
material_phase, &
sourceState
use config_material, only: &
use config, only: &
material_Nphase, &
MATERIAL_partPhase
use numerics,only: &

2
src/source_vacancy_phenoplasticity.f90
View File

@ -69,7 +69,7 @@ subroutine source_vacancy_phenoplasticity_init(fileUnit)
SOURCE_vacancy_phenoplasticity_ID, &
material_phase, &
sourceState
use config_material, only: &
use config, only: &
material_Nphase, &
MATERIAL_partPhase
use numerics,only: &

2
src/source_vacancy_thermalfluc.f90
View File

@ -73,7 +73,7 @@ subroutine source_vacancy_thermalfluc_init(fileUnit)
SOURCE_vacancy_thermalfluc_ID, &
material_phase, &
sourceState
use config_material, only: &
use config, only: &
material_Nphase, &
MATERIAL_partPhase
use numerics,only: &

2
src/thermal_adiabatic.f90
View File

@ -64,7 +64,7 @@ subroutine thermal_adiabatic_init(fileUnit)
IO_error, &
IO_timeStamp, &
IO_EOF
use config_material, only: &
use config, only: &
material_partHomogenization
use material, only: &
thermal_type, &

2
src/thermal_conduction.f90
View File

@ -78,7 +78,7 @@ subroutine thermal_conduction_init(fileUnit)
thermal_initialT, &
temperature, &
temperatureRate
use config_material, only: &
use config, only: &
material_partHomogenization
implicit none

2
src/thermal_isothermal.f90
View File

@ -27,7 +27,7 @@ subroutine thermal_isothermal_init()
use IO, only: &
IO_timeStamp
use material
use config_material
use config
implicit none
integer(pInt) :: &

2
src/vacancyflux_cahnhilliard.f90
View File

@ -92,7 +92,7 @@ subroutine vacancyflux_cahnhilliard_init(fileUnit)
vacancyConc, &
vacancyConcRate, &
vacancyflux_initialCv
use config_material, only: &
use config, only: &
material_partPhase, &
material_partHomogenization

2
src/vacancyflux_isochempot.f90
View File

@ -75,7 +75,7 @@ subroutine vacancyflux_isochempot_init(fileUnit)
vacancyConc, &
vacancyConcRate, &
vacancyflux_initialCv
use config_material, only: &
use config, only: &
material_partHomogenization
implicit none

2
src/vacancyflux_isoconc.f90
View File

@ -27,7 +27,7 @@ subroutine vacancyflux_isoconc_init()
use IO, only: &
IO_timeStamp
use material
use config_material
use config
implicit none
integer(pInt) :: &