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

polishing

This commit is contained in:
Martin Diehl 2014-10-13 08:44:49 +00:00
parent a78352c3c5
commit eeac38dd1a
3 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
code/FEsolving.f90
View File

@ -66,11 +66,9 @@ subroutine FE_init
IO_stringValue, & IO_stringValue, &
IO_intValue, & IO_intValue, &
IO_lc, & IO_lc, &
#ifndef Spectral #if defined(Marc4DAMASK) || defined(Abaqus)
#ifndef FEM
IO_open_inputFile, & IO_open_inputFile, &
IO_open_logFile, & IO_open_logFile, &
#endif
#endif #endif
IO_warning, & IO_warning, &
IO_timeStamp IO_timeStamp
@ -79,8 +77,7 @@ subroutine FE_init
worldrank worldrank
implicit none implicit none
#ifndef Spectral #if defined(Marc4DAMASK) || defined(Abaqus)
#ifndef FEM
integer(pInt), parameter :: & integer(pInt), parameter :: &
FILEUNIT = 222_pInt, & FILEUNIT = 222_pInt, &
maxNchunks = 6_pInt maxNchunks = 6_pInt
@ -88,13 +85,12 @@ subroutine FE_init
character(len=64) :: tag character(len=64) :: tag
character(len=1024) :: line character(len=1024) :: line
integer(pInt), dimension(1_pInt+2_pInt*maxNchunks) :: positions integer(pInt), dimension(1_pInt+2_pInt*maxNchunks) :: positions
#endif
#endif #endif
mainProcess: if (worldrank == 0) then mainProcess: if (worldrank == 0) then
write(6,'(/,a)') ' <<<+- FEsolving init -+>>>' write(6,'(/,a)') ' <<<+- FEsolving init -+>>>'
write(6,'(a)') ' $Id$' write(6,'(a)') ' $Id$'
write(6,'(a15,a)') ' Current time: ',IO_timeStamp() write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90" #include "compilation_info.f90"
endif mainProcess endif mainProcess

6
code/IO.f90
View File

@ -115,9 +115,9 @@ subroutine IO_init
#endif #endif
mainProcess: if (worldrank == 0) then mainProcess: if (worldrank == 0) then
write(6,'(/,a)') ' <<<+- IO init -+>>>' write(6,'(/,a)') ' <<<+- IO init -+>>>'
write(6,'(a)') ' $Id$' write(6,'(a)') ' $Id$'
write(6,'(a15,a)') ' Current time: ',IO_timeStamp() write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90" #include "compilation_info.f90"
endif mainProcess endif mainProcess

19
code/math.f90
View File

@ -250,18 +250,13 @@ subroutine math_init
call random_number(randTest(i)) call random_number(randTest(i))
enddo enddo
#ifdef FEM mainProcess2: if (worldrank == 0) then
if (worldrank == 0) then write(6,*) 'size of random seed: ', randSize
#endif do i =1, randSize
write(6,*) 'size of random seed: ', randSize write(6,*) 'value of random seed: ', i, randInit(i)
do i =1, randSize enddo
write(6,*) 'value of random seed: ', i, randInit(i) write(6,'(a,4(/,26x,f17.14),/)') ' start of random sequence: ', randTest
enddo endif mainProcess2
write(6,'(a,4(/,26x,f17.14))') ' start of random sequence: ', randTest
write(6,*) ''
#ifdef FEM
endif
#endif
call random_seed(put = randInit) call random_seed(put = randInit)