Changeset 17480 for issm/trunk-jpl/src/m/classes/damage.py

Timestamp:

03/19/14 18:29:13 (11 years ago)

Author:

cborstad

Message:

CHG: cleaning up python imports. Use "m" prefix when using MatlabFuncs so that users can track down where these functions are defined rather than assuming they are mysterious python built-ins. Avoid importing * when possible, which cleans up the namespace and makes sure each module imports only what it needs (and that modules are not using functions imported by another module, which can break the code if modules are moved around)

File:

• issm/trunk-jpl/src/m/classes/damage.py (modified) (3 diffs)

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

@@ -2 +2 @@
 from EnumDefinitions import *
 from StringToEnum import StringToEnum
-from checkfield import *
-from WriteData import *
+from checkfield import checkfield
+from WriteData import WriteData
+import MatlabFuncs as m
 
 class damage(object):
@@ -109 +110 @@
         def defaultoutputs(self,md): # {{{
 
-                if strcmp(md.mesh.meshtype(),'3D'):
+                if m.strcmp(md.mesh.meshtype(),'3D'):
                         list = ['DamageD']
-                elif strcmp(md.mesh.meshtype(),'2Dhorizontal'):
+                elif m.strcmp(md.mesh.meshtype(),'2Dhorizontal'):
                         list = ['DamageD']
-                elif strcmp(md.mesh.meshtype(),'2Dvertical'):
+                elif m.strcmp(md.mesh.meshtype(),'2Dvertical'):
                         list = ['DamageD']
                 else:
@@ -143 +144 @@
                         md = checkfield(md,'fieldname','damage.equiv_stress','numel',[1],'values',[0,1])
                         md = checkfield(md,'fieldname','damage.requested_outputs','stringrow',1)
-                elif strcmpi(self.law,'undamaged'):
+                elif m.strcmpi(self.law,'undamaged'):
                         if (solution==DamageEvolutionSolutionEnum):
                                 raise RuntimeError('Invalid evolution law (md.damage.law) for a damage solution')