From 34fb7e921a4754fa0eb8b5d1953e7c1adaff7504 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 20 Nov 2022 12:58:50 +0100 Subject: [PATCH] use self-documenting code the comments did not anything that was not clear from the variable/function names --- src/grid/grid_mech_spectral_basic.f90 | 20 ++++++--------- src/grid/grid_mech_spectral_polarisation.f90 | 27 ++++++-------------- 2 files changed, 16 insertions(+), 31 deletions(-) diff --git a/src/grid/grid_mech_spectral_basic.f90 b/src/grid/grid_mech_spectral_basic.f90 index cab3d4c7b..c570e94e7 100644 --- a/src/grid/grid_mech_spectral_basic.f90 +++ b/src/grid/grid_mech_spectral_basic.f90 @@ -519,8 +519,6 @@ subroutine formResidual(in, F, & if (nfuncs == 0 .and. PETScIter == 0) totalIter = -1 ! new increment -!-------------------------------------------------------------------------------------------------- -! begin of new iteration newIteration: if (totalIter <= PETScIter) then totalIter = totalIter + 1 print'(1x,a,3(a,i0))', trim(incInfo), ' @ Iteration ', num%itmin, '≤',totalIter, '≤', num%itmax @@ -531,17 +529,15 @@ subroutine formResidual(in, F, & flush(IO_STDOUT) end if newIteration -!-------------------------------------------------------------------------------------------------- -! evaluate constitutive response - call utilities_constitutiveResponse(r, & ! residuum gets field of first PK stress (to save memory) - P_av,C_volAvg,C_minMaxAvg, & - F,params%Delta_t,params%rotation_BC) - call MPI_Allreduce(MPI_IN_PLACE,terminallyIll,1_MPI_INTEGER_KIND,MPI_LOGICAL,MPI_LOR,MPI_COMM_WORLD,err_MPI) - if (err_MPI /= 0_MPI_INTEGER_KIND) error stop 'MPI error' - err_div = utilities_divergenceRMS(r) + associate (P => r) + call utilities_constitutiveResponse(P, & + P_av,C_volAvg,C_minMaxAvg, & + F,params%Delta_t,params%rotation_BC) + call MPI_Allreduce(MPI_IN_PLACE,terminallyIll,1_MPI_INTEGER_KIND,MPI_LOGICAL,MPI_LOR,MPI_COMM_WORLD,err_MPI) + if (err_MPI /= 0_MPI_INTEGER_KIND) error stop 'MPI error' + err_div = utilities_divergenceRMS(P) + end associate -!-------------------------------------------------------------------------------------------------- -! stress BC handling deltaF_aim = math_mul3333xx33(S, P_av - P_aim) ! S = 0.0 for no bc F_aim = F_aim - deltaF_aim err_BC = maxval(abs(merge(.0_pReal,P_av - P_aim,params%stress_mask))) diff --git a/src/grid/grid_mech_spectral_polarisation.f90 b/src/grid/grid_mech_spectral_polarisation.f90 index 90e6d346f..e2ec8488c 100644 --- a/src/grid/grid_mech_spectral_polarisation.f90 +++ b/src/grid/grid_mech_spectral_polarisation.f90 @@ -597,8 +597,6 @@ subroutine formResidual(in, FandF_tau, & if (nfuncs == 0 .and. PETScIter == 0) totalIter = -1 ! new increment -!-------------------------------------------------------------------------------------------------- -! begin of new iteration newIteration: if (totalIter <= PETScIter) then totalIter = totalIter + 1 print'(1x,a,3(a,i0))', trim(incInfo), ' @ Iteration ', num%itmin, '≤',totalIter, '≤', num%itmax @@ -609,38 +607,29 @@ subroutine formResidual(in, FandF_tau, & flush(IO_STDOUT) end if newIteration -!-------------------------------------------------------------------------------------------------- -! do k = 1, cells3; do j = 1, cells(2); do i = 1, cells(1) r_F_tau(1:3,1:3,i,j,k) = & num%beta*math_mul3333xx33(C_scale,F(1:3,1:3,i,j,k) - math_I3) -& num%alpha*matmul(F(1:3,1:3,i,j,k), & math_mul3333xx33(C_scale,F_tau(1:3,1:3,i,j,k) - F(1:3,1:3,i,j,k) - math_I3)) end do; end do; end do - -!-------------------------------------------------------------------------------------------------- -! constructing residual r_F_tau = num%beta*F & - utilities_GammaConvolution(r_F_tau,params%rotation_BC%rotate(num%beta*F_aim,active=.true.)) -!-------------------------------------------------------------------------------------------------- -! evaluate constitutive response - call utilities_constitutiveResponse(r_F, & ! "residuum" gets field of first PK stress (to save memory) - P_av,C_volAvg,C_minMaxAvg, & - F - r_F_tau/num%beta,params%Delta_t,params%rotation_BC) - call MPI_Allreduce(MPI_IN_PLACE,terminallyIll,1_MPI_INTEGER_KIND,MPI_LOGICAL,MPI_LOR,MPI_COMM_WORLD,err_MPI) - err_div = utilities_divergenceRMS(r_F) - err_curl = utilities_curlRMS(F) + associate (P => r_F) + call utilities_constitutiveResponse(P, & + P_av,C_volAvg,C_minMaxAvg, & + F - r_F_tau/num%beta,params%Delta_t,params%rotation_BC) + call MPI_Allreduce(MPI_IN_PLACE,terminallyIll,1_MPI_INTEGER_KIND,MPI_LOGICAL,MPI_LOR,MPI_COMM_WORLD,err_MPI) + err_div = utilities_divergenceRMS(P) + err_curl = utilities_curlRMS(F) + end associate -!-------------------------------------------------------------------------------------------------- -! stress BC handling F_aim = F_aim - math_mul3333xx33(S, P_av - P_aim) ! S = 0.0 for no bc err_BC = maxval(abs(merge(math_mul3333xx33(C_scale,F_aim-params%rotation_BC%rotate(F_av)), & P_av-P_aim, & params%stress_mask))) -!-------------------------------------------------------------------------------------------------- -! constructing residual e = 0 do k = 1, cells3; do j = 1, cells(2); do i = 1, cells(1) e = e + 1