Changeset 12873 for issm/trunk-jpl/src/m/model/parameterization/parameterize.py

Timestamp:

08/02/12 09:58:39 (13 years ago)

Author:

jschierm

Message:

Revised python version of parameterize.

File:

• issm/trunk-jpl/src/m/model/parameterization/parameterize.py (modified) (1 diff)

issm/trunk-jpl/src/m/model/parameterization/parameterize.py

@@ -1 +1 @@
 import os
-def  parameterize(md,parametername):
-        #PARAMETERIZE - parameterize a model
-        #
-        #   from a parameter matlab file, start filling in all the model fields that were not 
-        #   filled in by the mesh.py and setmask.py model methods.
-        #   Warning: the parameter file must be able to be run in Python
-        #
-        #   Usage:
-        #      md=parameterize(md,parametername)
-        #
-        #   Example:
-        #      md=parameterize(md,'Square.par');
+import datetime
+
+def parameterize(md,parametername):
+        """
+        PARAMETERIZE - parameterize a model
+         
+            from a parameter python file, start filling in all the model fields that were not 
+            filled in by the mesh.py and mask.py model methods.
+            Warning: the parameter file must be able to be run in Python
+         
+            Usage:
+               md=parameterize(md,parametername)
+         
+            Example:
+               md=parameterize(md,'Square.par');
+        """
 
         #some checks
-        if not os.path.isfile(parametername):
-                print 'parameterize error message: file '+parametername+' not found.'
-                return []
+        if not os.path.exists(parametername):
+                raise IOError("parameterize error message: file '%s' not found!" % parametername)
 
         #Try and run parameter file.
         execfile(parametername)
-        
-        #ame and notes
-        if len(md.miscellaneous.name)==0:
-                md.miscellaneous.name=os.path.basename(parametername)
-        
-        md=addnote(md,'Model created by using parameter file: '+parametername+' on: '+str(datetime.datetime.now()))
+
+        #Name and notes
+        if not md.miscellaneous.name:
+                md.miscellaneous.name=os.path.basename(parametername).split('.')[0]
+
+        md=addnote(md,"Model created by using parameter file: '%s' on: %s." % (parametername,datetime.datetime.strftime(datetime.datetime.now(),'%c') ))
+
+        return md
+