223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

hickups in doxygen documentation fixed

This commit is contained in:
Martin Diehl 2013-03-05 14:35:26 +00:00
parent fe6216979a
commit 7e0ea5dd04
3 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
code/crystallite.f90
View File

@ -33,11 +33,11 @@ module crystallite
character(len=64), dimension(:,:), allocatable, private :: & character(len=64), dimension(:,:), allocatable, private :: &
crystallite_output !< name of each post result output crystallite_output !< name of each post result output
integer(pInt), public, protected :: & integer(pInt), public, protected :: &
crystallite_maxSizePostResults crystallite_maxSizePostResults !< description now available
integer(pInt), dimension(:), allocatable, public, protected :: & integer(pInt), dimension(:), allocatable, public, protected :: &
crystallite_sizePostResults crystallite_sizePostResults !< description now available
integer(pInt), dimension(:,:), allocatable, private :: & integer(pInt), dimension(:,:), allocatable, private :: &
crystallite_sizePostResult crystallite_sizePostResult !< description now available
integer(pInt), dimension(:,:,:), allocatable, private :: & integer(pInt), dimension(:,:,:), allocatable, private :: &
crystallite_symmetryID !< crystallographic symmetry 1=cubic 2=hexagonal, needed in all orientation calcs crystallite_symmetryID !< crystallographic symmetry 1=cubic 2=hexagonal, needed in all orientation calcs
@ -94,11 +94,11 @@ module crystallite
logical, dimension (:,:,:), allocatable, private :: & logical, dimension (:,:,:), allocatable, private :: &
crystallite_todo !< flag to indicate need for further computation crystallite_todo !< flag to indicate need for further computation
logical, dimension (:,:), allocatable, private :: & logical, dimension (:,:), allocatable, private :: &
crystallite_clearToWindForward, & crystallite_clearToWindForward, & !< description now available
crystallite_clearToCutback, & crystallite_clearToCutback, & !< description now available
crystallite_syncSubFrac, & crystallite_syncSubFrac, & !< description now available
crystallite_syncSubFracCompleted, & crystallite_syncSubFracCompleted, & !< description now available
crystallite_neighborEnforcedCutback crystallite_neighborEnforcedCutback !< description now available
public :: & public :: &
crystallite_init, & crystallite_init, &

20
code/lattice.f90
View File

@ -41,8 +41,8 @@ module lattice
lattice_maxNonSchmid = 6_pInt !< max # of non schmid contributions over lattice structures lattice_maxNonSchmid = 6_pInt !< max # of non schmid contributions over lattice structures
integer(pInt), allocatable, dimension(:,:), protected, public :: & integer(pInt), allocatable, dimension(:,:), protected, public :: &
lattice_NslipSystem, & !< # of slip systems in each family lattice_NslipSystem, & !< total # of slip systems in each family
lattice_NtwinSystem !< # of twin systems in each family lattice_NtwinSystem !< total # of twin systems in each family
integer(pInt), allocatable, dimension(:,:,:), protected, public :: & integer(pInt), allocatable, dimension(:,:,:), protected, public :: &
lattice_interactionSlipSlip, & !< Slip--slip interaction type lattice_interactionSlipSlip, & !< Slip--slip interaction type
@ -75,8 +75,8 @@ module lattice
lattice_shearTwin !< characteristic twin shear lattice_shearTwin !< characteristic twin shear
integer(pInt), private :: & integer(pInt), private :: &
lattice_Nhexagonal, & !< # of hexagonal lattice structure (from tag CoverA_ratio) lattice_Nhexagonal, & !< total # of hexagonal lattice structure (from tag CoverA_ratio)
lattice_Nstructure !< # of lattice structures (1: fcc,2: bcc,3+: hexagonal) lattice_Nstructure !< total # of lattice structures (1: fcc,2: bcc,3+: hexagonal)
integer(pInt), dimension(:,:), pointer, private :: & integer(pInt), dimension(:,:), pointer, private :: &
interactionSlipSlip, & interactionSlipSlip, &
@ -85,15 +85,15 @@ module lattice
interactionTwinTwin interactionTwinTwin
integer(pInt), allocatable, dimension(:), protected, public :: & 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) ! fcc (1)
integer(pInt), dimension(lattice_maxNslipFamily), parameter, public :: & 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 :: & 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 :: & integer(pInt), parameter, private :: &
lattice_fcc_Nslip = 12_pInt, & ! sum(lattice_fcc_NslipSystem), & !< total # of slip systems for fcc 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 & 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 ],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 :: & 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 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) ! bcc (2)
integer(pInt), dimension(lattice_maxNslipFamily), parameter, public :: & 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 :: & 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 :: & integer(pInt), parameter, private :: &
lattice_bcc_Nslip = 24_pInt, & ! sum(lattice_bcc_NslipSystem), & !< total # of slip systems for bcc lattice_bcc_Nslip = 24_pInt, & ! sum(lattice_bcc_NslipSystem), & !< total # of slip systems for bcc

11
code/math.f90
View File

@ -61,12 +61,12 @@ module math
real(pReal), dimension(6), parameter, private :: & real(pReal), dimension(6), parameter, private :: &
nrmMandel = [& nrmMandel = [&
1.0_pReal, 1.0_pReal, 1.0_pReal,& 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 :: & real(pReal), dimension(6), parameter , public :: &
invnrmMandel = [& invnrmMandel = [&
1.0_pReal, 1.0_pReal, 1.0_pReal,& 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 :: & integer(pInt), dimension (2,6), parameter, private :: &
mapVoigt = reshape([& mapVoigt = reshape([&
@ -419,7 +419,7 @@ end function math_partition
pure function math_range(N) pure function math_range(N)
implicit none implicit none
integer(pInt), intent(in) :: N integer(pInt), intent(in) :: N !< length of range
integer(pInt) :: i integer(pInt) :: i
integer(pInt), dimension(N) :: math_range integer(pInt), dimension(N) :: math_range
@ -434,7 +434,7 @@ end function math_range
pure function math_identity2nd(dimen) pure function math_identity2nd(dimen)
implicit none implicit none
integer(pInt), intent(in) :: dimen integer(pInt), intent(in) :: dimen !< tensor dimension
integer(pInt) :: i integer(pInt) :: i
real(pReal), dimension(dimen,dimen) :: math_identity2nd real(pReal), dimension(dimen,dimen) :: math_identity2nd
@ -450,7 +450,7 @@ end function math_identity2nd
pure function math_identity4th(dimen) pure function math_identity4th(dimen)
implicit none implicit none
integer(pInt), intent(in) :: dimen integer(pInt), intent(in) :: dimen !< tensor dimension
integer(pInt) :: i,j,k,l integer(pInt) :: i,j,k,l
real(pReal), dimension(dimen,dimen,dimen,dimen) :: math_identity4th 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) real(pReal) pure function math_civita(i,j,k)
implicit none implicit none
integer(pInt), intent(in) :: i,j,k integer(pInt), intent(in) :: i,j,k
math_civita = 0.0_pReal math_civita = 0.0_pReal