From 8cc16da53f304ea2f9d99e9a00ecca49acf7f454 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 15 Mar 2020 09:51:40 +0100 Subject: [PATCH] atol is part of the state structure, no need for suffix --- src/constitutive_plastic_disloUCLA.f90 | 10 +++++----- src/constitutive_plastic_dislotwin.f90 | 12 ++++++------ src/constitutive_plastic_isotropic.f90 | 10 +++++----- src/constitutive_plastic_kinehardening.f90 | 12 ++++++------ src/constitutive_plastic_nonlocal.f90 | 6 +++--- src/constitutive_plastic_phenopowerlaw.f90 | 16 ++++++++-------- src/crystallite.f90 | 12 ++++++------ src/material.f90 | 4 ++-- src/prec.f90 | 2 +- src/source_damage_anisoBrittle.f90 | 4 ++-- src/source_damage_anisoDuctile.f90 | 4 ++-- src/source_damage_isoBrittle.f90 | 4 ++-- src/source_damage_isoDuctile.f90 | 4 ++-- 13 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/constitutive_plastic_disloUCLA.f90 b/src/constitutive_plastic_disloUCLA.f90 index a021a4627..f3cea279b 100644 --- a/src/constitutive_plastic_disloUCLA.f90 +++ b/src/constitutive_plastic_disloUCLA.f90 @@ -213,14 +213,14 @@ module subroutine plastic_disloUCLA_init call material_allocatePlasticState(p,NipcMyPhase,sizeState,sizeDotState,0) !-------------------------------------------------------------------------------------------------- -! locally defined state aliases and initialization of state0 and atolState +! locally defined state aliases and initialization of state0 and atol startIndex = 1 endIndex = prm%sum_N_sl stt%rho_mob=>plasticState(p)%state(startIndex:endIndex,:) stt%rho_mob= spread(prm%rho_mob_0,2,NipcMyPhase) dot%rho_mob=>plasticState(p)%dotState(startIndex:endIndex,:) - plasticState(p)%atolState(startIndex:endIndex) = config%getFloat('atol_rho') - if (any(plasticState(p)%atolState(startIndex:endIndex) <= 0.0_pReal)) & + plasticState(p)%atol(startIndex:endIndex) = config%getFloat('atol_rho') + if (any(plasticState(p)%atol(startIndex:endIndex) <= 0.0_pReal)) & extmsg = trim(extmsg)//' atol_rho' startIndex = endIndex + 1 @@ -228,13 +228,13 @@ module subroutine plastic_disloUCLA_init stt%rho_dip=>plasticState(p)%state(startIndex:endIndex,:) stt%rho_dip= spread(prm%rho_dip_0,2,NipcMyPhase) dot%rho_dip=>plasticState(p)%dotState(startIndex:endIndex,:) - plasticState(p)%atolState(startIndex:endIndex) = config%getFloat('atol_rho') + plasticState(p)%atol(startIndex:endIndex) = config%getFloat('atol_rho') startIndex = endIndex + 1 endIndex = endIndex + prm%sum_N_sl stt%gamma_sl=>plasticState(p)%state(startIndex:endIndex,:) dot%gamma_sl=>plasticState(p)%dotState(startIndex:endIndex,:) - plasticState(p)%atolState(startIndex:endIndex) = 1.0e6_pReal ! Don't use for convergence check + plasticState(p)%atol(startIndex:endIndex) = 1.0e6_pReal ! Don't use for convergence check ! global alias plasticState(p)%slipRate => plasticState(p)%dotState(startIndex:endIndex,:) diff --git a/src/constitutive_plastic_dislotwin.f90 b/src/constitutive_plastic_dislotwin.f90 index d172f7095..6e2e115cb 100644 --- a/src/constitutive_plastic_dislotwin.f90 +++ b/src/constitutive_plastic_dislotwin.f90 @@ -420,26 +420,26 @@ module subroutine plastic_dislotwin_init call material_allocatePlasticState(p,NipcMyPhase,sizeState,sizeDotState,0) !-------------------------------------------------------------------------------------------------- -! locally defined state aliases and initialization of state0 and atolState +! locally defined state aliases and initialization of state0 and atol startIndex = 1 endIndex = prm%sum_N_sl stt%rho_mob=>plasticState(p)%state(startIndex:endIndex,:) stt%rho_mob= spread(prm%rho_mob_0,2,NipcMyPhase) dot%rho_mob=>plasticState(p)%dotState(startIndex:endIndex,:) - plasticState(p)%aTolState(startIndex:endIndex) = prm%aTol_rho + plasticState(p)%atol(startIndex:endIndex) = prm%aTol_rho startIndex = endIndex + 1 endIndex = endIndex + prm%sum_N_sl stt%rho_dip=>plasticState(p)%state(startIndex:endIndex,:) stt%rho_dip= spread(prm%rho_dip_0,2,NipcMyPhase) dot%rho_dip=>plasticState(p)%dotState(startIndex:endIndex,:) - plasticState(p)%aTolState(startIndex:endIndex) = prm%aTol_rho + plasticState(p)%atol(startIndex:endIndex) = prm%aTol_rho startIndex = endIndex + 1 endIndex = endIndex + prm%sum_N_sl stt%gamma_sl=>plasticState(p)%state(startIndex:endIndex,:) dot%gamma_sl=>plasticState(p)%dotState(startIndex:endIndex,:) - plasticState(p)%aTolState(startIndex:endIndex) = 1.0e6_pReal !ToDo: better make optional parameter + plasticState(p)%atol(startIndex:endIndex) = 1.0e6_pReal !ToDo: better make optional parameter ! global alias plasticState(p)%slipRate => plasticState(p)%dotState(startIndex:endIndex,:) @@ -447,13 +447,13 @@ module subroutine plastic_dislotwin_init endIndex = endIndex + prm%sum_N_tw stt%f_tw=>plasticState(p)%state(startIndex:endIndex,:) dot%f_tw=>plasticState(p)%dotState(startIndex:endIndex,:) - plasticState(p)%aTolState(startIndex:endIndex) = prm%aTol_f_tw + plasticState(p)%atol(startIndex:endIndex) = prm%aTol_f_tw startIndex = endIndex + 1 endIndex = endIndex + prm%sum_N_tr stt%f_tr=>plasticState(p)%state(startIndex:endIndex,:) dot%f_tr=>plasticState(p)%dotState(startIndex:endIndex,:) - plasticState(p)%aTolState(startIndex:endIndex) = prm%aTol_f_tr + plasticState(p)%atol(startIndex:endIndex) = prm%aTol_f_tr allocate(dst%Lambda_sl (prm%sum_N_sl,NipcMyPhase),source=0.0_pReal) allocate(dst%tau_pass (prm%sum_N_sl,NipcMyPhase),source=0.0_pReal) diff --git a/src/constitutive_plastic_isotropic.f90 b/src/constitutive_plastic_isotropic.f90 index 2507b01a6..6731eb64c 100644 --- a/src/constitutive_plastic_isotropic.f90 +++ b/src/constitutive_plastic_isotropic.f90 @@ -120,17 +120,17 @@ module subroutine plastic_isotropic_init call material_allocatePlasticState(p,NipcMyPhase,sizeState,sizeDotState,0) !-------------------------------------------------------------------------------------------------- -! locally defined state aliases and initialization of state0 and atolState +! locally defined state aliases and initialization of state0 and atol stt%xi => plasticState(p)%state (1,:) stt%xi = prm%xi_0 dot%xi => plasticState(p)%dotState(1,:) - plasticState(p)%atolState(1) = config%getFloat('atol_flowstress',defaultVal=1.0_pReal) - if (plasticState(p)%atolState(1) <= 0.0_pReal) extmsg = trim(extmsg)//' atol_xi' + plasticState(p)%atol(1) = config%getFloat('atol_flowstress',defaultVal=1.0_pReal) + if (plasticState(p)%atol(1) <= 0.0_pReal) extmsg = trim(extmsg)//' atol_xi' stt%gamma => plasticState(p)%state (2,:) dot%gamma => plasticState(p)%dotState(2,:) - plasticState(p)%atolState(2) = config%getFloat('atol_shear',defaultVal=1.0e-6_pReal) - if (plasticState(p)%atolState(2) <= 0.0_pReal) extmsg = trim(extmsg)//' atol_gamma' + plasticState(p)%atol(2) = config%getFloat('atol_shear',defaultVal=1.0e-6_pReal) + if (plasticState(p)%atol(2) <= 0.0_pReal) extmsg = trim(extmsg)//' atol_gamma' ! global alias plasticState(p)%slipRate => plasticState(p)%dotState(2:2,:) diff --git a/src/constitutive_plastic_kinehardening.f90 b/src/constitutive_plastic_kinehardening.f90 index 44b9b3334..a89ea3bac 100644 --- a/src/constitutive_plastic_kinehardening.f90 +++ b/src/constitutive_plastic_kinehardening.f90 @@ -164,28 +164,28 @@ module subroutine plastic_kinehardening_init call material_allocatePlasticState(p,NipcMyPhase,sizeState,sizeDotState,sizeDeltaState) !-------------------------------------------------------------------------------------------------- -! locally defined state aliases and initialization of state0 and atolState +! locally defined state aliases and initialization of state0 and atol startIndex = 1 endIndex = prm%totalNslip stt%crss => plasticState(p)%state (startIndex:endIndex,:) stt%crss = spread(prm%crss0, 2, NipcMyPhase) dot%crss => plasticState(p)%dotState(startIndex:endIndex,:) - plasticState(p)%atolState(startIndex:endIndex) = config%getFloat('atol_resistance',defaultVal=1.0_pReal) - if(any(plasticState(p)%atolState(startIndex:endIndex) <= 0.0_pReal)) & + plasticState(p)%atol(startIndex:endIndex) = config%getFloat('atol_resistance',defaultVal=1.0_pReal) + if(any(plasticState(p)%atol(startIndex:endIndex) <= 0.0_pReal)) & extmsg = trim(extmsg)//' atol_crss' startIndex = endIndex + 1 endIndex = endIndex + prm%totalNslip stt%crss_back => plasticState(p)%state (startIndex:endIndex,:) dot%crss_back => plasticState(p)%dotState(startIndex:endIndex,:) - plasticState(p)%atolState(startIndex:endIndex) = config%getFloat('atol_resistance',defaultVal=1.0_pReal) + plasticState(p)%atol(startIndex:endIndex) = config%getFloat('atol_resistance',defaultVal=1.0_pReal) startIndex = endIndex + 1 endIndex = endIndex + prm%totalNslip stt%accshear => plasticState(p)%state (startIndex:endIndex,:) dot%accshear => plasticState(p)%dotState(startIndex:endIndex,:) - plasticState(p)%atolState(startIndex:endIndex) = config%getFloat('atol_shear',defaultVal=1.0e-6_pReal) - if(any(plasticState(p)%atolState(startIndex:endIndex) <= 0.0_pReal)) & + plasticState(p)%atol(startIndex:endIndex) = config%getFloat('atol_shear',defaultVal=1.0e-6_pReal) + if(any(plasticState(p)%atol(startIndex:endIndex) <= 0.0_pReal)) & extmsg = trim(extmsg)//' atol_gamma' ! global alias plasticState(p)%slipRate => plasticState(p)%dotState(startIndex:endIndex,:) diff --git a/src/constitutive_plastic_nonlocal.f90 b/src/constitutive_plastic_nonlocal.f90 index 012bfdae9..a88dc546b 100644 --- a/src/constitutive_plastic_nonlocal.f90 +++ b/src/constitutive_plastic_nonlocal.f90 @@ -401,7 +401,7 @@ module subroutine plastic_nonlocal_init stt%rho => plasticState(p)%state (0*prm%totalNslip+1:10*prm%totalNslip,:) dot%rho => plasticState(p)%dotState (0*prm%totalNslip+1:10*prm%totalNslip,:) del%rho => plasticState(p)%deltaState (0*prm%totalNslip+1:10*prm%totalNslip,:) - plasticState(p)%atolState(1:10*prm%totalNslip) = prm%atol_rho + plasticState(p)%atol(1:10*prm%totalNslip) = prm%atol_rho stt%rhoSgl => plasticState(p)%state (0*prm%totalNslip+1: 8*prm%totalNslip,:) dot%rhoSgl => plasticState(p)%dotState (0*prm%totalNslip+1: 8*prm%totalNslip,:) @@ -462,8 +462,8 @@ module subroutine plastic_nonlocal_init stt%gamma => plasticState(p)%state (10*prm%totalNslip + 1:11*prm%totalNslip ,1:NofMyPhase) dot%gamma => plasticState(p)%dotState (10*prm%totalNslip + 1:11*prm%totalNslip ,1:NofMyPhase) del%gamma => plasticState(p)%deltaState (10*prm%totalNslip + 1:11*prm%totalNslip ,1:NofMyPhase) - plasticState(p)%atolState(10*prm%totalNslip+1:11*prm%totalNslip ) = config%getFloat('atol_shear', defaultVal=0.0_pReal) - if(any(plasticState(p)%atolState(10*prm%totalNslip+1:11*prm%totalNslip)<=0.0_pReal)) & + plasticState(p)%atol(10*prm%totalNslip+1:11*prm%totalNslip ) = config%getFloat('atol_shear', defaultVal=0.0_pReal) + if(any(plasticState(p)%atol(10*prm%totalNslip+1:11*prm%totalNslip)<=0.0_pReal)) & extmsg = trim(extmsg)//' atol_gamma' plasticState(p)%slipRate => plasticState(p)%dotState (10*prm%totalNslip + 1:11*prm%totalNslip ,1:NofMyPhase) diff --git a/src/constitutive_plastic_phenopowerlaw.f90 b/src/constitutive_plastic_phenopowerlaw.f90 index ef0eb4afa..7653f73ef 100644 --- a/src/constitutive_plastic_phenopowerlaw.f90 +++ b/src/constitutive_plastic_phenopowerlaw.f90 @@ -216,14 +216,14 @@ module subroutine plastic_phenopowerlaw_init call material_allocatePlasticState(p,NipcMyPhase,sizeState,sizeDotState,0) !-------------------------------------------------------------------------------------------------- -! locally defined state aliases and initialization of state0 and atolState +! locally defined state aliases and initialization of state0 and atol startIndex = 1 endIndex = prm%totalNslip stt%xi_slip => plasticState(p)%state (startIndex:endIndex,:) stt%xi_slip = spread(prm%xi_slip_0, 2, NipcMyPhase) dot%xi_slip => plasticState(p)%dotState(startIndex:endIndex,:) - plasticState(p)%atolState(startIndex:endIndex) = config%getFloat('atol_resistance',defaultVal=1.0_pReal) - if(any(plasticState(p)%atolState(startIndex:endIndex)<=0.0_pReal)) & + plasticState(p)%atol(startIndex:endIndex) = config%getFloat('atol_resistance',defaultVal=1.0_pReal) + if(any(plasticState(p)%atol(startIndex:endIndex)<=0.0_pReal)) & extmsg = trim(extmsg)//' atol_xi' startIndex = endIndex + 1 @@ -231,14 +231,14 @@ module subroutine plastic_phenopowerlaw_init stt%xi_twin => plasticState(p)%state (startIndex:endIndex,:) stt%xi_twin = spread(prm%xi_twin_0, 2, NipcMyPhase) dot%xi_twin => plasticState(p)%dotState(startIndex:endIndex,:) - plasticState(p)%atolState(startIndex:endIndex) = config%getFloat('atol_resistance',defaultVal=1.0_pReal) + plasticState(p)%atol(startIndex:endIndex) = config%getFloat('atol_resistance',defaultVal=1.0_pReal) startIndex = endIndex + 1 endIndex = endIndex + prm%totalNslip stt%gamma_slip => plasticState(p)%state (startIndex:endIndex,:) dot%gamma_slip => plasticState(p)%dotState(startIndex:endIndex,:) - plasticState(p)%atolState(startIndex:endIndex) = config%getFloat('atol_shear',defaultVal=1.0e-6_pReal) - if(any(plasticState(p)%atolState(startIndex:endIndex)<=0.0_pReal)) & + plasticState(p)%atol(startIndex:endIndex) = config%getFloat('atol_shear',defaultVal=1.0e-6_pReal) + if(any(plasticState(p)%atol(startIndex:endIndex)<=0.0_pReal)) & extmsg = trim(extmsg)//' atol_gamma_slip' ! global alias plasticState(p)%slipRate => plasticState(p)%dotState(startIndex:endIndex,:) @@ -247,8 +247,8 @@ module subroutine plastic_phenopowerlaw_init endIndex = endIndex + prm%totalNtwin stt%gamma_twin => plasticState(p)%state (startIndex:endIndex,:) dot%gamma_twin => plasticState(p)%dotState(startIndex:endIndex,:) - plasticState(p)%atolState(startIndex:endIndex) = config%getFloat('atol_twinfrac',defaultVal=1.0e-6_pReal) - if(any(plasticState(p)%atolState(startIndex:endIndex)<=0.0_pReal)) & + plasticState(p)%atol(startIndex:endIndex) = config%getFloat('atol_twinfrac',defaultVal=1.0e-6_pReal) + if(any(plasticState(p)%atol(startIndex:endIndex)<=0.0_pReal)) & extmsg = trim(extmsg)//' atol_gamma_twin' plasticState(p)%state0 = plasticState(p)%state ! ToDo: this could be done centrally diff --git a/src/crystallite.f90 b/src/crystallite.f90 index 2d42ac2b8..41a8c3891 100644 --- a/src/crystallite.f90 +++ b/src/crystallite.f90 @@ -1089,7 +1089,7 @@ subroutine integrateStateFPI crystallite_converged(g,i,e) = converged(residuum_plastic(1:sizeDotState), & plasticState(p)%state(1:sizeDotState,c), & - plasticState(p)%atolState(1:sizeDotState)) + plasticState(p)%atol(1:sizeDotState)) do s = 1, phase_Nsources(p) @@ -1113,7 +1113,7 @@ subroutine integrateStateFPI crystallite_converged(g,i,e) = & crystallite_converged(g,i,e) .and. converged(residuum_source(1:sizeDotState), & sourceState(p)%p(s)%state(1:sizeDotState,c), & - sourceState(p)%p(s)%atolState(1:sizeDotState)) + sourceState(p)%p(s)%atol(1:sizeDotState)) enddo endif enddo; enddo; enddo @@ -1269,7 +1269,7 @@ subroutine integrateStateAdaptiveEuler crystallite_converged(g,i,e) = converged(residuum_plastic(1:sizeDotState,g,i,e), & plasticState(p)%state(1:sizeDotState,c), & - plasticState(p)%atolState(1:sizeDotState)) + plasticState(p)%atol(1:sizeDotState)) do s = 1, phase_Nsources(p) sizeDotState = sourceState(p)%p(s)%sizeDotState @@ -1280,7 +1280,7 @@ subroutine integrateStateAdaptiveEuler crystallite_converged(g,i,e) = & crystallite_converged(g,i,e) .and. converged(residuum_source(1:sizeDotState,s,g,i,e), & sourceState(p)%p(s)%state(1:sizeDotState,c), & - sourceState(p)%p(s)%atolState(1:sizeDotState)) + sourceState(p)%p(s)%atol(1:sizeDotState)) enddo endif @@ -1497,7 +1497,7 @@ subroutine integrateStateRKCK45 crystallite_todo(g,i,e) = converged(residuum_plastic(1:sizeDotState,g,i,e), & plasticState(p)%state(1:sizeDotState,cc), & - plasticState(p)%atolState(1:sizeDotState)) + plasticState(p)%atol(1:sizeDotState)) do s = 1, phase_Nsources(p) sizeDotState = sourceState(p)%p(s)%sizeDotState @@ -1505,7 +1505,7 @@ subroutine integrateStateRKCK45 crystallite_todo(g,i,e) = & crystallite_todo(g,i,e) .and. converged(residuum_source(1:sizeDotState,s,g,i,e), & sourceState(p)%p(s)%state(1:sizeDotState,cc), & - sourceState(p)%p(s)%atolState(1:sizeDotState)) + sourceState(p)%p(s)%atol(1:sizeDotState)) enddo endif enddo; enddo; enddo diff --git a/src/material.f90 b/src/material.f90 index 9c5009484..95b16771e 100644 --- a/src/material.f90 +++ b/src/material.f90 @@ -724,7 +724,7 @@ subroutine material_allocatePlasticState(phase,NofMyPhase,& plasticState(phase)%sizeDeltaState = sizeDeltaState plasticState(phase)%offsetDeltaState = sizeState-sizeDeltaState ! deltaState occupies latter part of state by definition - allocate(plasticState(phase)%aTolState (sizeState), source=0.0_pReal) + allocate(plasticState(phase)%atol (sizeState), source=0.0_pReal) allocate(plasticState(phase)%state0 (sizeState,NofMyPhase), source=0.0_pReal) allocate(plasticState(phase)%partionedState0 (sizeState,NofMyPhase), source=0.0_pReal) allocate(plasticState(phase)%subState0 (sizeState,NofMyPhase), source=0.0_pReal) @@ -762,7 +762,7 @@ subroutine material_allocateSourceState(phase,of,NofMyPhase,& sourceState(phase)%p(of)%sizeDeltaState = sizeDeltaState sourceState(phase)%p(of)%offsetDeltaState = sizeState-sizeDeltaState ! deltaState occupies latter part of state by definition - allocate(sourceState(phase)%p(of)%aTolState (sizeState), source=0.0_pReal) + allocate(sourceState(phase)%p(of)%atol (sizeState), source=0.0_pReal) allocate(sourceState(phase)%p(of)%state0 (sizeState,NofMyPhase), source=0.0_pReal) allocate(sourceState(phase)%p(of)%partionedState0 (sizeState,NofMyPhase), source=0.0_pReal) allocate(sourceState(phase)%p(of)%subState0 (sizeState,NofMyPhase), source=0.0_pReal) diff --git a/src/prec.f90 b/src/prec.f90 index 5f324f148..b3e2c2747 100644 --- a/src/prec.f90 +++ b/src/prec.f90 @@ -42,7 +42,7 @@ module prec offsetDeltaState = 0, & !< index offset of delta state sizeDeltaState = 0 !< size of delta state, i.e. state(offset+1:offset+sizeDelta) follows time evolution by deltaState increments real(pReal), pointer, dimension(:), contiguous :: & - atolState + atol real(pReal), pointer, dimension(:,:), contiguous :: & ! a pointer is needed here because we might point to state/doState. However, they will never point to something, but are rather allocated and, hence, contiguous state0, & state, & !< state diff --git a/src/source_damage_anisoBrittle.f90 b/src/source_damage_anisoBrittle.f90 index 9d3697e44..b9ea7c03f 100644 --- a/src/source_damage_anisoBrittle.f90 +++ b/src/source_damage_anisoBrittle.f90 @@ -109,8 +109,8 @@ subroutine source_damage_anisoBrittle_init NofMyPhase = count(material_phaseAt==p) * discretization_nIP call material_allocateSourceState(p,sourceOffset,NofMyPhase,1,1,0) - sourceState(p)%p(sourceOffset)%atolState = config%getFloat('anisobrittle_atol',defaultVal=1.0e-3_pReal) - if(any(sourceState(p)%p(sourceOffset)%atolState <= 0.0_pReal)) & + sourceState(p)%p(sourceOffset)%atol = config%getFloat('anisobrittle_atol',defaultVal=1.0e-3_pReal) + if(any(sourceState(p)%p(sourceOffset)%atol <= 0.0_pReal)) & extmsg = trim(extmsg)//' anisobrittle_atol' end associate diff --git a/src/source_damage_anisoDuctile.f90 b/src/source_damage_anisoDuctile.f90 index aa21a597b..1c513beda 100644 --- a/src/source_damage_anisoDuctile.f90 +++ b/src/source_damage_anisoDuctile.f90 @@ -96,8 +96,8 @@ subroutine source_damage_anisoDuctile_init NofMyPhase=count(material_phaseAt==p) * discretization_nIP call material_allocateSourceState(p,sourceOffset,NofMyPhase,1,1,0) - sourceState(p)%p(sourceOffset)%atolState = config%getFloat('anisoductile_atol',defaultVal=1.0e-3_pReal) - if(any(sourceState(p)%p(sourceOffset)%atolState <=0.0_pReal)) & + sourceState(p)%p(sourceOffset)%atol = config%getFloat('anisoductile_atol',defaultVal=1.0e-3_pReal) + if(any(sourceState(p)%p(sourceOffset)%atol <=0.0_pReal)) & extmsg = trim(extmsg)//' anisoductile_atol' end associate diff --git a/src/source_damage_isoBrittle.f90 b/src/source_damage_isoBrittle.f90 index e656e819d..80c5d3444 100644 --- a/src/source_damage_isoBrittle.f90 +++ b/src/source_damage_isoBrittle.f90 @@ -84,8 +84,8 @@ subroutine source_damage_isoBrittle_init NofMyPhase = count(material_phaseAt==p) * discretization_nIP call material_allocateSourceState(p,sourceOffset,NofMyPhase,1,1,1) - sourceState(p)%p(sourceOffset)%atolState = config%getFloat('isobrittle_atol',defaultVal=1.0e-3_pReal) - if(any(sourceState(p)%p(sourceOffset)%atolState <= 0.0_pReal)) & + sourceState(p)%p(sourceOffset)%atol = config%getFloat('isobrittle_atol',defaultVal=1.0e-3_pReal) + if(any(sourceState(p)%p(sourceOffset)%atol <= 0.0_pReal)) & extmsg = trim(extmsg)//' isobrittle_atol' end associate diff --git a/src/source_damage_isoDuctile.f90 b/src/source_damage_isoDuctile.f90 index 27af7342f..66dc006a6 100644 --- a/src/source_damage_isoDuctile.f90 +++ b/src/source_damage_isoDuctile.f90 @@ -83,8 +83,8 @@ subroutine source_damage_isoDuctile_init NofMyPhase=count(material_phaseAt==p) * discretization_nIP call material_allocateSourceState(p,sourceOffset,NofMyPhase,1,1,0) - sourceState(p)%p(sourceOffset)%atolState = config%getFloat('isoductile_atol',defaultVal=1.0e-3_pReal) - if(any(sourceState(p)%p(sourceOffset)%atolState <= 0.0_pReal)) & + sourceState(p)%p(sourceOffset)%atol = config%getFloat('isoductile_atol',defaultVal=1.0e-3_pReal) + if(any(sourceState(p)%p(sourceOffset)%atol <= 0.0_pReal)) & extmsg = trim(extmsg)//' isoductile_atol' end associate