polishing

code/FEsolving.f90

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

code/IO.f90

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

code/math.f90

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