From e1bd49a12b638252ae351b10234424cddf5454fb Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 17 Mar 2020 08:17:14 +0100 Subject: [PATCH] constants/parameters in capitals --- src/grid/spectral_utilities.f90 | 20 ++--- src/homogenization_mech_isostrain.f90 | 11 ++- src/lattice.f90 | 16 ++-- src/material.f90 | 122 +++++++++++++------------- src/mesh/FEM_utilities.f90 | 16 ++-- 5 files changed, 90 insertions(+), 95 deletions(-) diff --git a/src/grid/spectral_utilities.f90 b/src/grid/spectral_utilities.f90 index eed4eda5b..1d31b23c3 100644 --- a/src/grid/spectral_utilities.f90 +++ b/src/grid/spectral_utilities.f90 @@ -27,12 +27,11 @@ module spectral_utilities !-------------------------------------------------------------------------------------------------- ! field labels information - enum, bind(c) - enumerator :: & - FIELD_UNDEFINED_ID, & - FIELD_MECH_ID, & - FIELD_THERMAL_ID, & - FIELD_DAMAGE_ID + enum, bind(c); enumerator :: & + FIELD_UNDEFINED_ID, & + FIELD_MECH_ID, & + FIELD_THERMAL_ID, & + FIELD_DAMAGE_ID end enum !-------------------------------------------------------------------------------------------------- @@ -126,11 +125,10 @@ module spectral_utilities type(tNumerics) :: num ! numerics parameters. Better name? - enum, bind(c) - enumerator :: & - DERIVATIVE_CONTINUOUS_ID, & - DERIVATIVE_CENTRAL_DIFF_ID, & - DERIVATIVE_FWBW_DIFF_ID + enum, bind(c); enumerator :: & + DERIVATIVE_CONTINUOUS_ID, & + DERIVATIVE_CENTRAL_DIFF_ID, & + DERIVATIVE_FWBW_DIFF_ID end enum integer(kind(DERIVATIVE_CONTINUOUS_ID)) :: & diff --git a/src/homogenization_mech_isostrain.f90 b/src/homogenization_mech_isostrain.f90 index 9345d1eda..9b81ab666 100644 --- a/src/homogenization_mech_isostrain.f90 +++ b/src/homogenization_mech_isostrain.f90 @@ -6,10 +6,9 @@ !-------------------------------------------------------------------------------------------------- submodule(homogenization) homogenization_mech_isostrain - enum, bind(c) - enumerator :: & - parallel_ID, & - average_ID + enum, bind(c); enumerator :: & + parallel_ID, & + average_ID end enum type :: tParameters !< container type for internal constitutive parameters @@ -36,7 +35,7 @@ module subroutine mech_isostrain_init character(len=pStringLen) :: & tag = '' - write(6,'(/,a)') ' <<<+- homogenization_'//HOMOGENIZATION_ISOSTRAIN_label//' init -+>>>' + write(6,'(/,a)') ' <<<+- homogenization_'//HOMOGENIZATION_ISOSTRAIN_LABEL//' init -+>>>' Ninstance = count(homogenization_type == HOMOGENIZATION_ISOSTRAIN_ID) if (iand(debug_level(debug_HOMOGENIZATION),debug_levelBasic) /= 0) & @@ -58,7 +57,7 @@ module subroutine mech_isostrain_init case ('avg') prm%mapping = average_ID 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 NofMyHomog = count(material_homogenizationAt == h) diff --git a/src/lattice.f90 b/src/lattice.f90 index f962a64bc..31a73d7d6 100644 --- a/src/lattice.f90 +++ b/src/lattice.f90 @@ -381,14 +381,14 @@ module lattice ],pReal),shape(ORT_SYSTEMCLEAVAGE)) - enum, bind(c) - enumerator :: lattice_UNDEFINED_ID, & - lattice_ISO_ID, & - lattice_FCC_ID, & - lattice_BCC_ID, & - lattice_BCT_ID, & - lattice_HEX_ID, & - lattice_ORT_ID + enum, bind(c); enumerator :: & + lattice_UNDEFINED_ID, & + lattice_ISO_ID, & + lattice_FCC_ID, & + lattice_BCC_ID, & + lattice_BCT_ID, & + lattice_HEX_ID, & + lattice_ORT_ID end enum ! SHOULD NOT BE PART OF LATTICE BEGIN diff --git a/src/material.f90 b/src/material.f90 index 603fae7ac..14a16a2ed 100644 --- a/src/material.f90 +++ b/src/material.f90 @@ -47,42 +47,40 @@ module material HOMOGENIZATION_isostrain_label = 'isostrain', & HOMOGENIZATION_rgc_label = 'rgc' - - - enum, bind(c) - enumerator :: ELASTICITY_undefined_ID, & - ELASTICITY_hooke_ID, & - PLASTICITY_undefined_ID, & - PLASTICITY_none_ID, & - PLASTICITY_isotropic_ID, & - PLASTICITY_phenopowerlaw_ID, & - PLASTICITY_kinehardening_ID, & - PLASTICITY_dislotwin_ID, & - PLASTICITY_disloucla_ID, & - PLASTICITY_nonlocal_ID, & - SOURCE_undefined_ID, & - SOURCE_thermal_dissipation_ID, & - SOURCE_thermal_externalheat_ID, & - SOURCE_damage_isoBrittle_ID, & - SOURCE_damage_isoDuctile_ID, & - SOURCE_damage_anisoBrittle_ID, & - SOURCE_damage_anisoDuctile_ID, & - KINEMATICS_undefined_ID, & - KINEMATICS_cleavage_opening_ID, & - KINEMATICS_slipplane_opening_ID, & - KINEMATICS_thermal_expansion_ID, & - STIFFNESS_DEGRADATION_undefined_ID, & - STIFFNESS_DEGRADATION_damage_ID, & - THERMAL_isothermal_ID, & - THERMAL_adiabatic_ID, & - THERMAL_conduction_ID, & - DAMAGE_none_ID, & - DAMAGE_local_ID, & - DAMAGE_nonlocal_ID, & - HOMOGENIZATION_undefined_ID, & - HOMOGENIZATION_none_ID, & - HOMOGENIZATION_isostrain_ID, & - HOMOGENIZATION_rgc_ID + enum, bind(c); enumerator :: & + ELASTICITY_UNDEFINED_ID ,& + ELASTICITY_HOOKE_ID ,& + PLASTICITY_UNDEFINED_ID ,& + PLASTICITY_NONE_ID, & + PLASTICITY_ISOTROPIC_ID, & + PLASTICITY_PHENOPOWERLAW_ID, & + PLASTICITY_KINEHARDENING_ID, & + PLASTICITY_DISLOTWIN_ID, & + PLASTICITY_DISLOUCLA_ID, & + PLASTICITY_NONLOCAL_ID, & + SOURCE_UNDEFINED_ID ,& + SOURCE_THERMAL_DISSIPATION_ID, & + SOURCE_THERMAL_EXTERNALHEAT_ID, & + SOURCE_DAMAGE_ISOBRITTLE_ID, & + SOURCE_DAMAGE_ISODUCTILE_ID, & + SOURCE_DAMAGE_ANISOBRITTLE_ID, & + SOURCE_DAMAGE_ANISODUCTILE_ID, & + KINEMATICS_UNDEFINED_ID ,& + KINEMATICS_CLEAVAGE_OPENING_ID, & + KINEMATICS_SLIPPLANE_OPENING_ID, & + KINEMATICS_THERMAL_EXPANSION_ID, & + STIFFNESS_DEGRADATION_UNDEFINED_ID, & + STIFFNESS_DEGRADATION_DAMAGE_ID, & + THERMAL_ISOTHERMAL_ID, & + THERMAL_ADIABATIC_ID, & + THERMAL_CONDUCTION_ID, & + DAMAGE_NONE_ID, & + DAMAGE_LOCAL_ID, & + DAMAGE_NONLOCAL_ID, & + HOMOGENIZATION_UNDEFINED_ID, & + HOMOGENIZATION_NONE_ID, & + HOMOGENIZATION_ISOSTRAIN_ID, & + HOMOGENIZATION_RGC_ID end enum integer(kind(ELASTICITY_undefined_ID)), dimension(:), allocatable, public, protected :: & @@ -178,32 +176,32 @@ module material material_init, & material_allocatePlasticState, & material_allocateSourceState, & - ELASTICITY_hooke_ID ,& - PLASTICITY_none_ID, & - PLASTICITY_isotropic_ID, & - PLASTICITY_phenopowerlaw_ID, & - PLASTICITY_kinehardening_ID, & - PLASTICITY_dislotwin_ID, & - PLASTICITY_disloucla_ID, & - PLASTICITY_nonlocal_ID, & - SOURCE_thermal_dissipation_ID, & - SOURCE_thermal_externalheat_ID, & - SOURCE_damage_isoBrittle_ID, & - SOURCE_damage_isoDuctile_ID, & - SOURCE_damage_anisoBrittle_ID, & - SOURCE_damage_anisoDuctile_ID, & - KINEMATICS_cleavage_opening_ID, & - KINEMATICS_slipplane_opening_ID, & - KINEMATICS_thermal_expansion_ID, & - STIFFNESS_DEGRADATION_damage_ID, & - THERMAL_isothermal_ID, & - THERMAL_adiabatic_ID, & - THERMAL_conduction_ID, & - DAMAGE_none_ID, & - DAMAGE_local_ID, & - DAMAGE_nonlocal_ID, & - HOMOGENIZATION_none_ID, & - HOMOGENIZATION_isostrain_ID, & + ELASTICITY_HOOKE_ID ,& + PLASTICITY_NONE_ID, & + PLASTICITY_ISOTROPIC_ID, & + PLASTICITY_PHENOPOWERLAW_ID, & + PLASTICITY_KINEHARDENING_ID, & + PLASTICITY_DISLOTWIN_ID, & + PLASTICITY_DISLOUCLA_ID, & + PLASTICITY_NONLOCAL_ID, & + SOURCE_THERMAL_DISSIPATION_ID, & + SOURCE_THERMAL_EXTERNALHEAT_ID, & + SOURCE_DAMAGE_ISOBRITTLE_ID, & + SOURCE_DAMAGE_ISODUCTILE_ID, & + SOURCE_DAMAGE_ANISOBRITTLE_ID, & + SOURCE_DAMAGE_ANISODUCTILE_ID, & + KINEMATICS_CLEAVAGE_OPENING_ID, & + KINEMATICS_SLIPPLANE_OPENING_ID, & + KINEMATICS_THERMAL_EXPANSION_ID, & + STIFFNESS_DEGRADATION_DAMAGE_ID, & + THERMAL_ISOTHERMAL_ID, & + THERMAL_ADIABATIC_ID, & + THERMAL_CONDUCTION_ID, & + DAMAGE_NONE_ID, & + DAMAGE_LOCAL_ID, & + DAMAGE_NONLOCAL_ID, & + HOMOGENIZATION_NONE_ID, & + HOMOGENIZATION_ISOSTRAIN_ID, & HOMOGENIZATION_RGC_ID contains diff --git a/src/mesh/FEM_utilities.f90 b/src/mesh/FEM_utilities.f90 index a1a8ab96f..54d0097ee 100644 --- a/src/mesh/FEM_utilities.f90 +++ b/src/mesh/FEM_utilities.f90 @@ -37,15 +37,15 @@ module FEM_utilities character(len=*), parameter, public :: & FIELD_MECH_label = 'mechanical' - enum, bind(c) - enumerator :: FIELD_UNDEFINED_ID, & - FIELD_MECH_ID + enum, bind(c); enumerator :: & + FIELD_UNDEFINED_ID, & + FIELD_MECH_ID end enum - enum, bind(c) - enumerator :: COMPONENT_UNDEFINED_ID, & - COMPONENT_MECH_X_ID, & - COMPONENT_MECH_Y_ID, & - COMPONENT_MECH_Z_ID + enum, bind(c); enumerator :: & + COMPONENT_UNDEFINED_ID, & + COMPONENT_MECH_X_ID, & + COMPONENT_MECH_Y_ID, & + COMPONENT_MECH_Z_ID end enum !--------------------------------------------------------------------------------------------------