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

constants/parameters in capitals

This commit is contained in:
Martin Diehl 2020-03-17 08:17:14 +01:00
parent b4ed508745
commit e1bd49a12b
5 changed files with 90 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/grid/spectral_utilities.f90
View File

@ -27,12 +27,11 @@ module spectral_utilities
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
! field labels information ! field labels information
enum, bind(c) enum, bind(c); enumerator :: &
enumerator :: & FIELD_UNDEFINED_ID, &
FIELD_UNDEFINED_ID, & FIELD_MECH_ID, &
FIELD_MECH_ID, & FIELD_THERMAL_ID, &
FIELD_THERMAL_ID, & FIELD_DAMAGE_ID
FIELD_DAMAGE_ID
end enum end enum
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
@ -126,11 +125,10 @@ module spectral_utilities
type(tNumerics) :: num ! numerics parameters. Better name? type(tNumerics) :: num ! numerics parameters. Better name?
enum, bind(c) enum, bind(c); enumerator :: &
enumerator :: & DERIVATIVE_CONTINUOUS_ID, &
DERIVATIVE_CONTINUOUS_ID, & DERIVATIVE_CENTRAL_DIFF_ID, &
DERIVATIVE_CENTRAL_DIFF_ID, & DERIVATIVE_FWBW_DIFF_ID
DERIVATIVE_FWBW_DIFF_ID
end enum end enum
integer(kind(DERIVATIVE_CONTINUOUS_ID)) :: & integer(kind(DERIVATIVE_CONTINUOUS_ID)) :: &

11
src/homogenization_mech_isostrain.f90
View File

@ -6,10 +6,9 @@
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
submodule(homogenization) homogenization_mech_isostrain submodule(homogenization) homogenization_mech_isostrain
enum, bind(c) enum, bind(c); enumerator :: &
enumerator :: & parallel_ID, &
parallel_ID, & average_ID
average_ID
end enum end enum
type :: tParameters !< container type for internal constitutive parameters type :: tParameters !< container type for internal constitutive parameters
@ -36,7 +35,7 @@ module subroutine mech_isostrain_init
character(len=pStringLen) :: & character(len=pStringLen) :: &
tag = '' tag = ''
write(6,'(/,a)') ' <<<+- homogenization_'//HOMOGENIZATION_ISOSTRAIN_label//' init -+>>>' write(6,'(/,a)') ' <<<+- homogenization_'//HOMOGENIZATION_ISOSTRAIN_LABEL//' init -+>>>'
Ninstance = count(homogenization_type == HOMOGENIZATION_ISOSTRAIN_ID) Ninstance = count(homogenization_type == HOMOGENIZATION_ISOSTRAIN_ID)
if (iand(debug_level(debug_HOMOGENIZATION),debug_levelBasic) /= 0) & if (iand(debug_level(debug_HOMOGENIZATION),debug_levelBasic) /= 0) &
@ -58,7 +57,7 @@ module subroutine mech_isostrain_init
case ('avg') case ('avg')
prm%mapping = average_ID prm%mapping = average_ID
case default case default
call IO_error(211,ext_msg=trim(tag)//' ('//HOMOGENIZATION_isostrain_label//')') call IO_error(211,ext_msg=trim(tag)//' ('//HOMOGENIZATION_ISOSTRAIN_LABEL//')')
end select end select
NofMyHomog = count(material_homogenizationAt == h) NofMyHomog = count(material_homogenizationAt == h)

16
src/lattice.f90
View File

@ -381,14 +381,14 @@ module lattice
],pReal),shape(ORT_SYSTEMCLEAVAGE)) ],pReal),shape(ORT_SYSTEMCLEAVAGE))
enum, bind(c) enum, bind(c); enumerator :: &
enumerator :: lattice_UNDEFINED_ID, & lattice_UNDEFINED_ID, &
lattice_ISO_ID, & lattice_ISO_ID, &
lattice_FCC_ID, & lattice_FCC_ID, &
lattice_BCC_ID, & lattice_BCC_ID, &
lattice_BCT_ID, & lattice_BCT_ID, &
lattice_HEX_ID, & lattice_HEX_ID, &
lattice_ORT_ID lattice_ORT_ID
end enum end enum
! SHOULD NOT BE PART OF LATTICE BEGIN ! SHOULD NOT BE PART OF LATTICE BEGIN

