fixed closing of file (unit 222) statement in FEsolving.f90
added missing keyword in mesh.f90 with ifndef Spectral statement (needed for Marc and Abaqus)
This commit is contained in:
parent
06be437bc9
commit
481268c8c2
|
@ -166,11 +166,11 @@ subroutine FE_init
|
|||
endif
|
||||
enddo
|
||||
#endif
|
||||
200 close(fileunit)
|
||||
else
|
||||
modelName = getSolverJobName()
|
||||
endif
|
||||
|
||||
200 close(fileunit)
|
||||
#endif
|
||||
!$OMP CRITICAL (write2out)
|
||||
write(6,*)
|
||||
|
|
|
@ -366,7 +366,6 @@ subroutine mesh_init(ip,element)
|
|||
call mesh_build_FEdata ! get properties of the different types of elements
|
||||
#ifdef Spectral
|
||||
call IO_open_file(fileUnit,geometryFile) ! parse info from geometry file...
|
||||
|
||||
call mesh_spectral_count_nodesAndElements(fileUnit)
|
||||
call mesh_spectral_count_cpElements
|
||||
call mesh_spectral_map_elements
|
||||
|
@ -2572,15 +2571,17 @@ use IO, only: &
|
|||
IO_stringValue, &
|
||||
IO_stringPos
|
||||
|
||||
implicit none
|
||||
integer(pInt), intent(in) :: myUnit
|
||||
implicit none
|
||||
integer(pInt), intent(in) :: myUnit
|
||||
|
||||
integer(pInt), parameter :: maxNchunks = 5_pInt
|
||||
integer(pInt), dimension (1+2*maxNchunks) :: myPos
|
||||
integer(pInt) chunk, Nchunks
|
||||
character(len=300) line, damaskOption, v
|
||||
|
||||
mesh_periodicSurface = .false.
|
||||
integer(pInt), parameter :: maxNchunks = 5_pInt
|
||||
integer(pInt), dimension (1+2*maxNchunks) :: myPos
|
||||
integer(pInt) chunk, Nchunks
|
||||
character(len=300) :: line, damaskOption, v
|
||||
#ifndef Spectral
|
||||
character(len=300) :: keyword
|
||||
#endif
|
||||
mesh_periodicSurface = .false.
|
||||
|
||||
610 FORMAT(A300)
|
||||
|
||||
|
@ -2591,8 +2592,8 @@ mesh_periodicSurface = .false.
|
|||
keyword = '**damask'
|
||||
#endif
|
||||
|
||||
rewind(myUnit)
|
||||
do
|
||||
rewind(myUnit)
|
||||
do
|
||||
read (myUnit,610,END=620) line
|
||||
myPos = IO_stringPos(line,maxNchunks)
|
||||
Nchunks = myPos(1)
|
||||
|
@ -2621,7 +2622,7 @@ do
|
|||
enddo
|
||||
endselect
|
||||
#endif
|
||||
enddo
|
||||
enddo
|
||||
|
||||
620 end subroutine mesh_get_damaskOptions
|
||||
|
||||
|
|
Loading…
Reference in New Issue