From 904c338b136660283de355e052cdf1923a1e81d7 Mon Sep 17 00:00:00 2001
From: Vitesh Shah <v.shah@mpie.de>
Date: Thu, 29 Oct 2020 15:21:40 +0100
Subject: [PATCH] Reflect version underscore of installation files

---
 installation/mods_MarcMentat/apply_DAMASK_modifications.py | 4 ++--
 python/damask/_environment.py                              | 2 +-
 python/damask/solver/_marc.py                              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/installation/mods_MarcMentat/apply_DAMASK_modifications.py b/installation/mods_MarcMentat/apply_DAMASK_modifications.py
index ef0001074..51f5e2312 100755
--- a/installation/mods_MarcMentat/apply_DAMASK_modifications.py
+++ b/installation/mods_MarcMentat/apply_DAMASK_modifications.py
@@ -7,7 +7,7 @@ from pathlib import Path
 
 import damask
 
-marc_version = float(damask.environment.options['MSCVERSION'])
+marc_version = float(damask.environment.options['MSC_VERSION'])
 if int(marc_version) == marc_version:
     marc_version = int(marc_version)
 msc_root     = Path(damask.environment.options['MSC_ROOT'])
@@ -15,7 +15,7 @@ damask_root  = damask.environment.root_dir
 
 parser = argparse.ArgumentParser(
      description='Apply DAMASK modification to MSC.Marc/Mentat',
-     epilog = f'MSC_ROOT={msc_root} and MSCVERSION={marc_version} (from {damask_root}/env/CONFIG)')
+     epilog = f'MSC_ROOT={msc_root} and MSC_VERSION={marc_version} (from {damask_root}/env/CONFIG)')
 parser.add_argument('--editor', dest='editor', metavar='string', default='vi',
                     help='Name of the editor for MSC.Mentat (executable)')
 
diff --git a/python/damask/_environment.py b/python/damask/_environment.py
index d3629de31..9983a91aa 100644
--- a/python/damask/_environment.py
+++ b/python/damask/_environment.py
@@ -32,7 +32,7 @@ class Environment:
         options = {}
         for item in ['DAMASK_NUM_THREADS',
                      'MSC_ROOT',
-                     'MSCVERSION',
+                     'MSC_VERSION',
                      ]:
             options[item] = os.environ[item] if item in os.environ else None
 
diff --git a/python/damask/solver/_marc.py b/python/damask/solver/_marc.py
index 29e7fe671..e37a46488 100644
--- a/python/damask/solver/_marc.py
+++ b/python/damask/solver/_marc.py
@@ -8,7 +8,7 @@ from .. import environment
 class Marc:
     """Wrapper to run DAMASK with MSCMarc."""
 
-    def __init__(self,version=environment.options['MSCVERSION']):
+    def __init__(self,version=environment.options['MSC_VERSION']):
         """
         Create a Marc solver object.