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

scaling of deformation gradient fluctuations now possible in x,y,z independently (give array).

This commit is contained in:
Philip Eisenlohr 2013-03-22 15:09:55 +00:00
parent be655ae536
commit 5b96c1d62a
4 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/damask.core.pyf
View File

@ -158,11 +158,11 @@ python module core ! in
real*8, dimension(3,0:size(F,3)-1,0:size(F,4)-1,0:size(F,5)-1,0:7), depend(F) :: coordsAvgOrder real*8, dimension(3,0:size(F,3)-1,0:size(F,4)-1,0:size(F,5)-1,0:7), depend(F) :: coordsAvgOrder
end function mesh_deformedCoordsLinear end function mesh_deformedCoordsLinear
function mesh_deformedCoordsFFT(gDim,F,scalingIn,FavgIn) ! in :mesh:mesh.f90 function mesh_deformedCoordsFFT(gDim,F,FavgIn,scalingIn) ! in :mesh:mesh.f90
real*8, dimension(:,:,:,:,:), intent(in) :: F real*8, dimension(:,:,:,:,:), intent(in) :: F
real*8, dimension(3), intent(in) :: gDim real*8, dimension(3), intent(in) :: gDim
real*8, intent(in), optional, :: scalingIn = -1.0
real*8, dimension(3,3), intent(in), optional :: FavgIn = -1.0 real*8, dimension(3,3), intent(in), optional :: FavgIn = -1.0
real*8, dimension(3), intent(in), optional, :: scalingIn = -1.0
real*8, dimension(3,size(F,3),size(F,4),size(F,5)), depend(F) :: mesh_deformedCoordsFFT real*8, dimension(3,size(F,3),size(F,4),size(F,5)), depend(F) :: mesh_deformedCoordsFFT
end function mesh_deformedCoordsFFT end function mesh_deformedCoordsFFT

24
code/mesh.f90
View File

