better handling of task_root

GeoStat-Framework · Aug 9, 2019 · 8310a1d · 8310a1d
1 parent 68885d9
commit 8310a1d
Show file tree

Hide file tree

Showing 6 changed files with 334 additions and 347 deletions.
diff --git a/ogs5py/fileclasses/base.py b/ogs5py/fileclasses/base.py
@@ -61,12 +61,9 @@ class File(object):
         Default: ".std"
     """
 
-    def __init__(
-        self,
-        task_root=os.path.join(CWD, "ogs5model"),
-        task_id="model",
-        file_ext=".std",
-    ):
+    def __init__(self, task_root=None, task_id="model", file_ext=".std"):
+        if task_root is None:
+            task_root = os.path.join(CWD, "ogs5model")
         self.task_root = task_root
         self.task_id = task_id
         self.top_com = TOP_COM
@@ -248,7 +245,7 @@ def __init__(
         lines=None,
         file_name="textfile",
         file_ext=".txt",
-        task_root=os.path.join(CWD, "ogs5model"),
+        task_root=None,
         task_id="model",
     ):
         super(LineFile, self).__init__(task_root, task_id, file_ext)
@@ -381,12 +378,7 @@ class BlockFile(File):
     STD = {}
     """:class:`dict`: Standard Block OGS-BlockFile"""
 
-    def __init__(
-        self,
-        task_root=os.path.join(CWD, "ogs5model"),
-        task_id="model",
-        file_ext=".std",
-    ):
+    def __init__(self, task_root=None, task_id="model", file_ext=".std"):
         super(BlockFile, self).__init__(task_root, task_id, file_ext)
 
         # list of main keywords indicated by "#"

diff --git a/ogs5py/fileclasses/gem/core.py b/ogs5py/fileclasses/gem/core.py
@@ -140,11 +140,11 @@ def __init__(
         dch=None,
         ipm=None,
         dbr=None,
-        task_root=os.path.join(CWD, "ogs5model"),
+        task_root=None,
         task_id="model",
     ):
-        """
-        """
+        if task_root is None:
+            task_root = os.path.join(CWD, "ogs5model")
         self._task_root = task_root
         self.task_id = task_id
         self.lst_name = lst_name

diff --git a/ogs5py/fileclasses/gli/core.py b/ogs5py/fileclasses/gli/core.py
@@ -972,7 +972,7 @@ def __init__(
         data=None,
         file_name=None,
         file_ext=None,
-        task_root=os.path.join(CWD, "ogs5model"),
+        task_root=None,
         task_id="model",
     ):
         super(GLIext, self).__init__(task_root, task_id)