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

vtk files are now correctly written to current working directory. 

updated Lib_VTK_IO.f90
This commit is contained in:
Martin Diehl 2013-05-08 16:10:21 +00:00
parent 2d4cb6d128
commit 755e0e2440
3 changed files with 1293 additions and 1006 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
code/math.f90
View File

@ -1232,10 +1232,14 @@ pure function math_Voigt66to3333(m66)
integer(pInt) :: i,j integer(pInt) :: i,j
forall (i=1_pInt:6_pInt,j=1_pInt:6_pInt) forall (i=1_pInt:6_pInt,j=1_pInt:6_pInt)
math_Voigt66to3333(mapVoigt(1,i),mapVoigt(2,i),mapVoigt(1,j),mapVoigt(2,j)) = invnrmVoigt(i)*invnrmVoigt(j)*m66(i,j) math_Voigt66to3333(mapVoigt(1,i),mapVoigt(2,i),mapVoigt(1,j),mapVoigt(2,j)) = &
math_Voigt66to3333(mapVoigt(2,i),mapVoigt(1,i),mapVoigt(1,j),mapVoigt(2,j)) = invnrmVoigt(i)*invnrmVoigt(j)*m66(i,j) invnrmVoigt(i)*invnrmVoigt(j)*m66(i,j)
math_Voigt66to3333(mapVoigt(1,i),mapVoigt(2,i),mapVoigt(2,j),mapVoigt(1,j)) = invnrmVoigt(i)*invnrmVoigt(j)*m66(i,j) math_Voigt66to3333(mapVoigt(2,i),mapVoigt(1,i),mapVoigt(1,j),mapVoigt(2,j)) = &
math_Voigt66to3333(mapVoigt(2,i),mapVoigt(1,i),mapVoigt(2,j),mapVoigt(1,j)) = invnrmVoigt(i)*invnrmVoigt(j)*m66(i,j) invnrmVoigt(i)*invnrmVoigt(j)*m66(i,j)
math_Voigt66to3333(mapVoigt(1,i),mapVoigt(2,i),mapVoigt(2,j),mapVoigt(1,j)) = &
invnrmVoigt(i)*invnrmVoigt(j)*m66(i,j)
math_Voigt66to3333(mapVoigt(2,i),mapVoigt(1,i),mapVoigt(2,j),mapVoigt(1,j)) = &
invnrmVoigt(i)*invnrmVoigt(j)*m66(i,j)
end forall end forall
end function math_Voigt66to3333 end function math_Voigt66to3333
@ -1251,10 +1255,10 @@ function math_qRand()
real(pReal), dimension(3) :: rnd real(pReal), dimension(3) :: rnd
call halton(3_pInt,rnd) call halton(3_pInt,rnd)
math_qRand(1) = cos(2.0_pReal*pi*rnd(1))*sqrt(rnd(3)) math_qRand(1) = cos(2.0_pReal*PI*rnd(1))*sqrt(rnd(3))
math_qRand(2) = sin(2.0_pReal*pi*rnd(2))*sqrt(1.0_pReal-rnd(3)) math_qRand(2) = sin(2.0_pReal*PI*rnd(2))*sqrt(1.0_pReal-rnd(3))
math_qRand(3) = cos(2.0_pReal*pi*rnd(2))*sqrt(1.0_pReal-rnd(3)) math_qRand(3) = cos(2.0_pReal*PI*rnd(2))*sqrt(1.0_pReal-rnd(3))
math_qRand(4) = sin(2.0_pReal*pi*rnd(1))*sqrt(rnd(3)) math_qRand(4) = sin(2.0_pReal*PI*rnd(1))*sqrt(rnd(3))
end function math_qRand end function math_qRand

38
code/mesh.f90
View File

@ -5089,7 +5089,8 @@ end subroutine mesh_build_FEdata
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
subroutine mesh_write_cellGeom subroutine mesh_write_cellGeom
use DAMASK_interface, only: & use DAMASK_interface, only: &
getSolverJobName getSolverJobName, &
getSolverWorkingDirectoryName
use Lib_VTK_IO, only: & use Lib_VTK_IO, only: &
VTK_ini, & VTK_ini, &
VTK_geo, & VTK_geo, &
@ -5116,16 +5117,16 @@ subroutine mesh_write_cellGeom
enddo enddo
err = VTK_ini(output_format = 'ASCII', & err = VTK_ini(output_format = 'ASCII', &
title=trim(getSolverJobName())//' cell mesh', & title=trim(getSolverJobName())//' cell mesh', &
filename = trim(getSolverJobName())//'_ipbased.vtk', & filename = trim(getSolverWorkingDirectoryName())//trim(getSolverJobName())//'_ipbased.vtk', &
mesh_topology = 'UNSTRUCTURED_GRID') mesh_topology = 'UNSTRUCTURED_GRID')
err = VTK_geo(NN = mesh_Ncellnodes, & err = VTK_geo(NN = mesh_Ncellnodes, &
X = mesh_cellnode(1,:), & X = mesh_cellnode(1,:), &
Y = mesh_cellnode(2,:), & Y = mesh_cellnode(2,:), &
Z = mesh_cellnode(3,:)) Z = mesh_cellnode(3,:))
err = VTK_con(NC = mesh_Ncells, & err = VTK_con(NC = mesh_Ncells, &
connect = cellconnection(1:j), & connect = cellconnection(1:j), &
cell_type = celltype) cell_type = celltype)
err = VTK_end() err = VTK_end()
end subroutine mesh_write_cellGeom end subroutine mesh_write_cellGeom
@ -5136,7 +5137,8 @@ end subroutine mesh_write_cellGeom
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
subroutine mesh_write_elemGeom subroutine mesh_write_elemGeom
use DAMASK_interface, only: & use DAMASK_interface, only: &
getSolverJobName getSolverJobName, &
getSolverWorkingDirectoryName
use Lib_VTK_IO, only: & use Lib_VTK_IO, only: &
VTK_ini, & VTK_ini, &
VTK_geo, & VTK_geo, &
@ -5160,16 +5162,16 @@ subroutine mesh_write_elemGeom
enddo enddo
err = VTK_ini(output_format = 'ASCII', & err = VTK_ini(output_format = 'ASCII', &
title=trim(getSolverJobName())//' element mesh', & title=trim(getSolverJobName())//' element mesh', &
filename = trim(getSolverJobName())//'_nodebased.vtk', & filename = trim(getSolverWorkingDirectoryName())//trim(getSolverJobName()//'_nodebased.vtk', &
mesh_topology = 'UNSTRUCTURED_GRID') mesh_topology = 'UNSTRUCTURED_GRID')
err = VTK_geo(NN = mesh_Nnodes, & err = VTK_geo(NN = mesh_Nnodes, &
X = mesh_node0(1,1:mesh_Nnodes), & X = mesh_node0(1,1:mesh_Nnodes), &
Y = mesh_node0(2,1:mesh_Nnodes), & Y = mesh_node0(2,1:mesh_Nnodes), &
Z = mesh_node0(3,1:mesh_Nnodes)) Z = mesh_node0(3,1:mesh_Nnodes))
err = VTK_con(NC = mesh_Nelems, & err = VTK_con(NC = mesh_Nelems, &
connect = elementconnection(1:i), & connect = elementconnection(1:i), &
cell_type = elemtype) cell_type = elemtype)
err = VTK_end() err = VTK_end()
end subroutine mesh_write_elemGeom end subroutine mesh_write_elemGeom

2241
lib/Lib_VTK_IO.f90
View File

File diff suppressed because it is too large Load Diff