From 4860f9c9cef3a2178f5860125886b2f6425208bb Mon Sep 17 00:00:00 2001
From: Martin Diehl <mail@martin-diehl.net>
Date: Sat, 18 Jul 2020 09:51:53 +0200
Subject: [PATCH] drop support for parallel marc versions

can still be handled by the user, but is a niche use case
---
 env/CONFIG                    | 6 +++---
 python/damask/_environment.py | 1 -
 python/damask/solver/_marc.py | 2 +-
 src/DAMASK_marc2018.1.f90     | 1 -
 src/DAMASK_marc2018.f90       | 1 -
 src/DAMASK_marc2019.1.f90     | 1 -
 src/DAMASK_marc2019.f90       | 1 -
 7 files changed, 4 insertions(+), 9 deletions(-)
 delete mode 120000 src/DAMASK_marc2018.1.f90
 delete mode 120000 src/DAMASK_marc2018.f90
 delete mode 120000 src/DAMASK_marc2019.1.f90
 delete mode 120000 src/DAMASK_marc2019.f90

diff --git a/env/CONFIG b/env/CONFIG
index 343e21a60..380197583 100644
--- a/env/CONFIG
+++ b/env/CONFIG
@@ -1,5 +1,5 @@
 # "set"-syntax needed only for tcsh (but works with bash and zsh)
-set DAMASK_NUM_THREADS    = 4
+set DAMASK_NUM_THREADS  = 4
 
-set MSC_ROOT              = /opt/msc
-set MARC_VERSION          = 2019.1
+set MSC_ROOT            = /opt/msc
+set MARC_VERSION        = 2019.1
diff --git a/python/damask/_environment.py b/python/damask/_environment.py
index 7b8b8487e..d4b7abe51 100644
--- a/python/damask/_environment.py
+++ b/python/damask/_environment.py
@@ -3,7 +3,6 @@ from pathlib import Path
 
 class Environment:
 
-    # ToDo: Probably, we don't need a class (just a module with a few functions)
     def __init__(self):
         """Do Nothing."""
         pass
diff --git a/python/damask/solver/_marc.py b/python/damask/solver/_marc.py
index 8cf888295..8e96f1b90 100644
--- a/python/damask/solver/_marc.py
+++ b/python/damask/solver/_marc.py
@@ -49,7 +49,7 @@ class Marc:
                   ):
 
 
-        usersub = damask.environment.root_dir/Path(f'src/DAMASK_marc{self.version}')
+        usersub = damask.environment.root_dir/'src/DAMASK_marc'
         usersub = usersub.parent/(usersub.name + ('.f90' if compile else '.marc'))
         if not usersub.is_file():
             raise FileNotFoundError("DAMASK4Marc ({}) '{}' not found".format(('source' if compile else 'binary'),usersub))
diff --git a/src/DAMASK_marc2018.1.f90 b/src/DAMASK_marc2018.1.f90
deleted file mode 120000
index 2c5bec706..000000000
--- a/src/DAMASK_marc2018.1.f90
+++ /dev/null
@@ -1 +0,0 @@
-DAMASK_marc.f90
\ No newline at end of file
diff --git a/src/DAMASK_marc2018.f90 b/src/DAMASK_marc2018.f90
deleted file mode 120000
index 2c5bec706..000000000
--- a/src/DAMASK_marc2018.f90
+++ /dev/null
@@ -1 +0,0 @@
-DAMASK_marc.f90
\ No newline at end of file
diff --git a/src/DAMASK_marc2019.1.f90 b/src/DAMASK_marc2019.1.f90
deleted file mode 120000
index 2c5bec706..000000000
--- a/src/DAMASK_marc2019.1.f90
+++ /dev/null
@@ -1 +0,0 @@
-DAMASK_marc.f90
\ No newline at end of file
diff --git a/src/DAMASK_marc2019.f90 b/src/DAMASK_marc2019.f90
deleted file mode 120000
index 2c5bec706..000000000
--- a/src/DAMASK_marc2019.f90
+++ /dev/null
@@ -1 +0,0 @@
-DAMASK_marc.f90
\ No newline at end of file