From 96f036e34e5ccb35fa9222eb1137405881c978ec Mon Sep 17 00:00:00 2001
From: Pratheek Shanthraj
Date: Fri, 10 Oct 2014 16:21:10 +0000
Subject: [PATCH] updated MPI reporting in line with recent changes
---
code/CPFEM.f90 | 16 +++++-----------
code/FEsolving.f90 | 16 +++++-----------
code/constitutive.f90 | 16 +++++-----------
code/constitutive_dislokmc.f90 | 16 +++++-----------
code/constitutive_dislotwin.f90 | 16 +++++-----------
code/constitutive_j2.f90 | 16 +++++-----------
code/constitutive_none.f90 | 16 +++++-----------
code/constitutive_nonlocal.f90 | 16 +++++-----------
code/constitutive_phenopowerlaw.f90 | 16 +++++-----------
code/constitutive_titanmod.f90 | 16 +++++-----------
code/crystallite.f90 | 16 +++++-----------
code/damage_brittle.f90 | 16 +++++-----------
code/damage_ductile.f90 | 16 +++++-----------
code/damage_none.f90 | 16 +++++-----------
code/debug.f90 | 16 +++++-----------
code/homogenization.f90 | 16 +++++-----------
code/homogenization_RGC.f90 | 16 +++++-----------
code/homogenization_isostrain.f90 | 16 +++++-----------
code/homogenization_none.f90 | 16 +++++-----------
code/lattice.f90 | 16 +++++-----------
code/material.f90 | 16 +++++-----------
code/math.f90 | 16 +++++-----------
code/thermal_adiabatic.f90 | 16 +++++-----------
code/thermal_isothermal.f90 | 16 +++++-----------
24 files changed, 120 insertions(+), 264 deletions(-)
diff --git a/code/CPFEM.f90 b/code/CPFEM.f90
index 6e4d118bf..f608caf2c 100644
--- a/code/CPFEM.f90
+++ b/code/CPFEM.f90
@@ -125,9 +125,7 @@ subroutine CPFEM_init
IO_timeStamp, &
IO_error
use numerics, only: &
-#ifdef FEM
worldrank, &
-#endif
DAMASK_NumThreadsInt
use debug, only: &
debug_level, &
@@ -160,16 +158,12 @@ subroutine CPFEM_init
implicit none
integer(pInt) :: k,l,m,ph,homog
-#ifdef FEM
- if (worldrank == 0) then
-#endif
- write(6,'(/,a)') ' <<<+- CPFEM init -+>>>'
- write(6,'(a)') ' $Id$'
- write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
+ mainProcess: if (worldrank == 0) then
+ write(6,'(/,a)') ' <<<+- CPFEM init -+>>>'
+ write(6,'(a)') ' $Id$'
+ write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90"
-#ifdef FEM
- endif
-#endif
+ endif mainProcess
#if defined(Marc4DAMASK) || defined(Abaqus)
! initialize stress and jacobian to zero
diff --git a/code/FEsolving.f90 b/code/FEsolving.f90
index 0a164a3ed..590bb8a65 100644
--- a/code/FEsolving.f90
+++ b/code/FEsolving.f90
@@ -75,10 +75,8 @@ subroutine FE_init
IO_warning, &
IO_timeStamp
use DAMASK_interface
-#ifdef FEM
use numerics, only: &
worldrank
-#endif
implicit none
#ifndef Spectral
@@ -93,16 +91,12 @@ subroutine FE_init
#endif
#endif
-#ifdef FEM
- if (worldrank == 0) then
-#endif
- write(6,'(/,a)') ' <<<+- FEsolving init -+>>>'
- write(6,'(a)') ' $Id$'
- write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
+ mainProcess: if (worldrank == 0) then
+ write(6,'(/,a)') ' <<<+- FEsolving init -+>>>'
+ write(6,'(a)') ' $Id$'
+ write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90"
-#ifdef FEM
- endif
-#endif
+ endif mainProcess
modelName = getSolverJobName()
#ifdef Spectral
diff --git a/code/constitutive.f90 b/code/constitutive.f90
index 4e24bec64..6464942f7 100644
--- a/code/constitutive.f90
+++ b/code/constitutive.f90
@@ -60,9 +60,7 @@ subroutine constitutive_init
debug_constitutive, &
debug_levelBasic
use numerics, only: &
-#ifdef FEM
worldrank, &
-#endif
numerics_integrator
use IO, only: &
IO_error, &
@@ -188,16 +186,12 @@ subroutine constitutive_init
if (any(phase_thermal == LOCAL_THERMAL_adiabatic_ID)) call thermal_adiabatic_init(FILEUNIT)
close(FILEUNIT)
-#ifdef FEM
- if (worldrank == 0) then
-#endif
- write(6,'(/,a)') ' <<<+- constitutive init -+>>>'
- write(6,'(a)') ' $Id$'
- write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
+ mainProcess: if (worldrank == 0) then
+ write(6,'(/,a)') ' <<<+- constitutive init -+>>>'
+ write(6,'(a)') ' $Id$'
+ write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90"
-#ifdef FEM
- endif
-#endif
+ endif mainProcess
!--------------------------------------------------------------------------------------------------
! write description file for constitutive phase output
diff --git a/code/constitutive_dislokmc.f90 b/code/constitutive_dislokmc.f90
index 3c60578b3..7b08471f3 100644
--- a/code/constitutive_dislokmc.f90
+++ b/code/constitutive_dislokmc.f90
@@ -202,9 +202,7 @@ subroutine constitutive_dislokmc_init(fileUnit)
MATERIAL_partPhase
use lattice
use numerics,only: &
-#ifdef FEM
worldrank, &
-#endif
numerics_integrator
implicit none
@@ -224,16 +222,12 @@ subroutine constitutive_dislokmc_init(fileUnit)
line = ''
real(pReal), dimension(:), allocatable :: tempPerSlip, tempPerTwin
-#ifdef FEM
- if (worldrank == 0) then
-#endif
- write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_DISLOKMC_label//' init -+>>>'
- write(6,'(a)') ' $Id$'
- write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
+ mainProcess: if (worldrank == 0) then
+ write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_DISLOKMC_label//' init -+>>>'
+ write(6,'(a)') ' $Id$'
+ write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90"
-#ifdef FEM
- endif
-#endif
+ endif mainProcess
maxNinstance = int(count(phase_plasticity == PLASTICITY_DISLOKMC_ID),pInt)
if (maxNinstance == 0_pInt) return
diff --git a/code/constitutive_dislotwin.f90 b/code/constitutive_dislotwin.f90
index b6dbfd065..4d67cd633 100644
--- a/code/constitutive_dislotwin.f90
+++ b/code/constitutive_dislotwin.f90
@@ -216,9 +216,7 @@ subroutine constitutive_dislotwin_init(fileUnit)
MATERIAL_partPhase
use lattice
use numerics,only: &
-#ifdef FEM
worldrank, &
-#endif
numerics_integrator
implicit none
@@ -238,16 +236,12 @@ subroutine constitutive_dislotwin_init(fileUnit)
line = ''
real(pReal), dimension(:), allocatable :: tempPerSlip, tempPerTwin, tempPerTrans
-#ifdef FEM
- if (worldrank == 0) then
-#endif
- write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_DISLOTWIN_label//' init -+>>>'
- write(6,'(a)') ' $Id$'
- write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
+ mainProcess: if (worldrank == 0) then
+ write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_DISLOTWIN_label//' init -+>>>'
+ write(6,'(a)') ' $Id$'
+ write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90"
-#ifdef FEM
- endif
-#endif
+ endif mainProcess
maxNinstance = int(count(phase_plasticity == PLASTICITY_DISLOTWIN_ID),pInt)
if (maxNinstance == 0_pInt) return
diff --git a/code/constitutive_j2.f90 b/code/constitutive_j2.f90
index 81e77aabc..ab1a46821 100644
--- a/code/constitutive_j2.f90
+++ b/code/constitutive_j2.f90
@@ -94,9 +94,7 @@ subroutine constitutive_j2_init(fileUnit)
debug_constitutive, &
debug_levelBasic
use numerics, only: &
-#ifdef FEM
worldrank, &
-#endif
numerics_integrator
use math, only: &
math_Mandel3333to66, &
@@ -155,16 +153,12 @@ subroutine constitutive_j2_init(fileUnit)
integer(HID_T) :: ID,ID2,ID4
#endif
-#ifdef FEM
- if (worldrank == 0) then
-#endif
- write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_J2_label//' init -+>>>'
- write(6,'(a)') ' $Id$'
- write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
+ mainProcess: if (worldrank == 0) then
+ write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_J2_label//' init -+>>>'
+ write(6,'(a)') ' $Id$'
+ write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90"
-#ifdef FEM
- endif
-#endif
+ endif mainProcess
maxNinstance = int(count(phase_plasticity == PLASTICITY_J2_ID),pInt)
if (maxNinstance == 0_pInt) return
diff --git a/code/constitutive_none.f90 b/code/constitutive_none.f90
index d94a9dfc5..417752b9d 100644
--- a/code/constitutive_none.f90
+++ b/code/constitutive_none.f90
@@ -36,9 +36,7 @@ subroutine constitutive_none_init(fileUnit)
use IO, only: &
IO_timeStamp
use numerics, only: &
-#ifdef FEM
worldrank, &
-#endif
numerics_integrator
use material, only: &
phase_plasticity, &
@@ -59,16 +57,12 @@ subroutine constitutive_none_init(fileUnit)
sizeState, &
sizeDotState
-#ifdef FEM
- if (worldrank == 0) then
-#endif
- write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_NONE_label//' init -+>>>'
- write(6,'(a)') ' $Id$'
- write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
+ mainProcess: if (worldrank == 0) then
+ write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_NONE_label//' init -+>>>'
+ write(6,'(a)') ' $Id$'
+ write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90"
-#ifdef FEM
- endif
-#endif
+ endif mainProcess
maxNinstance = int(count(phase_plasticity == PLASTICITY_none_ID),pInt)
if (maxNinstance == 0_pInt) return
diff --git a/code/constitutive_nonlocal.f90 b/code/constitutive_nonlocal.f90
index cc638db5f..f8e63246d 100644
--- a/code/constitutive_nonlocal.f90
+++ b/code/constitutive_nonlocal.f90
@@ -300,9 +300,7 @@ use material, only: homogenization_maxNgrains, &
material_phase
use lattice
use numerics,only: &
-#ifdef FEM
worldrank, &
-#endif
numerics_integrator
@@ -340,16 +338,12 @@ integer(pInt) :: phase, &
integer(pInt) :: NofMyPhase
-#ifdef FEM
- if (worldrank == 0) then
-#endif
- write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_NONLOCAL_label//' init -+>>>'
- write(6,'(a)') ' $Id$'
- write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
+ mainProcess: if (worldrank == 0) then
+ write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_NONLOCAL_label//' init -+>>>'
+ write(6,'(a)') ' $Id$'
+ write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90"
-#ifdef FEM
- endif
-#endif
+ endif mainProcess
maxNinstances = int(count(phase_plasticity == PLASTICITY_NONLOCAL_ID),pInt)
if (maxNinstances == 0) return ! we don't have to do anything if there's no instance for this constitutive law
diff --git a/code/constitutive_phenopowerlaw.f90 b/code/constitutive_phenopowerlaw.f90
index c7bd7e4c7..1725449e1 100644
--- a/code/constitutive_phenopowerlaw.f90
+++ b/code/constitutive_phenopowerlaw.f90
@@ -138,9 +138,7 @@ subroutine constitutive_phenopowerlaw_init(fileUnit)
MATERIAL_partPhase
use lattice
use numerics,only: &
-#ifdef FEM
worldrank, &
-#endif
numerics_integrator
implicit none
@@ -161,16 +159,12 @@ subroutine constitutive_phenopowerlaw_init(fileUnit)
integer(pInt) :: NofMyPhase
real(pReal), dimension(:), allocatable :: tempPerSlip
-#ifdef FEM
- if (worldrank == 0) then
-#endif
- write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_PHENOPOWERLAW_label//' init -+>>>'
- write(6,'(a)') ' $Id$'
- write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
+ mainProcess: if (worldrank == 0) then
+ write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_PHENOPOWERLAW_label//' init -+>>>'
+ write(6,'(a)') ' $Id$'
+ write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90"
-#ifdef FEM
- endif
-#endif
+ endif mainProcess
maxNinstance = int(count(phase_plasticity == PLASTICITY_PHENOPOWERLAW_ID),pInt)
if (maxNinstance == 0_pInt) return
diff --git a/code/constitutive_titanmod.f90 b/code/constitutive_titanmod.f90
index 44813c9ed..4ad98143a 100644
--- a/code/constitutive_titanmod.f90
+++ b/code/constitutive_titanmod.f90
@@ -219,9 +219,7 @@ subroutine constitutive_titanmod_init(fileUnit)
MATERIAL_partPhase
use lattice
use numerics,only: &
-#ifdef FEM
worldrank, &
-#endif
numerics_integrator
implicit none
@@ -246,16 +244,12 @@ subroutine constitutive_titanmod_init(fileUnit)
tag = '', &
line = ''
-#ifdef FEM
- if (worldrank == 0) then
-#endif
- write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_TITANMOD_label//' init -+>>>'
- write(6,'(a)') ' $Id$'
- write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
+ mainProcess: if (worldrank == 0) then
+ write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_TITANMOD_label//' init -+>>>'
+ write(6,'(a)') ' $Id$'
+ write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90"
-#ifdef FEM
- endif
-#endif
+ endif mainProcess
maxNinstance = int(count(phase_plasticity == PLASTICITY_TITANMOD_ID),pInt)
if (maxNinstance == 0_pInt) return
diff --git a/code/crystallite.f90 b/code/crystallite.f90
index 71f3228de..a5bce9854 100644
--- a/code/crystallite.f90
+++ b/code/crystallite.f90
@@ -136,9 +136,7 @@ subroutine crystallite_init
debug_crystallite, &
debug_levelBasic
use numerics, only: &
-#ifdef FEM
worldrank, &
-#endif
usePingPong
use math, only: &
math_I3, &
@@ -199,16 +197,12 @@ subroutine crystallite_init
tag = '', &
line= ''
-#ifdef FEM
- if (worldrank == 0) then
-#endif
- write(6,'(/,a)') ' <<<+- crystallite init -+>>>'
- write(6,'(a)') ' $Id$'
- write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
+ mainProcess: if (worldrank == 0) then
+ write(6,'(/,a)') ' <<<+- crystallite init -+>>>'
+ write(6,'(a)') ' $Id$'
+ write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90"
-#ifdef FEM
- endif
-#endif
+ endif mainProcess
gMax = homogenization_maxNgrains
iMax = mesh_maxNips
diff --git a/code/damage_brittle.f90 b/code/damage_brittle.f90
index 3a1545c71..ee861ef14 100644
--- a/code/damage_brittle.f90
+++ b/code/damage_brittle.f90
@@ -88,9 +88,7 @@ subroutine damage_brittle_init(fileUnit)
damageState, &
MATERIAL_partPhase
use numerics,only: &
-#ifdef FEM
worldrank, &
-#endif
numerics_integrator
implicit none
@@ -105,16 +103,12 @@ subroutine damage_brittle_init(fileUnit)
tag = '', &
line = ''
-#ifdef FEM
- if (worldrank == 0) then
-#endif
- write(6,'(/,a)') ' <<<+- damage_'//LOCAL_DAMAGE_BRITTLE_label//' init -+>>>'
- write(6,'(a)') ' $Id: damage_brittle.f90 3210 2014-06-17 15:24:44Z MPIE\m.diehl $'
- write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
+ mainProcess: if (worldrank == 0) then
+ write(6,'(/,a)') ' <<<+- damage_'//LOCAL_DAMAGE_BRITTLE_label//' init -+>>>'
+ write(6,'(a)') ' $Id: damage_brittle.f90 3210 2014-06-17 15:24:44Z MPIE\m.diehl $'
+ write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90"
-#ifdef FEM
- endif
-#endif
+ endif mainProcess
maxNinstance = int(count(phase_damage == LOCAL_DAMAGE_BRITTLE_ID),pInt)
if (maxNinstance == 0_pInt) return
diff --git a/code/damage_ductile.f90 b/code/damage_ductile.f90
index 26e0739eb..4f2b0cd44 100755
--- a/code/damage_ductile.f90
+++ b/code/damage_ductile.f90
@@ -88,9 +88,7 @@ subroutine damage_ductile_init(fileUnit)
damageState, &
MATERIAL_partPhase
use numerics,only: &
-#ifdef FEM
worldrank, &
-#endif
numerics_integrator
implicit none
@@ -105,16 +103,12 @@ subroutine damage_ductile_init(fileUnit)
tag = '', &
line = ''
-#ifdef FEM
- if (worldrank == 0) then
-#endif
- write(6,'(/,a)') ' <<<+- damage_'//LOCAL_DAMAGE_DUCTILE_LABEL//' init -+>>>'
- write(6,'(a)') ' $Id: damage_ductile.f90 3210 2014-06-17 15:24:44Z MPIE\m.diehl $'
- write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
+ mainProcess: if (worldrank == 0) then
+ write(6,'(/,a)') ' <<<+- damage_'//LOCAL_DAMAGE_DUCTILE_LABEL//' init -+>>>'
+ write(6,'(a)') ' $Id: damage_ductile.f90 3210 2014-06-17 15:24:44Z MPIE\m.diehl $'
+ write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90"
-#ifdef FEM
- endif
-#endif
+ endif mainProcess
maxNinstance = int(count(phase_damage == LOCAL_DAMAGE_DUCTILE_ID),pInt)
if (maxNinstance == 0_pInt) return
diff --git a/code/damage_none.f90 b/code/damage_none.f90
index 069eb7543..49fe62fab 100644
--- a/code/damage_none.f90
+++ b/code/damage_none.f90
@@ -36,9 +36,7 @@ subroutine damage_none_init(fileUnit)
use IO, only: &
IO_timeStamp
use numerics, only: &
-#ifdef FEM
worldrank, &
-#endif
numerics_integrator
use material, only: &
phase_damage, &
@@ -59,16 +57,12 @@ subroutine damage_none_init(fileUnit)
sizeState, &
sizeDotState
-#ifdef FEM
- if (worldrank == 0) then
-#endif
- write(6,'(/,a)') ' <<<+- damage_'//LOCAL_DAMAGE_NONE_label//' init -+>>>'
- write(6,'(a)') ' $Id: damage_none.f90 3148 2014-05-27 14:46:03Z MPIE\m.diehl $'
- write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
+ mainProcess: if (worldrank == 0) then
+ write(6,'(/,a)') ' <<<+- damage_'//LOCAL_DAMAGE_NONE_label//' init -+>>>'
+ write(6,'(a)') ' $Id: damage_none.f90 3148 2014-05-27 14:46:03Z MPIE\m.diehl $'
+ write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90"
-#ifdef FEM
- endif
-#endif
+ endif mainProcess
maxNinstance = int(count(phase_damage == LOCAL_DAMAGE_NONE_ID),pInt)
if (maxNinstance == 0_pInt) return
diff --git a/code/debug.f90 b/code/debug.f90
index a941d7a7a..12b2931fa 100644
--- a/code/debug.f90
+++ b/code/debug.f90
@@ -102,9 +102,7 @@ contains
subroutine debug_init
use, intrinsic :: iso_fortran_env ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
use numerics, only: &
-#ifdef FEM
worldrank, &
-#endif
nStress, &
nState, &
nCryst, &
@@ -132,16 +130,12 @@ subroutine debug_init
character(len=65536) :: tag
character(len=65536) :: line
-#ifdef FEM
- if (worldrank == 0) then
-#endif
- write(6,'(/,a)') ' <<<+- debug init -+>>>'
- write(6,'(a)') ' $Id$'
- write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
+ mainProcess: if (worldrank == 0) then
+ write(6,'(/,a)') ' <<<+- debug init -+>>>'
+ write(6,'(a)') ' $Id$'
+ write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90"
-#ifdef FEM
- endif
-#endif
+ endif mainProcess
if (allocated(debug_StressLoopDistribution)) &
deallocate(debug_StressLoopDistribution)
diff --git a/code/homogenization.f90 b/code/homogenization.f90
index 1be553ecc..169bfd589 100644
--- a/code/homogenization.f90
+++ b/code/homogenization.f90
@@ -120,10 +120,8 @@ subroutine homogenization_init()
use homogenization_isostrain
use homogenization_RGC
use IO
-#ifdef FEM
use numerics, only: &
worldrank
-#endif
implicit none
integer(pInt), parameter :: FILEUNIT = 200_pInt
@@ -308,16 +306,12 @@ subroutine homogenization_init()
+ 1 + constitutive_maxSizePostResults) ! constitutive size & constitutive results
allocate(materialpoint_results(materialpoint_sizeResults,mesh_maxNips,mesh_NcpElems))
-#ifdef FEM
- if (worldrank == 0) then
-#endif
- write(6,'(/,a)') ' <<<+- homogenization init -+>>>'
- write(6,'(a)') ' $Id$'
- write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
+ mainProcess: if (worldrank == 0) then
+ write(6,'(/,a)') ' <<<+- homogenization init -+>>>'
+ write(6,'(a)') ' $Id$'
+ write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90"
-#ifdef FEM
- endif
-#endif
+ endif mainProcess
if (iand(debug_level(debug_homogenization), debug_levelBasic) /= 0_pInt) then
#ifdef TODO
diff --git a/code/homogenization_RGC.f90 b/code/homogenization_RGC.f90
index c3c871112..475630fbc 100644
--- a/code/homogenization_RGC.f90
+++ b/code/homogenization_RGC.f90
@@ -98,10 +98,8 @@ subroutine homogenization_RGC_init(fileUnit)
FE_geomtype
use IO
use material
-#ifdef FEM
use numerics, only: &
worldrank
-#endif
implicit none
integer(pInt), intent(in) :: fileUnit !< file pointer to material configuration
@@ -118,16 +116,12 @@ subroutine homogenization_RGC_init(fileUnit)
tag = '', &
line = ''
-#ifdef FEM
- if (worldrank == 0) then
-#endif
- write(6,'(/,a)') ' <<<+- homogenization_'//HOMOGENIZATION_RGC_label//' init -+>>>'
- write(6,'(a)') ' $Id$'
- write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
+ mainProcess: if (worldrank == 0) then
+ write(6,'(/,a)') ' <<<+- homogenization_'//HOMOGENIZATION_RGC_label//' init -+>>>'
+ write(6,'(a)') ' $Id$'
+ write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90"
-#ifdef FEM
- endif
-#endif
+ endif mainProcess
maxNinstance = int(count(homogenization_type == HOMOGENIZATION_RGC_ID),pInt)
if (maxNinstance == 0_pInt) return
diff --git a/code/homogenization_isostrain.f90 b/code/homogenization_isostrain.f90
index 443e4d65d..c1d44c0a5 100644
--- a/code/homogenization_isostrain.f90
+++ b/code/homogenization_isostrain.f90
@@ -60,10 +60,8 @@ subroutine homogenization_isostrain_init(fileUnit)
debug_levelBasic
use IO
use material
-#ifdef FEM
use numerics, only: &
worldrank
-#endif
implicit none
integer(pInt), intent(in) :: fileUnit
@@ -81,16 +79,12 @@ subroutine homogenization_isostrain_init(fileUnit)
tag = '', &
line = ''
-#ifdef FEM
- if (worldrank == 0) then
-#endif
- write(6,'(/,a)') ' <<<+- homogenization_'//HOMOGENIZATION_ISOSTRAIN_label//' init -+>>>'
- write(6,'(a)') ' $Id$'
- write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
+ mainProcess: if (worldrank == 0) then
+ write(6,'(/,a)') ' <<<+- homogenization_'//HOMOGENIZATION_ISOSTRAIN_label//' init -+>>>'
+ write(6,'(a)') ' $Id$'
+ write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90"
-#ifdef FEM
- endif
-#endif
+ endif mainProcess
maxNinstance = count(homogenization_type == HOMOGENIZATION_ISOSTRAIN_ID)
if (maxNinstance == 0) return
diff --git a/code/homogenization_none.f90 b/code/homogenization_none.f90
index fc906dcb1..fafd03cbf 100644
--- a/code/homogenization_none.f90
+++ b/code/homogenization_none.f90
@@ -27,26 +27,20 @@ subroutine homogenization_none_init()
use IO, only: &
IO_timeStamp
use material
-#ifdef FEM
use numerics, only: &
worldrank
-#endif
implicit none
integer(pInt) :: &
homog, &
NofMyHomog
-#ifdef FEM
- if (worldrank == 0) then
-#endif
- write(6,'(/,a)') ' <<<+- homogenization_'//HOMOGENIZATION_NONE_label//' init -+>>>'
- write(6,'(a)') ' $Id$'
- write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
+ mainProcess: if (worldrank == 0) then
+ write(6,'(/,a)') ' <<<+- homogenization_'//HOMOGENIZATION_NONE_label//' init -+>>>'
+ write(6,'(a)') ' $Id$'
+ write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90"
-#ifdef FEM
- endif
-#endif
+ endif mainProcess
initializeInstances: do homog = 1_pInt, material_Nhomogenization
diff --git a/code/lattice.f90 b/code/lattice.f90
index 0210911b0..46e035652 100644
--- a/code/lattice.f90
+++ b/code/lattice.f90
@@ -915,10 +915,8 @@ subroutine lattice_init
debug_level, &
debug_lattice, &
debug_levelBasic
-#ifdef FEM
use numerics, only: &
worldrank
-#endif
implicit none
integer(pInt), parameter :: FILEUNIT = 200_pInt
@@ -935,16 +933,12 @@ subroutine lattice_init
aM, & !< lattice paramater a for bcc martensite
cM !< lattice parameter c for bcc martensite
-#ifdef FEM
- if (worldrank == 0) then
-#endif
- write(6,'(/,a)') ' <<<+- lattice init -+>>>'
- write(6,'(a)') ' $Id$'
- write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
+ mainProcess: if (worldrank == 0) then
+ write(6,'(/,a)') ' <<<+- lattice init -+>>>'
+ write(6,'(a)') ' $Id$'
+ write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90"
-#ifdef FEM
- endif
-#endif
+ endif mainProcess
!--------------------------------------------------------------------------------------------------
! consistency checks
diff --git a/code/material.f90 b/code/material.f90
index 6bc0d5651..ba8d288db 100644
--- a/code/material.f90
+++ b/code/material.f90
@@ -266,10 +266,8 @@ subroutine material_init
mesh_element, &
FE_Nips, &
FE_geomtype
-#ifdef FEM
use numerics, only: &
worldrank
-#endif
implicit none
integer(pInt), parameter :: FILEUNIT = 200_pInt
@@ -287,16 +285,12 @@ subroutine material_init
myDebug = debug_level(debug_material)
-#ifdef FEM
- if (worldrank == 0) then
-#endif
- write(6,'(/,a)') ' <<<+- material init -+>>>'
- write(6,'(a)') ' $Id$'
- write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
+ mainProcess: if (worldrank == 0) then
+ write(6,'(/,a)') ' <<<+- material init -+>>>'
+ write(6,'(a)') ' $Id$'
+ write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90"
-#ifdef FEM
- endif
-#endif
+ endif mainProcess
if (.not. IO_open_jobFile_stat(FILEUNIT,material_localFileExt)) & ! no local material configuration present...
call IO_open_file(FILEUNIT,material_configFile) ! ...open material.config file
diff --git a/code/math.f90 b/code/math.f90
index 9e7e76c80..9f9328c9a 100644
--- a/code/math.f90
+++ b/code/math.f90
@@ -211,9 +211,7 @@ subroutine math_init
use, intrinsic :: iso_fortran_env ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
use prec, only: tol_math_check
use numerics, only: &
-#ifdef FEM
worldrank, &
-#endif
fixedSeed
use IO, only: IO_error, IO_timeStamp
@@ -228,16 +226,12 @@ subroutine math_init
! comment the first random_seed call out, set randSize to 1, and use ifort
character(len=64) :: error_msg
-#ifdef FEM
- if (worldrank == 0) then
-#endif
- write(6,'(/,a)') ' <<<+- math init -+>>>'
- write(6,'(a)') ' $Id$'
- write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
+ mainProcess: if (worldrank == 0) then
+ write(6,'(/,a)') ' <<<+- math init -+>>>'
+ write(6,'(a)') ' $Id$'
+ write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90"
-#ifdef FEM
- endif
-#endif
+ endif mainProcess
call random_seed(size=randSize)
if (allocated(randInit)) deallocate(randInit)
diff --git a/code/thermal_adiabatic.f90 b/code/thermal_adiabatic.f90
index 5ade6b08b..325ff2dd7 100644
--- a/code/thermal_adiabatic.f90
+++ b/code/thermal_adiabatic.f90
@@ -85,9 +85,7 @@ subroutine thermal_adiabatic_init(fileUnit)
thermalState, &
MATERIAL_partPhase
use numerics,only: &
-#ifdef FEM
worldrank, &
-#endif
numerics_integrator
implicit none
@@ -102,16 +100,12 @@ subroutine thermal_adiabatic_init(fileUnit)
tag = '', &
line = ''
-#ifdef FEM
- if (worldrank == 0) then
-#endif
- write(6,'(/,a)') ' <<<+- thermal_'//LOCAL_THERMAL_ADIABATIC_label//' init -+>>>'
- write(6,'(a)') ' $Id: thermal_adiabatic.f90 3210 2014-06-17 15:24:44Z MPIE\m.diehl $'
- write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
+ mainProcess: if (worldrank == 0) then
+ write(6,'(/,a)') ' <<<+- thermal_'//LOCAL_THERMAL_ADIABATIC_label//' init -+>>>'
+ write(6,'(a)') ' $Id: thermal_adiabatic.f90 3210 2014-06-17 15:24:44Z MPIE\m.diehl $'
+ write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90"
-#ifdef FEM
- endif
-#endif
+ endif mainProcess
maxNinstance = int(count(phase_thermal == LOCAL_THERMAL_adiabatic_ID),pInt)
if (maxNinstance == 0_pInt) return
diff --git a/code/thermal_isothermal.f90 b/code/thermal_isothermal.f90
index 297ed5164..49fb5800e 100644
--- a/code/thermal_isothermal.f90
+++ b/code/thermal_isothermal.f90
@@ -36,9 +36,7 @@ subroutine thermal_isothermal_init(fileUnit)
use IO, only: &
IO_timeStamp
use numerics, only: &
-#ifdef FEM
worldrank, &
-#endif
numerics_integrator
use material, only: &
phase_thermal, &
@@ -59,16 +57,12 @@ subroutine thermal_isothermal_init(fileUnit)
sizeState, &
sizeDotState
-#ifdef FEM
- if (worldrank == 0) then
-#endif
- write(6,'(/,a)') ' <<<+- thermal_'//LOCAL_THERMAL_ISOTHERMAL_label//' init -+>>>'
- write(6,'(a)') ' $Id: thermal_isothermal.f90 3148 2014-05-27 14:46:03Z MPIE\m.diehl $'
- write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
+ mainProcess: if (worldrank == 0) then
+ write(6,'(/,a)') ' <<<+- thermal_'//LOCAL_THERMAL_ISOTHERMAL_label//' init -+>>>'
+ write(6,'(a)') ' $Id: thermal_isothermal.f90 3148 2014-05-27 14:46:03Z MPIE\m.diehl $'
+ write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90"
-#ifdef FEM
- endif
-#endif
+ endif mainProcess
maxNinstance = int(count(phase_thermal == LOCAL_THERMAL_ISOTHERMAL_ID),pInt)
if (maxNinstance == 0_pInt) return