122
src/material.f90
View File

@ -47,42 +47,40 @@ module material
HOMOGENIZATION_isostrain_label = 'isostrain', & HOMOGENIZATION_isostrain_label = 'isostrain', &
HOMOGENIZATION_rgc_label = 'rgc' HOMOGENIZATION_rgc_label = 'rgc'
enum, bind(c); enumerator :: &
ELASTICITY_UNDEFINED_ID ,&
enum, bind(c) ELASTICITY_HOOKE_ID ,&
enumerator :: ELASTICITY_undefined_ID, & PLASTICITY_UNDEFINED_ID ,&
ELASTICITY_hooke_ID, & PLASTICITY_NONE_ID, &
PLASTICITY_undefined_ID, & PLASTICITY_ISOTROPIC_ID, &
PLASTICITY_none_ID, & PLASTICITY_PHENOPOWERLAW_ID, &
PLASTICITY_isotropic_ID, & PLASTICITY_KINEHARDENING_ID, &
PLASTICITY_phenopowerlaw_ID, & PLASTICITY_DISLOTWIN_ID, &
PLASTICITY_kinehardening_ID, & PLASTICITY_DISLOUCLA_ID, &
PLASTICITY_dislotwin_ID, & PLASTICITY_NONLOCAL_ID, &
PLASTICITY_disloucla_ID, & SOURCE_UNDEFINED_ID ,&
PLASTICITY_nonlocal_ID, & SOURCE_THERMAL_DISSIPATION_ID, &
SOURCE_undefined_ID, & SOURCE_THERMAL_EXTERNALHEAT_ID, &
SOURCE_thermal_dissipation_ID, & SOURCE_DAMAGE_ISOBRITTLE_ID, &
SOURCE_thermal_externalheat_ID, & SOURCE_DAMAGE_ISODUCTILE_ID, &
SOURCE_damage_isoBrittle_ID, & SOURCE_DAMAGE_ANISOBRITTLE_ID, &
SOURCE_damage_isoDuctile_ID, & SOURCE_DAMAGE_ANISODUCTILE_ID, &
SOURCE_damage_anisoBrittle_ID, & KINEMATICS_UNDEFINED_ID ,&
SOURCE_damage_anisoDuctile_ID, & KINEMATICS_CLEAVAGE_OPENING_ID, &
KINEMATICS_undefined_ID, & KINEMATICS_SLIPPLANE_OPENING_ID, &
KINEMATICS_cleavage_opening_ID, & KINEMATICS_THERMAL_EXPANSION_ID, &
KINEMATICS_slipplane_opening_ID, & STIFFNESS_DEGRADATION_UNDEFINED_ID, &
KINEMATICS_thermal_expansion_ID, & STIFFNESS_DEGRADATION_DAMAGE_ID, &
STIFFNESS_DEGRADATION_undefined_ID, & THERMAL_ISOTHERMAL_ID, &
STIFFNESS_DEGRADATION_damage_ID, & THERMAL_ADIABATIC_ID, &
THERMAL_isothermal_ID, & THERMAL_CONDUCTION_ID, &
THERMAL_adiabatic_ID, & DAMAGE_NONE_ID, &
THERMAL_conduction_ID, & DAMAGE_LOCAL_ID, &
DAMAGE_none_ID, & DAMAGE_NONLOCAL_ID, &
DAMAGE_local_ID, & HOMOGENIZATION_UNDEFINED_ID, &
DAMAGE_nonlocal_ID, & HOMOGENIZATION_NONE_ID, &
HOMOGENIZATION_undefined_ID, & HOMOGENIZATION_ISOSTRAIN_ID, &
HOMOGENIZATION_none_ID, & HOMOGENIZATION_RGC_ID
HOMOGENIZATION_isostrain_ID, &
HOMOGENIZATION_rgc_ID
end enum end enum
integer(kind(ELASTICITY_undefined_ID)), dimension(:), allocatable, public, protected :: & integer(kind(ELASTICITY_undefined_ID)), dimension(:), allocatable, public, protected :: &
@ -178,32 +176,32 @@ module material
material_init, & material_init, &
material_allocatePlasticState, & material_allocatePlasticState, &
material_allocateSourceState, & material_allocateSourceState, &
ELASTICITY_hooke_ID ,& ELASTICITY_HOOKE_ID ,&
PLASTICITY_none_ID, & PLASTICITY_NONE_ID, &
PLASTICITY_isotropic_ID, & PLASTICITY_ISOTROPIC_ID, &
PLASTICITY_phenopowerlaw_ID, & PLASTICITY_PHENOPOWERLAW_ID, &
PLASTICITY_kinehardening_ID, & PLASTICITY_KINEHARDENING_ID, &
PLASTICITY_dislotwin_ID, & PLASTICITY_DISLOTWIN_ID, &
PLASTICITY_disloucla_ID, & PLASTICITY_DISLOUCLA_ID, &
PLASTICITY_nonlocal_ID, & PLASTICITY_NONLOCAL_ID, &
SOURCE_thermal_dissipation_ID, & SOURCE_THERMAL_DISSIPATION_ID, &
SOURCE_thermal_externalheat_ID, & SOURCE_THERMAL_EXTERNALHEAT_ID, &
SOURCE_damage_isoBrittle_ID, & SOURCE_DAMAGE_ISOBRITTLE_ID, &
SOURCE_damage_isoDuctile_ID, & SOURCE_DAMAGE_ISODUCTILE_ID, &
SOURCE_damage_anisoBrittle_ID, & SOURCE_DAMAGE_ANISOBRITTLE_ID, &
SOURCE_damage_anisoDuctile_ID, & SOURCE_DAMAGE_ANISODUCTILE_ID, &
KINEMATICS_cleavage_opening_ID, & KINEMATICS_CLEAVAGE_OPENING_ID, &
KINEMATICS_slipplane_opening_ID, & KINEMATICS_SLIPPLANE_OPENING_ID, &
KINEMATICS_thermal_expansion_ID, & KINEMATICS_THERMAL_EXPANSION_ID, &
STIFFNESS_DEGRADATION_damage_ID, & STIFFNESS_DEGRADATION_DAMAGE_ID, &
THERMAL_isothermal_ID, & THERMAL_ISOTHERMAL_ID, &
THERMAL_adiabatic_ID, & THERMAL_ADIABATIC_ID, &
THERMAL_conduction_ID, & THERMAL_CONDUCTION_ID, &
DAMAGE_none_ID, & DAMAGE_NONE_ID, &
DAMAGE_local_ID, & DAMAGE_LOCAL_ID, &
DAMAGE_nonlocal_ID, & DAMAGE_NONLOCAL_ID, &
HOMOGENIZATION_none_ID, & HOMOGENIZATION_NONE_ID, &
HOMOGENIZATION_isostrain_ID, & HOMOGENIZATION_ISOSTRAIN_ID, &
HOMOGENIZATION_RGC_ID HOMOGENIZATION_RGC_ID
contains contains

16
src/mesh/FEM_utilities.f90
View File

@ -37,15 +37,15 @@ module FEM_utilities
character(len=*), parameter, public :: & character(len=*), parameter, public :: &
FIELD_MECH_label = 'mechanical' FIELD_MECH_label = 'mechanical'
enum, bind(c) enum, bind(c); enumerator :: &
enumerator :: FIELD_UNDEFINED_ID, & FIELD_UNDEFINED_ID, &
FIELD_MECH_ID FIELD_MECH_ID
end enum end enum
enum, bind(c) enum, bind(c); enumerator :: &
enumerator :: COMPONENT_UNDEFINED_ID, & COMPONENT_UNDEFINED_ID, &
COMPONENT_MECH_X_ID, & COMPONENT_MECH_X_ID, &
COMPONENT_MECH_Y_ID, & COMPONENT_MECH_Y_ID, &
COMPONENT_MECH_Z_ID COMPONENT_MECH_Z_ID
end enum end enum
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------