From 6f9f494654ec6409c37dc2001708a6235007a1d8 Mon Sep 17 00:00:00 2001 From: Sharan Roongta Date: Fri, 26 Jun 2020 12:22:33 +0200 Subject: [PATCH] minor polishing --- src/CPFEM.f90 | 2 +- src/homogenization.f90 | 8 ++--- src/homogenization_mech_RGC.f90 | 56 ++++++++++++++++----------------- src/numerics.f90 | 8 ++--- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/CPFEM.f90 b/src/CPFEM.f90 index 6647581e3..00afbbc01 100644 --- a/src/CPFEM.f90 +++ b/src/CPFEM.f90 @@ -46,7 +46,7 @@ module CPFEM type, private :: tNumerics integer :: & - iJacoStiffness !< frequency of stiffness update + iJacoStiffness !< frequency of stiffness update end type tNumerics type(tNumerics), private :: num diff --git a/src/homogenization.f90 b/src/homogenization.f90 index e055c6f06..a5ba56e9f 100644 --- a/src/homogenization.f90 +++ b/src/homogenization.f90 @@ -62,7 +62,7 @@ module homogenization module subroutine mech_RGC_init(num_homogMech) class(tNode), pointer, intent(in) :: & - num_homogMech + num_homogMech !< pointer to mechanical homogenization numerics data end subroutine mech_RGC_init @@ -139,8 +139,8 @@ subroutine homogenization_init num_homogMech, & num_homogGeneric - num_homog => numerics_root%get('homogenization',defaultVal=emptyDict) - num_homogMech => num_homog%get('mech',defaultVal=emptyDict) + num_homog => numerics_root%get('homogenization',defaultVal=emptyDict) + num_homogMech => num_homog%get('mech',defaultVal=emptyDict) num_homogGeneric => num_homog%get('generic',defaultVal=emptyDict) if (any(homogenization_type == HOMOGENIZATION_NONE_ID)) call mech_none_init @@ -169,7 +169,7 @@ subroutine homogenization_init if (debug_g < 1 .or. debug_g > homogenization_Ngrains(material_homogenizationAt(debug_e))) & call IO_error(602,ext_msg='constituent', el=debug_e, g=debug_g) - num%nMPstate = num_homogGeneric%get_asInt( 'nMPstate', defaultVal=10) + num%nMPstate = num_homogGeneric%get_asInt ('nMPstate', defaultVal=10) num%subStepMinHomog = num_homogGeneric%get_asFloat('subStepMin', defaultVal=1.0e-3_pReal) num%subStepSizeHomog = num_homogGeneric%get_asFloat('subStepSize', defaultVal=0.25_pReal) num%stepIncreaseHomog = num_homogGeneric%get_asFloat('stepIncrease', defaultVal=1.5_pReal) diff --git a/src/homogenization_mech_RGC.f90 b/src/homogenization_mech_RGC.f90 index 7ef73b130..90e08b71a 100644 --- a/src/homogenization_mech_RGC.f90 +++ b/src/homogenization_mech_RGC.f90 @@ -45,19 +45,19 @@ submodule(homogenization) homogenization_mech_RGC type :: tNumerics_RGC real(pReal) :: & - atol, & !< absolute tolerance of RGC residuum - rtol, & !< relative tolerance of RGC residuum - absMax, & !< absolute maximum of RGC residuum - relMax, & !< relative maximum of RGC residuum - pPert, & !< perturbation for computing RGC penalty tangent - xSmoo, & !< RGC penalty smoothing parameter (hyperbolic tangent) - viscPower, & !< power (sensitivity rate) of numerical viscosity in RGC scheme, Default 1.0e0: Newton viscosity (linear model) - viscModus, & !< stress modulus of RGC numerical viscosity, Default 0.0e0: No viscosity is applied - refRelaxRate, & !< reference relaxation rate in RGC viscosity - maxdRelax, & !< threshold of maximum relaxation vector increment (if exceed this then cutback) - maxVolDiscr, & !< threshold of maximum volume discrepancy allowed - volDiscrMod, & !< stiffness of RGC volume discrepancy (zero = without volume discrepancy constraint) - volDiscrPow !< powerlaw penalty for volume discrepancy + atol, & !< absolute tolerance of RGC residuum + rtol, & !< relative tolerance of RGC residuum + absMax, & !< absolute maximum of RGC residuum + relMax, & !< relative maximum of RGC residuum + pPert, & !< perturbation for computing RGC penalty tangent + xSmoo, & !< RGC penalty smoothing parameter (hyperbolic tangent) + viscPower, & !< power (sensitivity rate) of numerical viscosity in RGC scheme, Default 1.0e0: Newton viscosity (linear model) + viscModus, & !< stress modulus of RGC numerical viscosity, Default 0.0e0: No viscosity is applied + refRelaxRate, & !< reference relaxation rate in RGC viscosity + maxdRelax, & !< threshold of maximum relaxation vector increment (if exceed this then cutback) + maxVolDiscr, & !< threshold of maximum volume discrepancy allowed + volDiscrMod, & !< stiffness of RGC volume discrepancy (zero = without volume discrepancy constraint) + volDiscrPow !< powerlaw penalty for volume discrepancy end type tNumerics_RGC type(tparameters), dimension(:), allocatable :: & @@ -78,7 +78,7 @@ contains module subroutine mech_RGC_init(num_homogMech) class(tNode), pointer, intent(in) :: & - num_homogMech + num_homogMech !< pointer to mechanical homogenization numerics data integer :: & Ninstance, & @@ -87,7 +87,7 @@ module subroutine mech_RGC_init(num_homogMech) sizeState, nIntFaceTot class (tNode), pointer :: & - num_RGC + num_RGC ! pointer to RGC numerics data write(6,'(/,a)') ' <<<+- homogenization_'//HOMOGENIZATION_RGC_label//' init -+>>>'; flush(6) @@ -108,19 +108,19 @@ module subroutine mech_RGC_init(num_homogMech) num_RGC => num_homogMech%get('RGC',defaultVal=emptyDict) - num%atol = num_RGC%get_asFloat('atol', defaultVal=1.0e+4_pReal) - num%rtol = num_RGC%get_asFloat('rtol', defaultVal=1.0e-3_pReal) - num%absMax = num_RGC%get_asFloat('amax', defaultVal=1.0e+10_pReal) - num%relMax = num_RGC%get_asFloat('rmax', defaultVal=1.0e+2_pReal) - num%pPert = num_RGC%get_asFloat('perturbpenalty', defaultVal=1.0e-7_pReal) - num%xSmoo = num_RGC%get_asFloat('relvantmismatch', defaultVal=1.0e-5_pReal) - num%viscPower = num_RGC%get_asFloat('viscositypower', defaultVal=1.0e+0_pReal) - num%viscModus = num_RGC%get_asFloat('viscositymodulus', defaultVal=0.0e+0_pReal) - num%refRelaxRate = num_RGC%get_asFloat('refrelaxationrate',defaultVal=1.0e-3_pReal) - num%maxdRelax = num_RGC%get_asFloat('maxrelaxationrate',defaultVal=1.0e+0_pReal) - num%maxVolDiscr = num_RGC%get_asFloat('maxvoldiscrepancy',defaultVal=1.0e-5_pReal) - num%volDiscrMod = num_RGC%get_asFloat('voldiscrepancymod',defaultVal=1.0e+12_pReal) - num%volDiscrPow = num_RGC%get_asFloat('dicrepancypower', defaultVal=5.0_pReal) + num%atol = num_RGC%get_asFloat('atol', defaultVal=1.0e+4_pReal) + num%rtol = num_RGC%get_asFloat('rtol', defaultVal=1.0e-3_pReal) + num%absMax = num_RGC%get_asFloat('amax', defaultVal=1.0e+10_pReal) + num%relMax = num_RGC%get_asFloat('rmax', defaultVal=1.0e+2_pReal) + num%pPert = num_RGC%get_asFloat('perturbpenalty', defaultVal=1.0e-7_pReal) + num%xSmoo = num_RGC%get_asFloat('relvantmismatch', defaultVal=1.0e-5_pReal) + num%viscPower = num_RGC%get_asFloat('viscositypower', defaultVal=1.0e+0_pReal) + num%viscModus = num_RGC%get_asFloat('viscositymodulus', defaultVal=0.0e+0_pReal) + num%refRelaxRate = num_RGC%get_asFloat('refrelaxationrate', defaultVal=1.0e-3_pReal) + num%maxdRelax = num_RGC%get_asFloat('maxrelaxationrate', defaultVal=1.0e+0_pReal) + num%maxVolDiscr = num_RGC%get_asFloat('maxvoldiscrepancy', defaultVal=1.0e-5_pReal) + num%volDiscrMod = num_RGC%get_asFloat('voldiscrepancymod', defaultVal=1.0e+12_pReal) + num%volDiscrPow = num_RGC%get_asFloat('dicrepancypower', defaultVal=5.0_pReal) if (num%atol <= 0.0_pReal) call IO_error(301,ext_msg='absTol_RGC') diff --git a/src/numerics.f90 b/src/numerics.f90 index 56bfc2492..35436296c 100644 --- a/src/numerics.f90 +++ b/src/numerics.f90 @@ -20,12 +20,12 @@ module numerics private class(tNode), pointer, protected, public :: & - numerics_root + numerics_root !< root pointer storing the numerics YAML structure integer, protected, public :: & - worldrank = 0, & !< MPI worldrank (/=0 for MPI simulations only) - worldsize = 1 !< MPI worldsize (/=1 for MPI simulations only) + worldrank = 0, & !< MPI worldrank (/=0 for MPI simulations only) + worldsize = 1 !< MPI worldsize (/=1 for MPI simulations only) integer(4), protected, public :: & - DAMASK_NumThreadsInt = 0 !< value stored in environment variable DAMASK_NUM_THREADS, set to zero if no OpenMP directive + DAMASK_NumThreadsInt = 0 !< value stored in environment variable DAMASK_NUM_THREADS, set to zero if no OpenMP directive public :: numerics_init