diff --git a/src/YAML_parse.f90 b/src/YAML_parse.f90 index cfbcf11f3..626a387fa 100644 --- a/src/YAML_parse.f90 +++ b/src/YAML_parse.f90 @@ -36,15 +36,15 @@ end subroutine YAML_init !-------------------------------------------------------------------------------------------------- recursive function parse_flow(flow_string) result(node) - character(len=*), intent(inout) :: flow_string + character(len=*), intent(inout) :: flow_string !< YAML file in flow style class (tNode), pointer :: node class (tNode), pointer :: myVal character(len=pStringLen) :: key - integer :: e, & !> end position of dictionary or list - s, & !> start position of dictionary or list - d !> position of key: value separator (':') + integer :: e, & ! end position of dictionary or list + s, & ! start position of dictionary or list + d ! position of key: value separator (':') flow_string = trim(adjustl(flow_string(:))) if (len_trim(flow_string) == 0) then @@ -96,7 +96,7 @@ end function parse_flow !-------------------------------------------------------------------------------------------------- integer function find_end(str,e_char) - character(len=*), intent(in) :: str + character(len=*), intent(in) :: str !< chunk of YAML flow string character, intent(in) :: e_char !< end of list/dict ( '}' or ']') integer :: N_sq, & !< number of open square brackets diff --git a/src/grid/grid_mech_spectral_polarisation.f90 b/src/grid/grid_mech_spectral_polarisation.f90 index 87cb69579..f6e554ed4 100644 --- a/src/grid/grid_mech_spectral_polarisation.f90 +++ b/src/grid/grid_mech_spectral_polarisation.f90 @@ -46,8 +46,8 @@ module grid_mech_spectral_polarisation eps_stress_atol, & !< absolute tolerance for fullfillment of stress BC eps_stress_rtol !< relative tolerance for fullfillment of stress BC real(pReal) :: & - polarAlpha, & !< polarization scheme parameter 0.0 < alpha < 2.0. alpha = 1.0 ==> AL scheme, alpha = 2.0 ==> accelerated scheme - polarBeta !< polarization scheme parameter 0.0 < beta < 2.0. beta = 1.0 ==> AL scheme, beta = 2.0 ==> accelerated scheme + alpha, & !< polarization scheme parameter 0.0 < alpha < 2.0. alpha = 1.0 ==> AL scheme, alpha = 2.0 ==> accelerated scheme + beta !< polarization scheme parameter 0.0 < beta < 2.0. beta = 1.0 ==> AL scheme, beta = 2.0 ==> accelerated scheme end type tNumerics type(tNumerics), private :: num ! numerics parameters. Better name? @@ -143,8 +143,8 @@ subroutine grid_mech_spectral_polarisation_init num%eps_stress_rtol = num_grid%get_asFloat ('eps_stress_rtol', defaultVal=0.01_pReal) num%itmin = num_grid%get_asInt ('itmin', defaultVal=1) num%itmax = num_grid%get_asInt ('itmax', defaultVal=250) - num%polarAlpha = num_grid%get_asFloat ('polaralpha', defaultVal=1.0_pReal) - num%polarBeta = num_grid%get_asFloat ('polarbeta', defaultVal=1.0_pReal) + num%alpha = num_grid%get_asFloat ('alpha', defaultVal=1.0_pReal) + num%beta = num_grid%get_asFloat ('beta', defaultVal=1.0_pReal) if (num%eps_div_atol <= 0.0_pReal) call IO_error(301,ext_msg='eps_div_atol') if (num%eps_div_rtol < 0.0_pReal) call IO_error(301,ext_msg='eps_div_rtol') @@ -154,8 +154,8 @@ subroutine grid_mech_spectral_polarisation_init if (num%eps_stress_rtol < 0.0_pReal) call IO_error(301,ext_msg='eps_stress_rtol') if (num%itmax <= 1) call IO_error(301,ext_msg='itmax') if (num%itmin > num%itmax .or. num%itmin < 1) call IO_error(301,ext_msg='itmin') - if (num%polarAlpha <= 0.0_pReal .or. num%polarAlpha > 2.0_pReal) call IO_error(301,ext_msg='polarAlpha') - if (num%polarBeta < 0.0_pReal .or. num%polarBeta > 2.0_pReal) call IO_error(301,ext_msg='polarBeta') + if (num%alpha <= 0.0_pReal .or. num%alpha > 2.0_pReal) call IO_error(301,ext_msg='alpha') + if (num%beta < 0.0_pReal .or. num%beta > 2.0_pReal) call IO_error(301,ext_msg='beta') !-------------------------------------------------------------------------------------------------- ! set default and user defined options for PETSc @@ -568,26 +568,26 @@ subroutine formResidual(in, FandF_tau, & tensorField_real = 0.0_pReal do k = 1, grid3; do j = 1, grid(2); do i = 1, grid(1) tensorField_real(1:3,1:3,i,j,k) = & - num%polarBeta*math_mul3333xx33(C_scale,F(1:3,1:3,i,j,k) - math_I3) -& - num%polarAlpha*matmul(F(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)) enddo; enddo; enddo !-------------------------------------------------------------------------------------------------- ! doing convolution in Fourier space call utilities_FFTtensorForward - call utilities_fourierGammaConvolution(params%rotation_BC%rotate(num%polarBeta*F_aim,active=.true.)) + call utilities_fourierGammaConvolution(params%rotation_BC%rotate(num%beta*F_aim,active=.true.)) call utilities_FFTtensorBackward !-------------------------------------------------------------------------------------------------- ! constructing residual - residual_F_tau = num%polarBeta*F - tensorField_real(1:3,1:3,1:grid(1),1:grid(2),1:grid3) + residual_F_tau = num%beta*F - tensorField_real(1:3,1:3,1:grid(1),1:grid(2),1:grid3) !-------------------------------------------------------------------------------------------------- ! evaluate constitutive response call utilities_constitutiveResponse(residual_F, & ! "residuum" gets field of first PK stress (to save memory) P_av,C_volAvg,C_minMaxAvg, & - F - residual_F_tau/num%polarBeta,params%timeinc,params%rotation_BC) + F - residual_F_tau/num%beta,params%timeinc,params%rotation_BC) call MPI_Allreduce(MPI_IN_PLACE,terminallyIll,1,MPI_LOGICAL,MPI_LOR,PETSC_COMM_WORLD,ierr) !-------------------------------------------------------------------------------------------------- diff --git a/src/numerics.f90 b/src/numerics.f90 index 132c01f87..56bfc2492 100644 --- a/src/numerics.f90 +++ b/src/numerics.f90 @@ -19,7 +19,7 @@ module numerics implicit none private - class(tNode), pointer, public :: & + class(tNode), pointer, protected, public :: & numerics_root integer, protected, public :: & worldrank = 0, & !< MPI worldrank (/=0 for MPI simulations only)