diff --git a/code/crystallite.f90 b/code/crystallite.f90 index 1636a6cf8..a4ffa8cd3 100644 --- a/code/crystallite.f90 +++ b/code/crystallite.f90 @@ -33,11 +33,11 @@ module crystallite character(len=64), dimension(:,:), allocatable, private :: & crystallite_output !< name of each post result output integer(pInt), public, protected :: & - crystallite_maxSizePostResults + crystallite_maxSizePostResults !< description now available integer(pInt), dimension(:), allocatable, public, protected :: & - crystallite_sizePostResults + crystallite_sizePostResults !< description now available integer(pInt), dimension(:,:), allocatable, private :: & - crystallite_sizePostResult + crystallite_sizePostResult !< description now available integer(pInt), dimension(:,:,:), allocatable, private :: & crystallite_symmetryID !< crystallographic symmetry 1=cubic 2=hexagonal, needed in all orientation calcs @@ -94,11 +94,11 @@ module crystallite logical, dimension (:,:,:), allocatable, private :: & crystallite_todo !< flag to indicate need for further computation logical, dimension (:,:), allocatable, private :: & - crystallite_clearToWindForward, & - crystallite_clearToCutback, & - crystallite_syncSubFrac, & - crystallite_syncSubFracCompleted, & - crystallite_neighborEnforcedCutback + crystallite_clearToWindForward, & !< description now available + crystallite_clearToCutback, & !< description now available + crystallite_syncSubFrac, & !< description now available + crystallite_syncSubFracCompleted, & !< description now available + crystallite_neighborEnforcedCutback !< description now available public :: & crystallite_init, & diff --git a/code/lattice.f90 b/code/lattice.f90 index e0336fb14..cb77e811d 100644 --- a/code/lattice.f90 +++ b/code/lattice.f90 @@ -41,8 +41,8 @@ module lattice lattice_maxNonSchmid = 6_pInt !< max # of non schmid contributions over lattice structures integer(pInt), allocatable, dimension(:,:), protected, public :: & - lattice_NslipSystem, & !< # of slip systems in each family - lattice_NtwinSystem !< # of twin systems in each family + lattice_NslipSystem, & !< total # of slip systems in each family + lattice_NtwinSystem !< total # of twin systems in each family integer(pInt), allocatable, dimension(:,:,:), protected, public :: & lattice_interactionSlipSlip, & !< Slip--slip interaction type @@ -75,8 +75,8 @@ module lattice lattice_shearTwin !< characteristic twin shear integer(pInt), private :: & - lattice_Nhexagonal, & !< # of hexagonal lattice structure (from tag CoverA_ratio) - lattice_Nstructure !< # of lattice structures (1: fcc,2: bcc,3+: hexagonal) + lattice_Nhexagonal, & !< total # of hexagonal lattice structure (from tag CoverA_ratio) + lattice_Nstructure !< total # of lattice structures (1: fcc,2: bcc,3+: hexagonal) integer(pInt), dimension(:,:), pointer, private :: & interactionSlipSlip, & @@ -85,15 +85,15 @@ module lattice interactionTwinTwin integer(pInt), allocatable, dimension(:), protected, public :: & - NnonSchmid !< # of non-Schmid contributions for each structure + NnonSchmid !< total # of non-Schmid contributions for each structure !-------------------------------------------------------------------------------------------------- ! fcc (1) integer(pInt), dimension(lattice_maxNslipFamily), parameter, public :: & - lattice_fcc_NslipSystem = int([12, 0, 0, 0, 0],pInt) !< # of slip systems per family for fcc + lattice_fcc_NslipSystem = int([12, 0, 0, 0, 0],pInt) !< total # of slip systems per family for fcc integer(pInt), dimension(lattice_maxNtwinFamily), parameter, public :: & - lattice_fcc_NtwinSystem = int([12, 0, 0, 0],pInt) !< # of twin systems per family for fcc + lattice_fcc_NtwinSystem = int([12, 0, 0, 0],pInt) !< total # of twin systems per family for fcc integer(pInt), parameter, private :: & lattice_fcc_Nslip = 12_pInt, & ! sum(lattice_fcc_NslipSystem), & !< total # of slip systems for fcc @@ -208,7 +208,7 @@ module lattice 2,2,2,2,2,2,2,2,2,1,1,1 & ],pInt),[lattice_fcc_Ntwin,lattice_fcc_Ntwin],order=[2,1]) !< Twin--twin interaction types for fcc - integer(pInt), parameter, private :: NnonSchmid_fcc = 0_pInt !< # of non-Schmid contributions for fcc + integer(pInt), parameter, private :: NnonSchmid_fcc = 0_pInt !< total # of non-Schmid contributions for fcc real(pReal), dimension(3,3,2,NnonSchmid_fcc,lattice_fcc_Nslip), parameter, private :: & lattice_nonSchmid_fcc = 0.0_pReal ! reshape([],[3,3,2,NnonSchmid_fcc,lattice_fcc_Nslip]) !< Tensor for each non-Schmid contribution for fcc @@ -217,10 +217,10 @@ module lattice !-------------------------------------------------------------------------------------------------- ! bcc (2) integer(pInt), dimension(lattice_maxNslipFamily), parameter, public :: & - lattice_bcc_NslipSystem = int([ 12, 12, 0, 0, 0], pInt) !< # of slip systems per family for bcc + lattice_bcc_NslipSystem = int([ 12, 12, 0, 0, 0], pInt) !< total # of slip systems per family for bcc integer(pInt), dimension(lattice_maxNtwinFamily), parameter, public :: & - lattice_bcc_NtwinSystem = int([ 12, 0, 0, 0], pInt) !< # of twin systems per family for bcc + lattice_bcc_NtwinSystem = int([ 12, 0, 0, 0], pInt) !< total # of twin systems per family for bcc integer(pInt), parameter, private :: & lattice_bcc_Nslip = 24_pInt, & ! sum(lattice_bcc_NslipSystem), & !< total # of slip systems for bcc diff --git a/code/math.f90 b/code/math.f90 index ea8feb8c0..28a937602 100644 --- a/code/math.f90 +++ b/code/math.f90 @@ -61,12 +61,12 @@ module math real(pReal), dimension(6), parameter, private :: & nrmMandel = [& 1.0_pReal, 1.0_pReal, 1.0_pReal,& - 1.414213562373095_pReal, 1.414213562373095_pReal, 1.414213562373095_pReal] !< weighting for Mandel notation (forward) + 1.414213562373095_pReal, 1.414213562373095_pReal, 1.414213562373095_pReal ] !< weighting for Mandel notation (forward) real(pReal), dimension(6), parameter , public :: & invnrmMandel = [& 1.0_pReal, 1.0_pReal, 1.0_pReal,& - 0.7071067811865476_pReal, 0.7071067811865476_pReal, 0.7071067811865476_pReal] !< weighting for Mandel notation (backward) + 0.7071067811865476_pReal, 0.7071067811865476_pReal, 0.7071067811865476_pReal ] !< weighting for Mandel notation (backward) integer(pInt), dimension (2,6), parameter, private :: & mapVoigt = reshape([& @@ -419,7 +419,7 @@ end function math_partition pure function math_range(N) implicit none - integer(pInt), intent(in) :: N + integer(pInt), intent(in) :: N !< length of range integer(pInt) :: i integer(pInt), dimension(N) :: math_range @@ -434,7 +434,7 @@ end function math_range pure function math_identity2nd(dimen) implicit none - integer(pInt), intent(in) :: dimen + integer(pInt), intent(in) :: dimen !< tensor dimension integer(pInt) :: i real(pReal), dimension(dimen,dimen) :: math_identity2nd @@ -450,7 +450,7 @@ end function math_identity2nd pure function math_identity4th(dimen) implicit none - integer(pInt), intent(in) :: dimen + integer(pInt), intent(in) :: dimen !< tensor dimension integer(pInt) :: i,j,k,l real(pReal), dimension(dimen,dimen,dimen,dimen) :: math_identity4th @@ -469,7 +469,6 @@ end function math_identity4th real(pReal) pure function math_civita(i,j,k) implicit none - integer(pInt), intent(in) :: i,j,k math_civita = 0.0_pReal