From 2a5dfbbfa0310ca4011ffdbb7f95d4455a6d20f2 Mon Sep 17 00:00:00 2001
From: Martin	Diehl <m.diehl@mpie.de>
Date: Tue, 30 Apr 2013 09:49:30 +0000
Subject: [PATCH] removed #define Marc and substituted #ifdef Marc by #ifdef
 Marc4DAMASK which is defined by either the submit scripts or
 DAMASK_marcXXXX.f90

---
 code/DAMASK_marc.f90 |  2 --
 code/FEsolving.f90   |  2 +-
 code/IO.f90          |  2 +-
 code/mesh.f90        | 16 +++++-----------
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/code/DAMASK_marc.f90 b/code/DAMASK_marc.f90
index 51b79c2eb..e443d6807 100644
--- a/code/DAMASK_marc.f90
+++ b/code/DAMASK_marc.f90
@@ -55,8 +55,6 @@
 #define FLOAT 8
 #endif
 
-#define Marc
-
 #include "prec.f90"
 
 module DAMASK_interface
diff --git a/code/FEsolving.f90 b/code/FEsolving.f90
index 4190cd48d..95f7bc818 100644
--- a/code/FEsolving.f90
+++ b/code/FEsolving.f90
@@ -146,7 +146,7 @@ subroutine FE_init
  100 close(fileunit)
 
  if (restartRead) then
-#ifdef Marc
+#ifdef Marc4DAMASK
    call IO_open_logFile(fileunit)
    rewind(fileunit)
    do
diff --git a/code/IO.f90 b/code/IO.f90
index 6d39b7c14..c9675f13d 100644
--- a/code/IO.f90
+++ b/code/IO.f90
@@ -248,7 +248,7 @@ subroutine IO_open_inputFile(myUnit,model)
     if (.not.abaqus_assembleInputFile(myUnit,myUnit+1_pInt)) call IO_error(103_pInt)                ! strip comments and concatenate any "include"s
  close(myUnit+1_pInt) 
 #endif
-#ifdef Marc
+#ifdef Marc4DAMASK
    path = trim(getSolverWorkingDirectoryName())//trim(model)//inputFileExtension
    open(myUnit,status='old',iostat=myStat,file=path)
    if (myStat /= 0_pInt) call IO_error(100_pInt,ext_msg=path)
diff --git a/code/mesh.f90 b/code/mesh.f90
index 979077a8d..5513a83f3 100644
--- a/code/mesh.f90
+++ b/code/mesh.f90
@@ -76,7 +76,7 @@ module mesh
     
  logical, dimension(3), public, protected :: mesh_periodicSurface                                   !< flag indicating periodic outer surfaces (used for fluxes)
 
-#ifdef Marc
+#ifdef Marc4DAMASK
  integer(pInt), private :: &  
    hypoelasticTableStyle, &                                                                         !< Table style (Marc only)
    initialcondTableStyle                                                                            !< Table style (Marc only)
@@ -446,7 +446,7 @@ module mesh
    mesh_spectral_build_elements, &
    mesh_spectral_build_ipNeighborhood, &
 #endif 
-#ifdef Marc
+#ifdef Marc4DAMASK
    mesh_marc_get_tableStyles, &
    mesh_marc_count_nodesAndElements, &
    mesh_marc_count_elementSets, &
@@ -592,7 +592,7 @@ subroutine mesh_init(ip,el)
  call mesh_build_ipAreas
  call mesh_spectral_build_ipNeighborhood
 #endif
-#ifdef Marc
+#ifdef Marc4DAMASK
  call IO_open_inputFile(fileUnit,modelName)                                                         ! parse info from input file...
  call mesh_marc_get_tableStyles(fileUnit)
  call mesh_marc_count_nodesAndElements(fileUnit)
@@ -2456,7 +2456,7 @@ end function mesh_shapeMismatch
 #endif
 
 
-#ifdef Marc
+#ifdef Marc4DAMASK
 !--------------------------------------------------------------------------------------------------
 !> @brief Figures out table styles (Marc only) and stores to 'initialcondTableStyle' and 
 !! 'hypoelasticTableStyle'
@@ -3063,11 +3063,9 @@ end subroutine mesh_abaqus_count_elementSets
 
 
 !--------------------------------------------------------------------------------------------------
-!********************************************************************
 ! count overall number of solid sections sets in mesh (Abaqus only)
 !
 ! mesh_Nmaterials
-!********************************************************************
 !--------------------------------------------------------------------------------------------------
 subroutine mesh_abaqus_count_materials(myUnit)
 
@@ -3109,11 +3107,9 @@ end subroutine mesh_abaqus_count_materials
 
 
 !--------------------------------------------------------------------------------------------------
-!********************************************************************
 ! Build element set mapping 
 !
 ! allocate globals: mesh_nameElemSet, mesh_mapElemSet
-!********************************************************************
 !--------------------------------------------------------------------------------------------------
 subroutine mesh_abaqus_map_elementSets(myUnit)
 
@@ -3163,11 +3159,9 @@ end subroutine mesh_abaqus_map_elementSets
 
 
 !--------------------------------------------------------------------------------------------------
-!********************************************************************
 ! map solid section (Abaqus only)
 !
 ! allocate globals: mesh_nameMaterial, mesh_mapMaterial
-!********************************************************************
 !--------------------------------------------------------------------------------------------------
 subroutine mesh_abaqus_map_materials(myUnit)
 
@@ -3682,7 +3676,7 @@ use IO, only: &
  mesh_periodicSurface = .true.
 #else
  mesh_periodicSurface = .false.
-#ifdef Marc 
+#ifdef Marc4DAMASK 
  keyword = '$damask'
 #endif
 #ifdef Abaqus