@ -1282,8 +1282,7 @@ function mesh_regrid(adaptive,resNewInput,minRes)
read (777,rec=1) spectralF33 read (777,rec=1) spectralF33
close (777) close (777)
Favg = sum(sum(sum(spectralF33,dim=5),dim=4),dim=3) * wgt Favg = sum(sum(sum(spectralF33,dim=5),dim=4),dim=3) * wgt
coordinates = reshape(mesh_deformedCoordsFFT(geomdim,spectralF33,1.0_pReal,Favg),& coordinates = reshape(mesh_deformedCoordsFFT(geomdim,spectralF33,Favg),[3,mesh_NcpElems])
[3,mesh_NcpElems])
case('basicpetsc','al') case('basicpetsc','al')
allocate(spectralF9(9,res(1),res(2),res(3))) allocate(spectralF9(9,res(1),res(2),res(3)))
call IO_read_jobBinaryFile(777,'F',trim(getSolverJobName()),size(spectralF9)) call IO_read_jobBinaryFile(777,'F',trim(getSolverJobName()),size(spectralF9))
@ -1291,7 +1290,7 @@ function mesh_regrid(adaptive,resNewInput,minRes)
close (777) close (777)
Favg = reshape(sum(sum(sum(spectralF9,dim=4),dim=3),dim=2) * wgt, [3,3]) Favg = reshape(sum(sum(sum(spectralF9,dim=4),dim=3),dim=2) * wgt, [3,3])
coordinates = reshape(mesh_deformedCoordsFFT(geomdim,reshape(spectralF9, & coordinates = reshape(mesh_deformedCoordsFFT(geomdim,reshape(spectralF9, &
[3,3,res(1),res(2),res(3)]),1.0_pReal,Favg),[3,mesh_NcpElems]) [3,3,res(1),res(2),res(3)]),Favg),[3,mesh_NcpElems])
end select end select
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
@ -1894,7 +1893,7 @@ end function mesh_deformedCoordsLinear
!> @brief calculate coordinates in current configuration for given defgrad !> @brief calculate coordinates in current configuration for given defgrad
! using integration in Fourier space ! using integration in Fourier space
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
function mesh_deformedCoordsFFT(gDim,F,scalingIn,FavgIn) result(coords) function mesh_deformedCoordsFFT(gDim,F,FavgIn,scalingIn) result(coords)
use IO, only: & use IO, only: &
IO_error IO_error
use numerics, only: & use numerics, only: &
@ -1913,7 +1912,7 @@ function mesh_deformedCoordsFFT(gDim,F,scalingIn,FavgIn) result(coords)
real(pReal), dimension(3,size(F,3),size(F,4),size(F,5)) :: coords real(pReal), dimension(3,size(F,3),size(F,4),size(F,5)) :: coords
real(pReal), intent(in), dimension(3) :: gDim real(pReal), intent(in), dimension(3) :: gDim
real(pReal), intent(in), dimension(3,3), optional :: FavgIn real(pReal), intent(in), dimension(3,3), optional :: FavgIn
real(pReal), intent(in), optional :: scalingIn real(pReal), intent(in), dimension(3), optional :: scalingIn
! function ! function
! allocatable arrays for fftw c routines ! allocatable arrays for fftw c routines
@ -1926,16 +1925,15 @@ function mesh_deformedCoordsFFT(gDim,F,scalingIn,FavgIn) result(coords)
! other variables ! other variables
integer(pInt) :: i, j, k, m, res1_red integer(pInt) :: i, j, k, m, res1_red
integer(pInt), dimension(3) :: k_s, iRes integer(pInt), dimension(3) :: k_s, iRes
real(pReal), dimension(3) :: step, offset_coords, integrator real(pReal), dimension(3) :: scaling, step, offset_coords, integrator
real(pReal), dimension(3,3) :: Favg real(pReal), dimension(3,3) :: Favg
real(pReal) :: scaling
if (present(scalingIn)) then if (present(scalingIn)) then
if (scalingIn < 0.0_pReal) then !the f2py way to tell it is not present where (scalingIn < 0.0_pReal) !the f2py way to tell it is not present
scaling = 1.0_pReal scaling = [1.0_pReal,1.0_pReal,1.0_pReal]
else elsewhere
scaling = scalingIn scaling = scalingIn
endif endwhere
else else
scaling = 1.0_pReal scaling = 1.0_pReal
endif endif
@ -2028,9 +2026,9 @@ function mesh_deformedCoordsFFT(gDim,F,scalingIn,FavgIn) result(coords)
coords(1:3,i,j,k) = coords_real(i,j,k,1:3) ! ensure that data is aligned properly (fftw_alloc) coords(1:3,i,j,k) = coords_real(i,j,k,1:3) ! ensure that data is aligned properly (fftw_alloc)
enddo; enddo; enddo enddo; enddo; enddo
offset_coords = math_mul33x3(F(1:3,1:3,1,1,1),step/2.0_pReal) - scaling*coords(1:3,1,1,1) offset_coords = math_mul33x3(F(1:3,1:3,1,1,1),step/2.0_pReal) - scaling(1:3)*coords(1:3,1,1,1)
do k = 1_pInt, iRes(3); do j = 1_pInt, iRes(2); do i = 1_pInt, iRes(1) do k = 1_pInt, iRes(3); do j = 1_pInt, iRes(2); do i = 1_pInt, iRes(1)
coords(1:3,i,j,k) = scaling*coords(1:3,i,j,k) & coords(1:3,i,j,k) = scaling(1:3)*coords(1:3,i,j,k) &
+ offset_coords + math_mul33x3(Favg,[step(1)*real(i-1_pInt,pReal),& + offset_coords + math_mul33x3(Favg,[step(1)*real(i-1_pInt,pReal),&
step(2)*real(j-1_pInt,pReal),& step(2)*real(j-1_pInt,pReal),&
step(3)*real(k-1_pInt,pReal)]) step(3)*real(k-1_pInt,pReal)])

14
processing/post/3Dvisualize.py
View File

