Merge branch 'development' into 38-introduce-rudimentary-PETSc-based-FEM-solver
This commit is contained in:
commit
b11666effa
2
PRIVATE
2
PRIVATE
|
@ -1 +1 @@
|
|||
Subproject commit dfd67ea44ba88ee1e0a33266a3986c64137908cf
|
||||
Subproject commit a764ade044735df35fac93a5204446291ee29abc
|
|
@ -1278,7 +1278,7 @@ subroutine lattice_init
|
|||
integer(pInt) :: Nphases
|
||||
character(len=65536) :: &
|
||||
tag = ''
|
||||
integer(pInt) :: section = 0_pInt,i,p
|
||||
integer(pInt) :: i,p
|
||||
real(pReal), dimension(:), allocatable :: &
|
||||
temp, &
|
||||
CoverA, & !< c/a ratio for low symmetry type lattice
|
||||
|
@ -1388,9 +1388,9 @@ subroutine lattice_init
|
|||
tag = config_phase(p)%getString('trans_lattice_structure',defaultVal=tag)
|
||||
select case(trim(tag))
|
||||
case('bcc')
|
||||
trans_lattice_structure(section) = LATTICE_bcc_ID
|
||||
trans_lattice_structure(p) = LATTICE_bcc_ID
|
||||
case('hex','hexagonal')
|
||||
trans_lattice_structure(section) = LATTICE_hex_ID
|
||||
trans_lattice_structure(p) = LATTICE_hex_ID
|
||||
end select
|
||||
|
||||
lattice_C66(1,1,p) = config_phase(p)%getFloat('c11',defaultVal=0.0_pReal)
|
||||
|
|
|
@ -12,7 +12,7 @@ module math
|
|||
|
||||
implicit none
|
||||
private
|
||||
real(pReal), parameter, public :: PI = 3.141592653589793_pReal !< ratio of a circle's circumference to its diameter
|
||||
real(pReal), parameter, public :: PI = acos(-1.0_pReal) !< ratio of a circle's circumference to its diameter
|
||||
real(pReal), parameter, public :: INDEG = 180.0_pReal/PI !< conversion from radian into degree
|
||||
real(pReal), parameter, public :: INRAD = PI/180.0_pReal !< conversion from degree into radian
|
||||
complex(pReal), parameter, public :: TWOPIIMG = (0.0_pReal,2.0_pReal)*(PI,0.0_pReal) !< Re(0.0), Im(2xPi)
|
||||
|
|
|
@ -109,11 +109,9 @@ use IO
|
|||
type(tParameters), pointer :: prm
|
||||
|
||||
integer(pInt) :: &
|
||||
o, &
|
||||
phase, &
|
||||
instance, &
|
||||
maxNinstance, &
|
||||
mySize, &
|
||||
sizeDotState, &
|
||||
sizeState, &
|
||||
sizeDeltaState
|
||||
|
@ -136,7 +134,6 @@ use IO
|
|||
plastic_isotropic_output = ''
|
||||
allocate(plastic_isotropic_Noutput(maxNinstance), source=0_pInt)
|
||||
|
||||
! inernal variable
|
||||
allocate(param(maxNinstance)) ! one container of parameters per instance
|
||||
allocate(state(maxNinstance)) ! internal state aliases
|
||||
allocate(dotState(maxNinstance))
|
||||
|
|
Loading…
Reference in New Issue