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

new gmsh version

This commit is contained in:
Sharan Roongta 2020-12-04 03:30:39 +01:00
parent 676840ae1b
commit 665dd3020d
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PRIVATE

@ -1 +1 @@
Subproject commit 68cde52291ebb683ca6f610879f2ae28372597a7 Subproject commit 113f44413c88e9b577f3781012592ea9a4836458

14
src/mesh/discretization_mesh.f90
View File

@ -69,7 +69,7 @@ subroutine discretization_mesh_init(restart)
integer, allocatable, dimension(:) :: chunkPos integer, allocatable, dimension(:) :: chunkPos
integer :: dimPlex, & integer :: dimPlex, &
mesh_Nnodes, & !< total number of nodes in mesh mesh_Nnodes, & !< total number of nodes in mesh
j, l, & j, l, k, &
debug_element, debug_ip debug_element, debug_ip
PetscSF :: sf PetscSF :: sf
DM :: globalMesh DM :: globalMesh
@ -96,7 +96,6 @@ subroutine discretization_mesh_init(restart)
debug_element = config_debug%get_asInt('element',defaultVal=1) debug_element = config_debug%get_asInt('element',defaultVal=1)
debug_ip = config_debug%get_asInt('integrationpoint',defaultVal=1) debug_ip = config_debug%get_asInt('integrationpoint',defaultVal=1)
call DMPlexCreateFromFile(PETSC_COMM_WORLD,interface_geomFile,PETSC_TRUE,globalMesh,ierr) call DMPlexCreateFromFile(PETSC_COMM_WORLD,interface_geomFile,PETSC_TRUE,globalMesh,ierr)
CHKERRQ(ierr) CHKERRQ(ierr)
call DMGetDimension(globalMesh,dimPlex,ierr) call DMGetDimension(globalMesh,dimPlex,ierr)
@ -137,11 +136,14 @@ subroutine discretization_mesh_init(restart)
l = l + 1 l = l + 1
if (trim(fileContent(l)) == '$EndElements') exit if (trim(fileContent(l)) == '$EndElements') exit
chunkPos = IO_stringPos(fileContent(l)) chunkPos = IO_stringPos(fileContent(l))
if (chunkPos(1) == 3+IO_intValue(fileContent(l),chunkPos,3)+dimPlex+1) then if(IO_intValue(fileContent(l),chunkPos,1) == 3) then
call DMSetLabelValue(globalMesh,'material',j,IO_intValue(fileContent(l),chunkPos,4),ierr) do k = 1, IO_intValue(fileContent(l),chunkPos,4)
CHKERRQ(ierr) call DMSetLabelValue(globalMesh,'material',j,IO_intValue(fileContent(l),chunkPos,2),ierr)
j = j + 1 CHKERRQ(ierr)
j = j + 1
enddo
endif endif
l = l + IO_intValue(fileContent(l),chunkPos,4)
enddo enddo
exit exit
endif endif