@ -340,8 +340,8 @@ parser.add_option('--nobox', dest='output_box', action='store_false', \
help='omit VTK box file') help='omit VTK box file')
parser.add_option('--separator', dest='separator', type='string', \ parser.add_option('--separator', dest='separator', type='string', \
help='data separator [t(ab), n(ewline), s(pace)]') help='data separator [t(ab), n(ewline), s(pace)]')
parser.add_option('--scaling', dest='scaling', type='float', \ parser.add_option('--scaling', dest='scaling', action='extend', type='float', \
help='scaling of fluctuation [%default]') help='scaling of fluctuation')
parser.add_option('-u', '--unitlength', dest='unitlength', type='float', \ parser.add_option('-u', '--unitlength', dest='unitlength', type='float', \
help='set unit length for 2D model [%default]') help='set unit length for 2D model [%default]')
parser.add_option('--filenodalcoords', dest='filenodalcoords', type='string', \ parser.add_option('--filenodalcoords', dest='filenodalcoords', type='string', \
@ -362,7 +362,7 @@ parser.set_defaults(tensor = [])
parser.set_defaults(output_mesh = True) parser.set_defaults(output_mesh = True)
parser.set_defaults(output_points = False) parser.set_defaults(output_points = False)
parser.set_defaults(output_box = False) parser.set_defaults(output_box = False)
parser.set_defaults(scaling = 1.0) parser.set_defaults(scaling = [])
parser.set_defaults(undeformed = False) parser.set_defaults(undeformed = False)
parser.set_defaults(unitlength = 0.0) parser.set_defaults(unitlength = 0.0)
parser.set_defaults(cell = True) parser.set_defaults(cell = True)
@ -373,8 +373,10 @@ parser.set_defaults(linearreconstruction = False)
sep = {'n': '\n', 't': '\t', 's': ' '} sep = {'n': '\n', 't': '\t', 's': ' '}
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
if options.scaling != 1.0 and options.linearreconstruction: print 'cannot scale for linear reconstruction'
if options.scaling != 1.0 and options.filenodalcoords != '': print 'cannot scale when reading coordinate from file' options.scaling += numpy.ones(max(0,len(options.scaling)-3,'d'))
if numpy.any(options.scaling != 1.0) and options.linearreconstruction: print 'cannot scale for linear reconstruction'
if numpy.any(options.scaling != 1.0) and options.filenodalcoords != '': print 'cannot scale when reading coordinate from file'
options.separator = options.separator.lower() options.separator = options.separator.lower()
for filename in args: for filename in args:
if not os.path.exists(filename): if not os.path.exists(filename):
@ -477,7 +479,7 @@ for filename in args:
if options.linearreconstruction: if options.linearreconstruction:
centroids = damask.core.mesh.deformedCoordsLinear(dim,F,Favg) centroids = damask.core.mesh.deformedCoordsLinear(dim,F,Favg)
else: else:
centroids = damask.core.mesh.deformedCoordsFFT(dim,F,options.scaling,Favg) centroids = damask.core.mesh.deformedCoordsFFT(dim,F,Favg,options.scaling)
mesh = damask.core.mesh.nodesAroundCentres(dim,Favg,centroids) mesh = damask.core.mesh.nodesAroundCentres(dim,Favg,centroids)
else: else:

3
processing/post/addDeformedConfiguration.py
View File

@ -141,8 +141,7 @@ for file in files:
if options.linearreconstruction: if options.linearreconstruction:
centroids = damask.core.mesh.deformedCoordsLin(geomdim,F,Favg) centroids = damask.core.mesh.deformedCoordsLin(geomdim,F,Favg)
else: else:
print 'ddd' centroids = damask.core.mesh.deformedCoordsFFT(geomdim,F,Favg)
centroids = damask.core.mesh.deformedCoordsFFT(geomdim,F,1.0,Favg)
# ------------------------------------------ process data --------------------------------------- # ------------------------------------------ process data ---------------------------------------