Changeset 23256

Timestamp:

09/11/18 14:22:19 (7 years ago)

Author:

kruegern

Message:

BUG: fixed preqmu.py causing directory error in consecutive Dakota/QMU tests, minor formatting issue in geometry.py

Location:

issm/trunk-jpl/src/m

Files:

• classes/geometry.py (modified) (1 diff)
• qmu/preqmu.py (modified) (1 diff)

issm/trunk-jpl/src/m/classes/geometry.py

@@ -13 +13 @@
 
         def __init__(self): # {{{
-                self.surface           = float('NaN')
-                self.thickness         = float('NaN')
+                self.surface            = float('NaN')
+                self.thickness          = float('NaN')
                 self.base               = float('NaN')
-                self.bed        = float('NaN')
-                self.hydrostatic_ratio = float('NaN')
+                self.bed                = float('NaN')
+                self.hydrostatic_ratio  = float('NaN')
 
                 #set defaults

issm/trunk-jpl/src/m/qmu/preqmu.py

@@ -45 +45 @@
                         raise RuntimeError('Existing '+str(options.qmudir)+' directory, cannot overwrite. Specify "overwrite","y" option in solve arguments.')
         
-
-        os.makedirs(qmudir)
+        # os.makedirs() raises error when dir exists, matlab's mkdir() does not
+        if not os.path.isdir(qmudir):
+                os.makedirs(qmudir)
         os.chdir(qmudir)