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

Merge branch 'development' into 38-introduce-rudimentary-PETSc-based-FEM-solver

This commit is contained in:
Martin Diehl 2018-08-26 13:59:50 +02:00
parent ff8d746224 f4be4839d8
commit b11666effa
5 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PRIVATE

@ -1 +1 @@
Subproject commit dfd67ea44ba88ee1e0a33266a3986c64137908cf Subproject commit a764ade044735df35fac93a5204446291ee29abc

2
VERSION
View File

@ -1 +1 @@
v2.0.2-401-ga3b472a7 v2.0.2-409-gac011684

6
src/lattice.f90
View File

@ -1278,7 +1278,7 @@ subroutine lattice_init
integer(pInt) :: Nphases integer(pInt) :: Nphases
character(len=65536) :: & character(len=65536) :: &
tag = '' tag = ''
integer(pInt) :: section = 0_pInt,i,p integer(pInt) :: i,p
real(pReal), dimension(:), allocatable :: & real(pReal), dimension(:), allocatable :: &
temp, & temp, &
CoverA, & !< c/a ratio for low symmetry type lattice 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) tag = config_phase(p)%getString('trans_lattice_structure',defaultVal=tag)
select case(trim(tag)) select case(trim(tag))
case('bcc') case('bcc')
trans_lattice_structure(section) = LATTICE_bcc_ID trans_lattice_structure(p) = LATTICE_bcc_ID
case('hex','hexagonal') case('hex','hexagonal')
trans_lattice_structure(section) = LATTICE_hex_ID trans_lattice_structure(p) = LATTICE_hex_ID
end select end select
lattice_C66(1,1,p) = config_phase(p)%getFloat('c11',defaultVal=0.0_pReal) lattice_C66(1,1,p) = config_phase(p)%getFloat('c11',defaultVal=0.0_pReal)

2
src/math.f90
View File

@ -12,7 +12,7 @@ module math
implicit none implicit none
private 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 :: INDEG = 180.0_pReal/PI !< conversion from radian into degree
real(pReal), parameter, public :: INRAD = PI/180.0_pReal !< conversion from degree into radian 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) complex(pReal), parameter, public :: TWOPIIMG = (0.0_pReal,2.0_pReal)*(PI,0.0_pReal) !< Re(0.0), Im(2xPi)

3
src/plastic_isotropic.f90
View File

@ -109,11 +109,9 @@ use IO
type(tParameters), pointer :: prm type(tParameters), pointer :: prm
integer(pInt) :: & integer(pInt) :: &
o, &
phase, & phase, &
instance, & instance, &
maxNinstance, & maxNinstance, &
mySize, &
sizeDotState, & sizeDotState, &
sizeState, & sizeState, &
sizeDeltaState sizeDeltaState
@ -136,7 +134,6 @@ use IO
plastic_isotropic_output = '' plastic_isotropic_output = ''
allocate(plastic_isotropic_Noutput(maxNinstance), source=0_pInt) allocate(plastic_isotropic_Noutput(maxNinstance), source=0_pInt)
! inernal variable
allocate(param(maxNinstance)) ! one container of parameters per instance allocate(param(maxNinstance)) ! one container of parameters per instance
allocate(state(maxNinstance)) ! internal state aliases allocate(state(maxNinstance)) ! internal state aliases
allocate(dotState(maxNinstance)) allocate(dotState(maxNinstance))