From 83cf0623185eb2b3f77872bcef25a7cd34de3922 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 21 Dec 2019 11:19:33 +0100 Subject: [PATCH] better define only once --- src/damage_local.f90 | 1 - src/damage_nonlocal.f90 | 1 - src/homogenization_mech_RGC.f90 | 2 -- src/plastic_disloUCLA.f90 | 4 ---- src/plastic_dislotwin.f90 | 4 ---- src/plastic_isotropic.f90 | 2 -- src/plastic_kinematichardening.f90 | 4 ---- src/plastic_nonlocal.f90 | 4 ---- src/plastic_phenopowerlaw.f90 | 4 ---- src/prec.f90 | 4 ++++ src/source_damage_anisoBrittle.f90 | 2 -- src/source_damage_anisoDuctile.f90 | 2 -- src/source_damage_isoBrittle.f90 | 1 - src/source_damage_isoDuctile.f90 | 1 - src/thermal_adiabatic.f90 | 1 - src/thermal_conduction.f90 | 1 - 16 files changed, 4 insertions(+), 34 deletions(-) diff --git a/src/damage_local.f90 b/src/damage_local.f90 index 34aef6c9d..0874b5aee 100644 --- a/src/damage_local.f90 +++ b/src/damage_local.f90 @@ -44,7 +44,6 @@ contains subroutine damage_local_init integer :: maxNinstance,o,NofMyHomog,h - character(len=65536), dimension(0), parameter :: emptyStringArray = [character(len=65536)::] character(len=65536), dimension(:), allocatable :: outputs write(6,'(/,a)') ' <<<+- damage_'//DAMAGE_local_label//' init -+>>>'; flush(6) diff --git a/src/damage_nonlocal.f90 b/src/damage_nonlocal.f90 index 18a456f34..47355a479 100644 --- a/src/damage_nonlocal.f90 +++ b/src/damage_nonlocal.f90 @@ -49,7 +49,6 @@ contains subroutine damage_nonlocal_init integer :: maxNinstance,o,NofMyHomog,h - character(len=65536), dimension(0), parameter :: emptyStringArray = [character(len=65536)::] character(len=65536), dimension(:), allocatable :: outputs write(6,'(/,a)') ' <<<+- damage_'//DAMAGE_nonlocal_label//' init -+>>>'; flush(6) diff --git a/src/homogenization_mech_RGC.f90 b/src/homogenization_mech_RGC.f90 index 23e99c8c5..d2e12c072 100644 --- a/src/homogenization_mech_RGC.f90 +++ b/src/homogenization_mech_RGC.f90 @@ -74,8 +74,6 @@ module subroutine mech_RGC_init NofMyHomog, & sizeState, nIntFaceTot - character(len=65536), dimension(0), parameter :: emptyStringArray = [character(len=65536)::] - integer(kind(undefined_ID)) :: & outputID diff --git a/src/plastic_disloUCLA.f90 b/src/plastic_disloUCLA.f90 index e64c7ae58..8610b6bc2 100644 --- a/src/plastic_disloUCLA.f90 +++ b/src/plastic_disloUCLA.f90 @@ -121,10 +121,6 @@ subroutine plastic_disloUCLA_init() sizeState, sizeDotState, & startIndex, endIndex - integer, dimension(0), parameter :: emptyIntArray = [integer::] - real(pReal), dimension(0), parameter :: emptyRealArray = [real(pReal)::] - character(len=65536), dimension(0), parameter :: emptyStringArray = [character(len=65536)::] - integer(kind(undefined_ID)) :: & outputID diff --git a/src/plastic_dislotwin.f90 b/src/plastic_dislotwin.f90 index 454ed42b1..8c19c7d83 100644 --- a/src/plastic_dislotwin.f90 +++ b/src/plastic_dislotwin.f90 @@ -180,10 +180,6 @@ subroutine plastic_dislotwin_init sizeState, sizeDotState, & startIndex, endIndex - integer, dimension(0), parameter :: emptyIntArray = [integer::] - real(pReal), dimension(0), parameter :: emptyRealArray = [real(pReal)::] - character(len=65536), dimension(0), parameter :: emptyStringArray = [character(len=65536)::] - integer(kind(undefined_ID)) :: & outputID diff --git a/src/plastic_isotropic.f90 b/src/plastic_isotropic.f90 index b86fff04a..38166df4a 100644 --- a/src/plastic_isotropic.f90 +++ b/src/plastic_isotropic.f90 @@ -85,8 +85,6 @@ subroutine plastic_isotropic_init NipcMyPhase, & sizeState, sizeDotState - character(len=65536), dimension(0), parameter :: emptyStringArray = [character(len=65536)::] - integer(kind(undefined_ID)) :: & outputID diff --git a/src/plastic_kinematichardening.f90 b/src/plastic_kinematichardening.f90 index 569051602..9b0c41041 100644 --- a/src/plastic_kinematichardening.f90 +++ b/src/plastic_kinematichardening.f90 @@ -103,10 +103,6 @@ subroutine plastic_kinehardening_init sizeState, sizeDeltaState, sizeDotState, & startIndex, endIndex - integer, dimension(0), parameter :: emptyIntArray = [integer::] - real(pReal), dimension(0), parameter :: emptyRealArray = [real(pReal)::] - character(len=65536), dimension(0), parameter :: emptyStringArray = [character(len=65536)::] - integer(kind(undefined_ID)) :: & outputID diff --git a/src/plastic_nonlocal.f90 b/src/plastic_nonlocal.f90 index f65fb2193..ac914104c 100644 --- a/src/plastic_nonlocal.f90 +++ b/src/plastic_nonlocal.f90 @@ -225,10 +225,6 @@ contains !-------------------------------------------------------------------------------------------------- subroutine plastic_nonlocal_init - character(len=65536), dimension(0), parameter :: emptyStringArray = [character(len=65536)::] - integer, dimension(0), parameter :: emptyIntArray = [integer::] - real(pReal), dimension(0), parameter :: emptyRealArray = [real(pReal)::] - integer :: & sizeState, sizeDotState,sizeDependentState, sizeDeltaState, & maxNinstances, & diff --git a/src/plastic_phenopowerlaw.f90 b/src/plastic_phenopowerlaw.f90 index ef5bd36ef..f5c430558 100644 --- a/src/plastic_phenopowerlaw.f90 +++ b/src/plastic_phenopowerlaw.f90 @@ -113,10 +113,6 @@ subroutine plastic_phenopowerlaw_init sizeState, sizeDotState, & startIndex, endIndex - integer, dimension(0), parameter :: emptyIntArray = [integer::] - real(pReal), dimension(0), parameter :: emptyRealArray = [real(pReal)::] - character(len=65536), dimension(0), parameter :: emptyStringArray = [character(len=65536)::] - integer(kind(undefined_ID)) :: & outputID diff --git a/src/prec.f90 b/src/prec.f90 index 8fd2495ce..710400a82 100644 --- a/src/prec.f90 +++ b/src/prec.f90 @@ -79,6 +79,10 @@ module prec real(pReal), private, parameter :: PREAL_EPSILON = epsilon(0.0_pReal) !< minimum positive number such that 1.0 + EPSILON /= 1.0. real(pReal), private, parameter :: PREAL_MIN = tiny(0.0_pReal) !< smallest normalized floating point number + integer, dimension(0), parameter, public :: emptyIntArray = [integer::] + real(pReal), dimension(0), parameter, public :: emptyRealArray = [real(pReal)::] + character(len=65536), dimension(0), parameter, public :: emptyStringArray = [character(len=65536)::] + private :: & unitTest diff --git a/src/source_damage_anisoBrittle.f90 b/src/source_damage_anisoBrittle.f90 index 2211ffdd2..240e3ae48 100644 --- a/src/source_damage_anisoBrittle.f90 +++ b/src/source_damage_anisoBrittle.f90 @@ -69,8 +69,6 @@ subroutine source_damage_anisoBrittle_init integer :: Ninstance,phase,instance,source,sourceOffset integer :: NofMyPhase,p ,i - integer, dimension(0), parameter :: emptyIntArray = [integer::] - character(len=65536), dimension(0), parameter :: emptyStringArray = [character(len=65536)::] integer(kind(undefined_ID)) :: & outputID diff --git a/src/source_damage_anisoDuctile.f90 b/src/source_damage_anisoDuctile.f90 index b6a4942c1..6101eb214 100644 --- a/src/source_damage_anisoDuctile.f90 +++ b/src/source_damage_anisoDuctile.f90 @@ -62,8 +62,6 @@ subroutine source_damage_anisoDuctile_init integer :: Ninstance,phase,instance,source,sourceOffset integer :: NofMyPhase,p ,i - integer, dimension(0), parameter :: emptyIntArray = [integer::] - character(len=65536), dimension(0), parameter :: emptyStringArray = [character(len=65536)::] integer(kind(undefined_ID)) :: & outputID diff --git a/src/source_damage_isoBrittle.f90 b/src/source_damage_isoBrittle.f90 index e10177502..609b7a7e0 100644 --- a/src/source_damage_isoBrittle.f90 +++ b/src/source_damage_isoBrittle.f90 @@ -56,7 +56,6 @@ subroutine source_damage_isoBrittle_init integer :: Ninstance,phase,instance,source,sourceOffset integer :: NofMyPhase,p,i - character(len=65536), dimension(0), parameter :: emptyStringArray = [character(len=65536)::] integer(kind(undefined_ID)) :: & outputID diff --git a/src/source_damage_isoDuctile.f90 b/src/source_damage_isoDuctile.f90 index fca804c84..9212e771f 100644 --- a/src/source_damage_isoDuctile.f90 +++ b/src/source_damage_isoDuctile.f90 @@ -53,7 +53,6 @@ subroutine source_damage_isoDuctile_init integer :: Ninstance,phase,instance,source,sourceOffset integer :: NofMyPhase,p,i - character(len=65536), dimension(0), parameter :: emptyStringArray = [character(len=65536)::] integer(kind(undefined_ID)) :: & outputID diff --git a/src/thermal_adiabatic.f90 b/src/thermal_adiabatic.f90 index 3bbc5b613..985c0fffb 100644 --- a/src/thermal_adiabatic.f90 +++ b/src/thermal_adiabatic.f90 @@ -47,7 +47,6 @@ contains subroutine thermal_adiabatic_init integer :: maxNinstance,o,h,NofMyHomog - character(len=65536), dimension(0), parameter :: emptyStringArray = [character(len=65536)::] character(len=65536), dimension(:), allocatable :: outputs write(6,'(/,a)') ' <<<+- thermal_'//THERMAL_ADIABATIC_label//' init -+>>>'; flush(6) diff --git a/src/thermal_conduction.f90 b/src/thermal_conduction.f90 index 27adc39aa..7b09864cf 100644 --- a/src/thermal_conduction.f90 +++ b/src/thermal_conduction.f90 @@ -49,7 +49,6 @@ subroutine thermal_conduction_init integer :: maxNinstance,o,NofMyHomog,h - character(len=65536), dimension(0), parameter :: emptyStringArray = [character(len=65536)::] character(len=65536), dimension(:), allocatable :: outputs write(6,'(/,a)') ' <<<+- thermal_'//THERMAL_CONDUCTION_label//' init -+>>>'; flush(6)