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

less module wide variables

This commit is contained in:
Martin Diehl 2019-06-05 12:57:08 +02:00
parent 9b37c62e15
commit efac905fb2
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/mesh_marc.f90
View File

@ -215,7 +215,6 @@ integer, dimension(:,:), allocatable, private :: &
integer, private :: & integer, private :: &
MarcVersion, & !< Version of input file format (Marc only)
hypoelasticTableStyle, & !< Table style (Marc only) hypoelasticTableStyle, & !< Table style (Marc only)
initialcondTableStyle !< Table style (Marc only) initialcondTableStyle !< Table style (Marc only)
integer, dimension(:), allocatable, private :: & integer, dimension(:), allocatable, private :: &
@ -295,7 +294,7 @@ subroutine mesh_init(ip,el)
call IO_open_inputFile(FILEUNIT,modelName) ! parse info from input file... call IO_open_inputFile(FILEUNIT,modelName) ! parse info from input file...
if (myDebug) write(6,'(a)') ' Opened input file'; flush(6) if (myDebug) write(6,'(a)') ' Opened input file'; flush(6)
MarcVersion = mesh_marc_get_fileFormat(FILEUNIT) fileFormatVersion = mesh_marc_get_fileFormat(FILEUNIT)
fileFormatVersion = MarcVersion fileFormatVersion = MarcVersion
if (myDebug) write(6,'(a)') ' Got input file format'; flush(6) if (myDebug) write(6,'(a)') ' Got input file format'; flush(6)
@ -322,7 +321,7 @@ subroutine mesh_init(ip,el)
if (myDebug) write(6,'(a)') ' Counted CP elements'; flush(6) if (myDebug) write(6,'(a)') ' Counted CP elements'; flush(6)
allocate (mesh_mapFEtoCPelem(2,mesh_NcpElems), source = 0) allocate (mesh_mapFEtoCPelem(2,mesh_NcpElems), source = 0)
call mesh_marc_map_elements(hypoelasticTableStyle,mesh_nameElemSet,mesh_mapElemSet,mesh_NcpElems,FILEUNIT) call mesh_marc_map_elements(hypoelasticTableStyle,mesh_nameElemSet,mesh_mapElemSet,mesh_NcpElems,fileFormatVersion,FILEUNIT)
if (myDebug) write(6,'(a)') ' Mapped elements'; flush(6) if (myDebug) write(6,'(a)') ' Mapped elements'; flush(6)
allocate (mesh_mapFEtoCPnode(2,mesh_Nnodes),source=0) allocate (mesh_mapFEtoCPnode(2,mesh_Nnodes),source=0)
@ -576,9 +575,9 @@ subroutine mesh_marc_map_elementSets(nameElemSet,mapElemSet,fileUnit)
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief Maps elements from FE ID to internal (consecutive) representation. !> @brief Maps elements from FE ID to internal (consecutive) representation.
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
subroutine mesh_marc_map_elements(tableStyle,nameElemSet,mapElemSet,nElems,fileUnit) subroutine mesh_marc_map_elements(tableStyle,nameElemSet,mapElemSet,nElems,fileFormatVersion,fileUnit)
integer, intent(in) :: fileUnit,tableStyle,nElems integer, intent(in) :: fileUnit,tableStyle,nElems,fileFormatVersion
character(len=64), intent(in), dimension(:) :: nameElemSet character(len=64), intent(in), dimension(:) :: nameElemSet
integer, dimension(:,:), intent(in) :: & integer, dimension(:,:), intent(in) :: &
mapElemSet mapElemSet
@ -596,7 +595,7 @@ subroutine mesh_marc_map_elements(tableStyle,nameElemSet,mapElemSet,nElems,fileU
do do
read (fileUnit,'(A300)',END=660) line read (fileUnit,'(A300)',END=660) line
chunkPos = IO_stringPos(line) chunkPos = IO_stringPos(line)
if (MarcVersion < 13) then ! Marc 2016 or earlier if (fileFormatVersion < 13) then ! Marc 2016 or earlier
if( IO_lc(IO_stringValue(line,chunkPos,1)) == 'hypoelastic' ) then if( IO_lc(IO_stringValue(line,chunkPos,1)) == 'hypoelastic' ) then
do i=1,3+TableStyle ! skip three (or four if new table style!) lines do i=1,3+TableStyle ! skip three (or four if new table style!) lines
read (fileUnit,'(A300)') line read (fileUnit,'(A300)') line
@ -1164,23 +1163,35 @@ end subroutine mesh_build_ipVolumes
subroutine IP_neighborhood2 subroutine IP_neighborhood2
integer, dimension(:,:,:,:,:,:), allocatable :: faces integer, dimension(:,:,:,:,:,:), allocatable :: faces
integer :: e,i,f,c,m,n integer, dimension(:), allocatable :: cellnodes
integer :: e,i,f,c,m,n,j,k,l
allocate(faces(size(theMesh%elem%cellface,1),size(theMesh%elem%cellface,2),theMesh%elem%nIPs,theMesh%Nelems,1,1)) allocate(faces(size(theMesh%elem%cellface,1),size(theMesh%elem%cellface,2),theMesh%elem%nIPs,theMesh%Nelems,1,1))
print*, shape(faces) print*, 'faces',shape(faces)
print*, 'cell2',shape(mesh_cell2)
!allocate(connectivity_cell(thisMesh%elem%NcellNodesPerCell,thisMesh%elem%nIPs,thisMesh%Nelems)) !allocate(connectivity_cell(thisMesh%elem%NcellNodesPerCell,thisMesh%elem%nIPs,thisMesh%Nelems))
allocate(cellnodes(theMesh%elem%NcellnodesPerCell))
c = theMesh%elem%cellType c = theMesh%elem%cellType
m = FE_NcellnodesPerCellface(c) m = FE_NcellnodesPerCellface(c)
n = FE_NipNeighbors(c) n = FE_NipNeighbors(c)
f = size(theMesh%elem%cellface,2) f = size(theMesh%elem%cellface,2)
do i = 1,theMesh%elem%nIPs
do n = 1, theMesh%elem%nIPneighbors
write(6,*) theMesh%elem%cell(theMesh%elem%cellFace(:,n),i)
write(6,*) ''
enddo
enddo
do e = 1,theMesh%nElems do e = 1,theMesh%nElems
do i = 1,theMesh%elem%nIPs do i = 1,theMesh%elem%nIPs
print*, 'e',e,'i',i !print*, 'e',e,'i',i
print*, mesh_cell2(:,i,e) !print*, mesh_cell2(:,i,e)
print*, '' !print*, ''
do f = 1, size(theMesh%elem%cellface,2) !do n = 1, FE_NipNeighbors(c)
enddo ! print*, theMesh%elem%cell(:,n)
!enddo
enddo enddo
enddo enddo