From e53ba801fa6e1235c2eeac965bf88130240d18f7 Mon Sep 17 00:00:00 2001
From: Martin Diehl <mail@martin-diehl.net>
Date: Sun, 15 Mar 2020 17:04:28 +0100
Subject: [PATCH] more systematic file structure

---
 src/DAMASK_marc.f90                            | 6 +++---
 src/{MarcInclude => marc/include}/concom2018   | 0
 src/{MarcInclude => marc/include}/concom2018.1 | 0
 src/{MarcInclude => marc/include}/concom2019   | 0
 src/{MarcInclude => marc/include}/creeps2018   | 0
 src/{MarcInclude => marc/include}/creeps2018.1 | 0
 src/{MarcInclude => marc/include}/creeps2019   | 0
 7 files changed, 3 insertions(+), 3 deletions(-)
 rename src/{MarcInclude => marc/include}/concom2018 (100%)
 rename src/{MarcInclude => marc/include}/concom2018.1 (100%)
 rename src/{MarcInclude => marc/include}/concom2019 (100%)
 rename src/{MarcInclude => marc/include}/creeps2018 (100%)
 rename src/{MarcInclude => marc/include}/creeps2018.1 (100%)
 rename src/{MarcInclude => marc/include}/creeps2019 (100%)

diff --git a/src/DAMASK_marc.f90 b/src/DAMASK_marc.f90
index a3718c59d..437615f93 100644
--- a/src/DAMASK_marc.f90
+++ b/src/DAMASK_marc.f90
@@ -233,8 +233,8 @@ subroutine hypela2(d,g,e,de,s,t,dt,ngens,m,nn,kcus,matus,ndi,nshear,disp, &
 ! Marc common blocks are in fixed format so they have to be reformated to free format (f90)
 ! Beware of changes in newer Marc versions
 
-#include QUOTE(PASTE(./MarcInclude/concom,Marc4DAMASK))                                             ! concom is needed for inc, lovl
-#include QUOTE(PASTE(./MarcInclude/creeps,Marc4DAMASK))                                             ! creeps is needed for timinc (time increment)
+#include QUOTE(PASTE(./marc/include/concom,Marc4DAMASK))                                            ! concom is needed for inc, lovl
+#include QUOTE(PASTE(./marc/include/creeps,Marc4DAMASK))                                            ! creeps is needed for timinc (time increment)
 
  logical :: cutBack
  real(pReal), dimension(6) ::   stress
@@ -408,7 +408,7 @@ subroutine uedinc(inc,incsub)
   implicit none
   integer, intent(in) :: inc, incsub
   integer, save :: inc_written
-#include QUOTE(PASTE(./MarcInclude/creeps,Marc4DAMASK))                                             ! creeps is needed for timinc (time increment)
+#include QUOTE(PASTE(./marc/include/creeps,Marc4DAMASK))                                            ! creeps is needed for timinc (time increment)
 
   if (inc > inc_written) then
     call CPFEM_results(inc,cptim)
diff --git a/src/MarcInclude/concom2018 b/src/marc/include/concom2018
similarity index 100%
rename from src/MarcInclude/concom2018
rename to src/marc/include/concom2018
diff --git a/src/MarcInclude/concom2018.1 b/src/marc/include/concom2018.1
similarity index 100%
rename from src/MarcInclude/concom2018.1
rename to src/marc/include/concom2018.1
diff --git a/src/MarcInclude/concom2019 b/src/marc/include/concom2019
similarity index 100%
rename from src/MarcInclude/concom2019
rename to src/marc/include/concom2019
diff --git a/src/MarcInclude/creeps2018 b/src/marc/include/creeps2018
similarity index 100%
rename from src/MarcInclude/creeps2018
rename to src/marc/include/creeps2018
diff --git a/src/MarcInclude/creeps2018.1 b/src/marc/include/creeps2018.1
similarity index 100%
rename from src/MarcInclude/creeps2018.1
rename to src/marc/include/creeps2018.1
diff --git a/src/MarcInclude/creeps2019 b/src/marc/include/creeps2019
similarity index 100%
rename from src/MarcInclude/creeps2019
rename to src/marc/include/creeps2019