default abaqus is used if version matches or is undefined

other changes do not alter behavior, just cleaning

python/damask/solver/abaqus.py

@@ -7,7 +7,7 @@ import damask
 class Abaqus(Solver):
     """Wrapper to run DAMASK with Abaqus."""
 
-    def __init__(self,version=None):
+    def __init__(self,version=damask.Environment().options['ABAQUS_VERSION']):
         """
         Create a Abaqus solver object.
     
@@ -20,9 +20,6 @@ class Abaqus(Solver):
         self.solver  = 'Abaqus'
         try:
             self.version = int(version)
-        except TypeError:
-            try:
-                self.version = int(damask.Environment().options['ABAQUS_VERSION'])
         except TypeError:
             self.version = -1
 
@@ -34,6 +31,6 @@ class Abaqus(Solver):
             cmd = 'abaqus'
             process = subprocess.Popen([cmd,'information=release'],stdout = subprocess.PIPE,stderr = subprocess.PIPE)
             detectedVersion = int(process.stdout.readlines()[1].split()[1].decode('utf-8'))
-            if self.version != detectedVersion:
+            if self.version not in [detectedVersion,-1]:
                 raise Exception('found Abaqus version {}, but requested {}'.format(detectedVersion,self.version))
         return '{} -job {} -user {}/src/DAMASK_abaqus interactive'.format(cmd,model,damask.Environment().rootDir())

python/damask/solver/marc.py

@@ -22,9 +22,6 @@ class Marc(Solver):
         self.solver  = 'Marc'
         try:
             self.version = int(version)
-        except TypeError:
-            try:
-                self.version = int(damask.Environment().options['MARC_VERSION'])
         except TypeError:
             self.version = -1