Changeset 25455 for issm/trunk-jpl/src/m/io

Timestamp:

08/25/20 00:32:13 (5 years ago)

Author:

jdquinn

Message:

CHG: Saving chnages so that Basile has access to potential fix to solidearthmodel class

Location:

issm/trunk-jpl/src/m/io

Files:

• loadmodel.m (modified) (1 diff)
• loadmodel.py (modified) (1 diff)
• loadvars.py (modified) (1 diff)

issm/trunk-jpl/src/m/io/loadmodel.m

@@ -1 +1 @@
 function varargout=loadmodel(path)
-%LOADMODEL - load a model using built-in load module
+%LOADMODEL - load a model using built-in load module 
 %
 %   check that model prototype has not changed. if so, adapt to new model prototype.

issm/trunk-jpl/src/m/io/loadmodel.py

@@ -1 +1 @@
 from loadvars import loadvars
-#hack to keep python 2 compatipility
+# Hack to keep python 2 compatibility
 try:
-    #py3 import
-    from dbm import whichdb
+    from dbm import whichdb # Python 3
 except ImportError:
-    #py2 import
-    from whichdb import whichdb
+    from whichdb import whichdb # Python 2
+
 from netCDF4 import Dataset
 
 
 def loadmodel(path, onlylast=False):
-    """
-    LOADMODEL - load a model using built - in load module
+    """LOADMODEL - load a model
 
-       check that model prototype has not changed. if so, adapt to new model prototype.
+    Check that model prototype has not changed: if if has, adapt to new model prototype.
 
-       Usage:
-          md = loadmodel(path)
+    Usage:
+        md = loadmodel(path)
     """
 

issm/trunk-jpl/src/m/io/loadvars.py

@@ -1 +1 @@
 from collections import OrderedDict
+# Hack to keep python 2 compatibility
+try:
+    from dbm import whichdb # Python 3
+except ImportError:
+    from whichdb import whichdb # Python 2
+from re import findall
+import shelve
+
 from netCDF4 import Dataset
 import numpy as np
-from re import findall
-import shelve
 
 from model import *
-#hack to keep python 2 compatibility
-try:
-    #py3 import
-    from dbm import whichdb
-except ImportError:
-    #py2 import
-    from whichdb import whichdb
 
 
 def loadvars(*args, **kwargs):
-    """
-    LOADVARS - function to load variables from a file.
+    """LOADVARS - function to load variables from a file
 
     This function loads one or more variables from a file. The names of the