Changeset 24313 for issm/trunk/src/m/parameterization/parameterize.py

Timestamp:

11/01/19 12:01:57 (5 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 24310

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/parameterization/parameterize.py (modified) (1 diff)

issm/trunk/src/m/parameterization/parameterize.py

@@ -2 +2 @@
 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
+def parameterize(md, parametername):
+    """
+    PARAMETERIZE - parameterize a model
 
-           Usage:
-              md=parameterize(md,parametername)
+       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
 
-           Example:
-              md=parameterize(md,'Square.par');
-        """
+       Usage:
+          md = parameterize(md, parametername)
 
-        #some checks
-        if not os.path.exists(parametername):
-                raise IOError("parameterize error message: file '%s' not found!" % parametername)
+       Example:
+          md = parameterize(md, 'Square.par')
+    """
 
-        #Try and run parameter file.
-        execfile(parametername)
+    #some checks
+    if not os.path.exists(parametername):
+        raise IOError("parameterize error message: file '%s' not found!" % parametername)
 
-        #Name and notes
-        if not md.miscellaneous.name:
-                md.miscellaneous.name=os.path.basename(parametername).split('.')[0]
+    #Try and run parameter file.
+    exec(compile(open(parametername).read(), parametername, 'exec'))
 
-        md.miscellaneous.notes="Model created by using parameter file: '%s' on: %s." % (parametername,datetime.datetime.strftime(datetime.datetime.now(),'%c'))
+    #Name and notes
+    if not md.miscellaneous.name:
+        md.miscellaneous.name = os.path.basename(parametername).split('.')[0]
 
-        return md
+    md.miscellaneous.notes = "Model created by using parameter file: '%s' on: %s." % (parametername, datetime.datetime.strftime(datetime.datetime.now(), '%c'))
 
+    return md