Changeset 19570

Timestamp:

09/21/15 08:37:23 (10 years ago)

Author:

cborstad

Message:

CHG: analogous change for loading models saved with a name other than default

File:

• issm/trunk-jpl/src/m/classes/organizer.py (modified) (2 diffs)

issm/trunk-jpl/src/m/classes/organizer.py ¶

@@ -98 +98 @@
                 if not isinstance(string,(str,unicode)):
                         raise TypeError("argument provided is not a string")
-                path=os.path.join(self.repository,self.prefix+'.step#'+string+'.python')
+                path1=os.path.join(self.repository,self.prefix+'.step#'+string+'.python')
+                path2=os.path.join(self.repository,string)
 
                 #figure out if the model is there, otherwise, we have to use the default path supplied by user.
-                if whichdb(path):
-                        md=loadmodel(path)
+                if whichdb(path1):
+                        md=loadmodel(path1)
                         return md
+                elif whichdb(path2):
+                        md=loadmodel(path2)
+                        return md
 
                 #If we are here, the model has not been found. Try trunk prefix if provided
@@ -115 +119 @@
                                 return md
                 else:
-                        raise IOError("Could not find '%s'" % path)
+                        raise IOError("Could not find '%s'" % path1)
         #}}}
         def perform(self,string):    # {{{