From 3990536f1ca90d6e2f9709bd8b9b2f54732819e8 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 4 Feb 2022 17:42:05 +0100 Subject: [PATCH] consistent order of arguments --- src/phase.f90 | 8 ++--- src/phase_mechanical.f90 | 54 ++++++++++++++++---------------- src/phase_mechanical_plastic.f90 | 8 ++--- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/phase.f90 b/src/phase.f90 index 8bc797e85..c4e7142f8 100644 --- a/src/phase.f90 +++ b/src/phase.f90 @@ -272,10 +272,10 @@ module phase type(tRotationContainer), dimension(:), intent(in) :: orientation end subroutine plastic_nonlocal_updateCompatibility - module subroutine plastic_dependentState(en,ph) + module subroutine plastic_dependentState(ph,en) integer, intent(in) :: & - en, & - ph + ph, & + en end subroutine plastic_dependentState module subroutine damage_anisobrittle_LiAndItsTangent(Ld, dLd_dTstar, S, ph,en) @@ -562,7 +562,7 @@ subroutine crystallite_init() en = material_phaseEntry(co,ce) ph = material_phaseID(co,ce) call crystallite_orientations(co,ip,el) - call plastic_dependentState(en,ph) ! update dependent state variables to be consistent with basic states + call plastic_dependentState(ph,en) ! update dependent state variables to be consistent with basic states end do end do end do diff --git a/src/phase_mechanical.f90 b/src/phase_mechanical.f90 index 655f53ad8..de9c2bea2 100644 --- a/src/phase_mechanical.f90 +++ b/src/phase_mechanical.f90 @@ -362,11 +362,11 @@ end subroutine mechanical_results !> @brief calculation of stress (P) with time integration based on a residuum in Lp and !> intermediate acceleration of the Newton-Raphson correction !-------------------------------------------------------------------------------------------------- -function integrateStress(F,subFp0,subFi0,Delta_t,en,ph) result(broken) +function integrateStress(F,subFp0,subFi0,Delta_t,ph,en) result(broken) real(pReal), dimension(3,3), intent(in) :: F,subFp0,subFi0 real(pReal), intent(in) :: Delta_t - integer, intent(in) :: en, ph + integer, intent(in) :: ph, en real(pReal), dimension(3,3):: Fp_new, & ! plastic deformation gradient at end of timestep invFp_new, & ! inverse of Fp_new @@ -420,7 +420,7 @@ function integrateStress(F,subFp0,subFi0,Delta_t,en,ph) result(broken) broken = .true. - call plastic_dependentState(en,ph) + call plastic_dependentState(ph,en) Lpguess = phase_mechanical_Lp(ph)%data(1:3,1:3,en) ! take as first guess Liguess = phase_mechanical_Li(ph)%data(1:3,1:3,en) ! take as first guess @@ -568,14 +568,14 @@ end function integrateStress !> @brief integrate stress, state with adaptive 1st order explicit Euler method !> using Fixed Point Iteration to adapt the stepsize !-------------------------------------------------------------------------------------------------- -function integrateStateFPI(F_0,F,subFp0,subFi0,subState0,Delta_t,en,ph) result(broken) +function integrateStateFPI(F_0,F,subFp0,subFi0,subState0,Delta_t,ph,en) result(broken) real(pReal), intent(in),dimension(3,3) :: F_0,F,subFp0,subFi0 real(pReal), intent(in),dimension(:) :: subState0 real(pReal), intent(in) :: Delta_t integer, intent(in) :: & - en, & - ph + ph, & + en logical :: & broken @@ -604,7 +604,7 @@ function integrateStateFPI(F_0,F,subFp0,subFi0,subState0,Delta_t,en,ph) result(b dotState_last(1:sizeDotState,2) = merge(dotState_last(1:sizeDotState,1),0.0, nIterationState > 1) dotState_last(1:sizeDotState,1) = dotState - broken = integrateStress(F,subFp0,subFi0,Delta_t,en,ph) + broken = integrateStress(F,subFp0,subFi0,Delta_t,ph,en) if(broken) exit iteration dotState = plastic_dotState(Delta_t,ph,en) @@ -656,14 +656,14 @@ end function integrateStateFPI !-------------------------------------------------------------------------------------------------- !> @brief integrate state with 1st order explicit Euler method !-------------------------------------------------------------------------------------------------- -function integrateStateEuler(F_0,F,subFp0,subFi0,subState0,Delta_t,en,ph) result(broken) +function integrateStateEuler(F_0,F,subFp0,subFi0,subState0,Delta_t,ph,en) result(broken) real(pReal), intent(in),dimension(3,3) :: F_0,F,subFp0,subFi0 real(pReal), intent(in),dimension(:) :: subState0 real(pReal), intent(in) :: Delta_t integer, intent(in) :: & - en, & - ph !< grain index in grain loop + ph, & + en !< grain index in grain loop logical :: & broken @@ -685,7 +685,7 @@ function integrateStateEuler(F_0,F,subFp0,subFi0,subState0,Delta_t,en,ph) result broken = plastic_deltaState(ph,en) if(broken) return - broken = integrateStress(F,subFp0,subFi0,Delta_t,en,ph) + broken = integrateStress(F,subFp0,subFi0,Delta_t,ph,en) end function integrateStateEuler @@ -693,14 +693,14 @@ end function integrateStateEuler !-------------------------------------------------------------------------------------------------- !> @brief integrate stress, state with 1st order Euler method with adaptive step size !-------------------------------------------------------------------------------------------------- -function integrateStateAdaptiveEuler(F_0,F,subFp0,subFi0,subState0,Delta_t,en,ph) result(broken) +function integrateStateAdaptiveEuler(F_0,F,subFp0,subFi0,subState0,Delta_t,ph,en) result(broken) real(pReal), intent(in),dimension(3,3) :: F_0,F,subFp0,subFi0 real(pReal), intent(in),dimension(:) :: subState0 real(pReal), intent(in) :: Delta_t integer, intent(in) :: & - en, & - ph + ph, & + en logical :: & broken @@ -725,7 +725,7 @@ function integrateStateAdaptiveEuler(F_0,F,subFp0,subFi0,subState0,Delta_t,en,ph broken = plastic_deltaState(ph,en) if(broken) return - broken = integrateStress(F,subFp0,subFi0,Delta_t,en,ph) + broken = integrateStress(F,subFp0,subFi0,Delta_t,ph,en) if(broken) return dotState = plastic_dotState(Delta_t,ph,en) @@ -741,12 +741,12 @@ end function integrateStateAdaptiveEuler !--------------------------------------------------------------------------------------------------- !> @brief Integrate state (including stress integration) with the classic Runge Kutta method !--------------------------------------------------------------------------------------------------- -function integrateStateRK4(F_0,F,subFp0,subFi0,subState0,Delta_t,en,ph) result(broken) +function integrateStateRK4(F_0,F,subFp0,subFi0,subState0,Delta_t,ph,en) result(broken) real(pReal), intent(in),dimension(3,3) :: F_0,F,subFp0,subFi0 real(pReal), intent(in),dimension(:) :: subState0 real(pReal), intent(in) :: Delta_t - integer, intent(in) :: en, ph + integer, intent(in) :: ph, en logical :: broken real(pReal), dimension(3,3), parameter :: & @@ -761,7 +761,7 @@ function integrateStateRK4(F_0,F,subFp0,subFi0,subState0,Delta_t,en,ph) result(b B = [1.0_pReal/6.0_pReal, 1.0_pReal/3.0_pReal, 1.0_pReal/3.0_pReal, 1.0_pReal/6.0_pReal] - broken = integrateStateRK(F_0,F,subFp0,subFi0,subState0,Delta_t,en,ph,A,B,C) + broken = integrateStateRK(F_0,F,subFp0,subFi0,subState0,Delta_t,ph,en,A,B,C) end function integrateStateRK4 @@ -769,12 +769,12 @@ end function integrateStateRK4 !--------------------------------------------------------------------------------------------------- !> @brief Integrate state (including stress integration) with the Cash-Carp method !--------------------------------------------------------------------------------------------------- -function integrateStateRKCK45(F_0,F,subFp0,subFi0,subState0,Delta_t,en,ph) result(broken) +function integrateStateRKCK45(F_0,F,subFp0,subFi0,subState0,Delta_t,ph,en) result(broken) real(pReal), intent(in),dimension(3,3) :: F_0,F,subFp0,subFi0 real(pReal), intent(in),dimension(:) :: subState0 real(pReal), intent(in) :: Delta_t - integer, intent(in) :: en, ph + integer, intent(in) :: ph, en logical :: broken real(pReal), dimension(5,5), parameter :: & @@ -796,7 +796,7 @@ function integrateStateRKCK45(F_0,F,subFp0,subFi0,subState0,Delta_t,en,ph) resul 13525.0_pReal/55296.0_pReal, 277.0_pReal/14336.0_pReal, 1._pReal/4._pReal] - broken = integrateStateRK(F_0,F,subFp0,subFi0,subState0,Delta_t,en,ph,A,B,C,DB) + broken = integrateStateRK(F_0,F,subFp0,subFi0,subState0,Delta_t,ph,en,A,B,C,DB) end function integrateStateRKCK45 @@ -805,7 +805,7 @@ end function integrateStateRKCK45 !> @brief Integrate state (including stress integration) with an explicit Runge-Kutta method or an !! embedded explicit Runge-Kutta method !-------------------------------------------------------------------------------------------------- -function integrateStateRK(F_0,F,subFp0,subFi0,subState0,Delta_t,en,ph,A,B,C,DB) result(broken) +function integrateStateRK(F_0,F,subFp0,subFi0,subState0,Delta_t,ph,en,A,B,C,DB) result(broken) real(pReal), intent(in),dimension(3,3) :: F_0,F,subFp0,subFi0 real(pReal), intent(in),dimension(:) :: subState0 @@ -814,8 +814,8 @@ function integrateStateRK(F_0,F,subFp0,subFi0,subState0,Delta_t,en,ph,A,B,C,DB) real(pReal), dimension(:), intent(in) :: B, C real(pReal), dimension(:), intent(in), optional :: DB integer, intent(in) :: & - en, & - ph + ph, & + en logical :: broken integer :: & @@ -848,7 +848,7 @@ function integrateStateRK(F_0,F,subFp0,subFi0,subState0,Delta_t,en,ph,A,B,C,DB) plasticState(ph)%state(1:sizeDotState,en) = subState0 & + dotState * Delta_t - broken = integrateStress(F_0 + (F - F_0) * Delta_t * C(stage),subFp0,subFi0,Delta_t * C(stage),en,ph) + broken = integrateStress(F_0 + (F - F_0) * Delta_t * C(stage),subFp0,subFi0,Delta_t * C(stage),ph,en) if(broken) exit dotState = plastic_dotState(Delta_t,ph,en) @@ -873,7 +873,7 @@ function integrateStateRK(F_0,F,subFp0,subFi0,subState0,Delta_t,en,ph,A,B,C,DB) broken = plastic_deltaState(ph,en) if(broken) return - broken = integrateStress(F,subFp0,subFi0,Delta_t,en,ph) + broken = integrateStress(F,subFp0,subFi0,Delta_t,ph,en) end function integrateStateRK @@ -1052,7 +1052,7 @@ module function phase_mechanical_constitutive(Delta_t,co,ce) result(converged_) if (todo) then subF = subF0 & + subStep * (phase_mechanical_F(ph)%data(1:3,1:3,en) - phase_mechanical_F0(ph)%data(1:3,1:3,en)) - converged_ = .not. integrateState(subF0,subF,subFp0,subFi0,subState0(1:sizeDotState),subStep * Delta_t,en,ph) + converged_ = .not. integrateState(subF0,subF,subFp0,subFi0,subState0(1:sizeDotState),subStep * Delta_t,ph,en) endif enddo cutbackLooping diff --git a/src/phase_mechanical_plastic.f90 b/src/phase_mechanical_plastic.f90 index 13f14717e..973f0ddbf 100644 --- a/src/phase_mechanical_plastic.f90 +++ b/src/phase_mechanical_plastic.f90 @@ -178,7 +178,7 @@ submodule(phase:mechanical) plastic en end subroutine dislotungsten_dependentState - module subroutine nonlocal_dependentState(ph, en) + module subroutine nonlocal_dependentState(ph,en) integer, intent(in) :: & ph, & en @@ -338,11 +338,11 @@ end function plastic_dotState !-------------------------------------------------------------------------------------------------- !> @brief calls microstructure function of the different plasticity constitutive models !-------------------------------------------------------------------------------------------------- -module subroutine plastic_dependentState(en,ph) +module subroutine plastic_dependentState(ph,en) integer, intent(in) :: & - en, & - ph + ph, & + en plasticType: select case (phase_plasticity(ph))