diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8972f7c13..516747f8b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -41,7 +41,7 @@ add_library(CHAINED_LIST OBJECT "linked_list.f90") add_dependencies(CHAINED_LIST DEBUG) list(APPEND OBJECTFILES $) -add_library(CONFIG_MATERIAL OBJECT "config_material.f90") +add_library(CONFIG_MATERIAL OBJECT "config.f90") add_dependencies(CONFIG_MATERIAL CHAINED_LIST) list(APPEND OBJECTFILES $) diff --git a/src/CPFEM.f90 b/src/CPFEM.f90 index aefa1638f..6caeaf57c 100644 --- a/src/CPFEM.f90 +++ b/src/CPFEM.f90 @@ -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,& diff --git a/src/CPFEM2.f90 b/src/CPFEM2.f90 index 20c2b8674..c66aa4089 100644 --- a/src/CPFEM2.f90 +++ b/src/CPFEM2.f90 @@ -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,& diff --git a/src/commercialFEM_fileList.f90 b/src/commercialFEM_fileList.f90 index cf2e3769a..372aeaab4 100644 --- a/src/commercialFEM_fileList.f90 +++ b/src/commercialFEM_fileList.f90 @@ -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" diff --git a/src/config_material.f90 b/src/config.f90 similarity index 98% rename from src/config_material.f90 rename to src/config.f90 index 9a7d7b59c..66c2f18bb 100644 --- a/src/config_material.f90 +++ b/src/config.f90 @@ -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 diff --git a/src/constitutive.f90 b/src/constitutive.f90 index 400670ce6..81a6f17b9 100644 --- a/src/constitutive.f90 +++ b/src/constitutive.f90 @@ -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, & diff --git a/src/crystallite.f90 b/src/crystallite.f90 index 6b348a142..92fa61619 100644 --- a/src/crystallite.f90 +++ b/src/crystallite.f90 @@ -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, & diff --git a/src/damage_local.f90 b/src/damage_local.f90 index f95a2956f..74bcb00db 100644 --- a/src/damage_local.f90 +++ b/src/damage_local.f90 @@ -71,7 +71,7 @@ subroutine damage_local_init(fileUnit) damageMapping, & damage, & damage_initialPhi - use config_material, only: & + use config, only: & material_partHomogenization implicit none diff --git a/src/damage_none.f90 b/src/damage_none.f90 index a3a1adde5..90b1acc72 100644 --- a/src/damage_none.f90 +++ b/src/damage_none.f90 @@ -26,7 +26,7 @@ subroutine damage_none_init() use IO, only: & IO_timeStamp use material - use config_material + use config implicit none integer(pInt) :: & diff --git a/src/damage_nonlocal.f90 b/src/damage_nonlocal.f90 index 6c556bb25..6b9093ef1 100644 --- a/src/damage_nonlocal.f90 +++ b/src/damage_nonlocal.f90 @@ -76,7 +76,7 @@ subroutine damage_nonlocal_init(fileUnit) damageMapping, & damage, & damage_initialPhi - use config_material, only: & + use config, only: & material_partHomogenization implicit none diff --git a/src/homogenization.f90 b/src/homogenization.f90 index 6539b19a9..b50b6ff83 100644 --- a/src/homogenization.f90 +++ b/src/homogenization.f90 @@ -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 diff --git a/src/homogenization_RGC.f90 b/src/homogenization_RGC.f90 index c48866dfe..92ea5301d 100644 --- a/src/homogenization_RGC.f90 +++ b/src/homogenization_RGC.f90 @@ -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 diff --git a/src/homogenization_isostrain.f90 b/src/homogenization_isostrain.f90 index 4c80059eb..8ee0df73d 100644 --- a/src/homogenization_isostrain.f90 +++ b/src/homogenization_isostrain.f90 @@ -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 diff --git a/src/homogenization_none.f90 b/src/homogenization_none.f90 index 90d2ab6c4..c33aabe89 100644 --- a/src/homogenization_none.f90 +++ b/src/homogenization_none.f90 @@ -29,7 +29,7 @@ subroutine homogenization_none_init() use IO, only: & IO_timeStamp use material - use config_material + use config implicit none integer(pInt) :: & diff --git a/src/hydrogenflux_cahnhilliard.f90 b/src/hydrogenflux_cahnhilliard.f90 index 95898c86d..3a42a49e1 100644 --- a/src/hydrogenflux_cahnhilliard.f90 +++ b/src/hydrogenflux_cahnhilliard.f90 @@ -82,7 +82,7 @@ subroutine hydrogenflux_cahnhilliard_init(fileUnit) hydrogenConc, & hydrogenConcRate, & hydrogenflux_initialCh - use config_material, only: & + use config, only: & material_partHomogenization, & material_partPhase diff --git a/src/hydrogenflux_isoconc.f90 b/src/hydrogenflux_isoconc.f90 index 74505fad8..836d29198 100644 --- a/src/hydrogenflux_isoconc.f90 +++ b/src/hydrogenflux_isoconc.f90 @@ -27,7 +27,7 @@ subroutine hydrogenflux_isoconc_init() use IO, only: & IO_timeStamp use material - use config_material + use config implicit none integer(pInt) :: & diff --git a/src/kinematics_cleavage_opening.f90 b/src/kinematics_cleavage_opening.f90 index 64641f150..998b19562 100644 --- a/src/kinematics_cleavage_opening.f90 +++ b/src/kinematics_cleavage_opening.f90 @@ -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: & diff --git a/src/kinematics_hydrogen_strain.f90 b/src/kinematics_hydrogen_strain.f90 index d0c282627..516ca286f 100644 --- a/src/kinematics_hydrogen_strain.f90 +++ b/src/kinematics_hydrogen_strain.f90 @@ -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 diff --git a/src/kinematics_slipplane_opening.f90 b/src/kinematics_slipplane_opening.f90 index 9f20d8594..61ff84b9f 100644 --- a/src/kinematics_slipplane_opening.f90 +++ b/src/kinematics_slipplane_opening.f90 @@ -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: & diff --git a/src/kinematics_thermal_expansion.f90 b/src/kinematics_thermal_expansion.f90 index bc70d57b2..3cec1da4c 100644 --- a/src/kinematics_thermal_expansion.f90 +++ b/src/kinematics_thermal_expansion.f90 @@ -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 diff --git a/src/kinematics_vacancy_strain.f90 b/src/kinematics_vacancy_strain.f90 index 7ee8312dc..7ecc7fe6e 100644 --- a/src/kinematics_vacancy_strain.f90 +++ b/src/kinematics_vacancy_strain.f90 @@ -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 diff --git a/src/lattice.f90 b/src/lattice.f90 index 374057381..386001c76 100644 --- a/src/lattice.f90 +++ b/src/lattice.f90 @@ -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 diff --git a/src/material.f90 b/src/material.f90 index 1a1c5c5a0..edb0b9ef1 100644 --- a/src/material.f90 +++ b/src/material.f90 @@ -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 diff --git a/src/plastic_disloUCLA.f90 b/src/plastic_disloUCLA.f90 index f010b3a00..7c4d87fff 100644 --- a/src/plastic_disloUCLA.f90 +++ b/src/plastic_disloUCLA.f90 @@ -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: & diff --git a/src/plastic_dislotwin.f90 b/src/plastic_dislotwin.f90 index 46f833a7f..2ed8ebfdf 100644 --- a/src/plastic_dislotwin.f90 +++ b/src/plastic_dislotwin.f90 @@ -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: & diff --git a/src/plastic_isotropic.f90 b/src/plastic_isotropic.f90 index 916f43ebd..ed1ac7f54 100644 --- a/src/plastic_isotropic.f90 +++ b/src/plastic_isotropic.f90 @@ -98,7 +98,7 @@ use IO PLASTICITY_ISOTROPIC_ID, & material_phase, & plasticState - use config_material, only: & + use config, only: & MATERIAL_partPhase, & phaseConfig diff --git a/src/plastic_kinematichardening.f90 b/src/plastic_kinematichardening.f90 index 09eebe460..06a327247 100644 --- a/src/plastic_kinematichardening.f90 +++ b/src/plastic_kinematichardening.f90 @@ -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: & diff --git a/src/plastic_nonlocal.f90 b/src/plastic_nonlocal.f90 index eb75cee96..41666a34c 100644 --- a/src/plastic_nonlocal.f90 +++ b/src/plastic_nonlocal.f90 @@ -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 diff --git a/src/plastic_phenopowerlaw.f90 b/src/plastic_phenopowerlaw.f90 index 8ac436ea2..8a6d8b145 100644 --- a/src/plastic_phenopowerlaw.f90 +++ b/src/plastic_phenopowerlaw.f90 @@ -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: & diff --git a/src/porosity_none.f90 b/src/porosity_none.f90 index b94e5ca94..d8175cd9e 100644 --- a/src/porosity_none.f90 +++ b/src/porosity_none.f90 @@ -27,7 +27,7 @@ subroutine porosity_none_init() use IO, only: & IO_timeStamp use material - use config_material + use config implicit none integer(pInt) :: & diff --git a/src/porosity_phasefield.f90 b/src/porosity_phasefield.f90 index a37538c37..1975ba64c 100644 --- a/src/porosity_phasefield.f90 +++ b/src/porosity_phasefield.f90 @@ -78,7 +78,7 @@ subroutine porosity_phasefield_init(fileUnit) porosityMapping, & porosity, & porosity_initialPhi - use config_material, only: & + use config, only: & material_partHomogenization, & material_partPhase diff --git a/src/source_damage_anisoBrittle.f90 b/src/source_damage_anisoBrittle.f90 index e8d7f62ec..6b222c37c 100644 --- a/src/source_damage_anisoBrittle.f90 +++ b/src/source_damage_anisoBrittle.f90 @@ -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: & diff --git a/src/source_damage_anisoDuctile.f90 b/src/source_damage_anisoDuctile.f90 index c99647939..5978960fb 100644 --- a/src/source_damage_anisoDuctile.f90 +++ b/src/source_damage_anisoDuctile.f90 @@ -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: & diff --git a/src/source_damage_isoBrittle.f90 b/src/source_damage_isoBrittle.f90 index bb4497885..041761afe 100644 --- a/src/source_damage_isoBrittle.f90 +++ b/src/source_damage_isoBrittle.f90 @@ -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: & diff --git a/src/source_damage_isoDuctile.f90 b/src/source_damage_isoDuctile.f90 index 6f3fa3f89..e843be728 100644 --- a/src/source_damage_isoDuctile.f90 +++ b/src/source_damage_isoDuctile.f90 @@ -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 diff --git a/src/source_thermal_dissipation.f90 b/src/source_thermal_dissipation.f90 index b9589d62b..994d26b41 100644 --- a/src/source_thermal_dissipation.f90 +++ b/src/source_thermal_dissipation.f90 @@ -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: & diff --git a/src/source_thermal_externalheat.f90 b/src/source_thermal_externalheat.f90 index 39a23b71b..b7151aece 100644 --- a/src/source_thermal_externalheat.f90 +++ b/src/source_thermal_externalheat.f90 @@ -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: & diff --git a/src/source_vacancy_irradiation.f90 b/src/source_vacancy_irradiation.f90 index bc5f9a620..67b4cabcf 100644 --- a/src/source_vacancy_irradiation.f90 +++ b/src/source_vacancy_irradiation.f90 @@ -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: & diff --git a/src/source_vacancy_phenoplasticity.f90 b/src/source_vacancy_phenoplasticity.f90 index 0b543d19a..e20d8ec06 100644 --- a/src/source_vacancy_phenoplasticity.f90 +++ b/src/source_vacancy_phenoplasticity.f90 @@ -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: & diff --git a/src/source_vacancy_thermalfluc.f90 b/src/source_vacancy_thermalfluc.f90 index 39890e2ee..cea52aa75 100644 --- a/src/source_vacancy_thermalfluc.f90 +++ b/src/source_vacancy_thermalfluc.f90 @@ -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: & diff --git a/src/thermal_adiabatic.f90 b/src/thermal_adiabatic.f90 index 2b9a5ae59..6a70ca7ee 100644 --- a/src/thermal_adiabatic.f90 +++ b/src/thermal_adiabatic.f90 @@ -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, & diff --git a/src/thermal_conduction.f90 b/src/thermal_conduction.f90 index 83c776b6b..16497040b 100644 --- a/src/thermal_conduction.f90 +++ b/src/thermal_conduction.f90 @@ -78,7 +78,7 @@ subroutine thermal_conduction_init(fileUnit) thermal_initialT, & temperature, & temperatureRate - use config_material, only: & + use config, only: & material_partHomogenization implicit none diff --git a/src/thermal_isothermal.f90 b/src/thermal_isothermal.f90 index 17e82c606..fb518fe24 100644 --- a/src/thermal_isothermal.f90 +++ b/src/thermal_isothermal.f90 @@ -27,7 +27,7 @@ subroutine thermal_isothermal_init() use IO, only: & IO_timeStamp use material - use config_material + use config implicit none integer(pInt) :: & diff --git a/src/vacancyflux_cahnhilliard.f90 b/src/vacancyflux_cahnhilliard.f90 index 5ea5c908a..cde2cb233 100644 --- a/src/vacancyflux_cahnhilliard.f90 +++ b/src/vacancyflux_cahnhilliard.f90 @@ -92,7 +92,7 @@ subroutine vacancyflux_cahnhilliard_init(fileUnit) vacancyConc, & vacancyConcRate, & vacancyflux_initialCv - use config_material, only: & + use config, only: & material_partPhase, & material_partHomogenization diff --git a/src/vacancyflux_isochempot.f90 b/src/vacancyflux_isochempot.f90 index 6216c03cf..761a0ba22 100644 --- a/src/vacancyflux_isochempot.f90 +++ b/src/vacancyflux_isochempot.f90 @@ -75,7 +75,7 @@ subroutine vacancyflux_isochempot_init(fileUnit) vacancyConc, & vacancyConcRate, & vacancyflux_initialCv - use config_material, only: & + use config, only: & material_partHomogenization implicit none diff --git a/src/vacancyflux_isoconc.f90 b/src/vacancyflux_isoconc.f90 index bc66e2df9..135509aa1 100644 --- a/src/vacancyflux_isoconc.f90 +++ b/src/vacancyflux_isoconc.f90 @@ -27,7 +27,7 @@ subroutine vacancyflux_isoconc_init() use IO, only: & IO_timeStamp use material - use config_material + use config implicit none integer(pInt) :: &