Changeset 12889

Timestamp:

08/03/12 11:19:25 (13 years ago)

Author:

jschierm

Message:

Python fixes.

Location:

issm/trunk-jpl

Files:

• src/m/model/AnalysisConfiguration.py (added)
• src/m/model/MatlabFuncs.py (modified) (1 diff)
• src/m/model/ismodelselfconsistent.py (modified) (4 diffs)
• src/m/model/marshall.py (modified) (1 diff)
• src/m/model/process_solve_options.py (modified) (3 diffs)
• src/m/model/solve.py (modified) (1 diff)
• test/NightlyRun/test101.py (modified) (2 diffs)

issm/trunk-jpl/src/m/model/MatlabFuncs.py

@@ +1 @@
+def oshostname():
+        import socket
+
+        return socket.gethostname().lower().split('.')[0]
+
 def strcmp(s1,s2):
 

issm/trunk-jpl/src/m/model/ismodelselfconsistent.py

@@ +1 @@
+from AnalysisConfiguration import *
+
 def ismodelselfconsistent(md):
         """
@@ -8 +10 @@
 
         #initialize consistency as true
-        md.private.isconsistent=true
+        md.private.isconsistent=True
 
         #Get solution and associated analyses
@@ -15 +17 @@
 
         #Go through a model fields, check that it is a class, and call checkconsistency
-        fields=vars('model')
+#       fields=vars('model')
+        fields=dir(md)
         for field in fields:
 
@@ -24 +27 @@
                 #Check that current field is an object
                 if not hasattr(getattr(md,field),'checkconsistency'):
-                        md=checkmessage(md,"field '%s' is not an object." % field)
+                        md.checkmessage("field '%s' is not an object." % field)
 
                 #Check consistency of the object

issm/trunk-jpl/src/m/model/marshall.py

@@ -21 +21 @@
 
         #First, write MaximumNumberOfEnum to make sure that the Enums are synchronized
-        WriteData(fid,'enum',MaximumNumberOfEnums(),'data',true,'format','Boolean')
+        WriteData(fid,'enum',MaximumNumberOfEnums(),'data',True,'format','Boolean')
 
         #Go through all model fields: check that it is a class and call checkconsistency

issm/trunk-jpl/src/m/model/process_solve_options.py

@@ -1 +1 @@
 import os
+from EnumDefinitions import *
 
 def process_solve_options(options):
@@ -15 +16 @@
         #solution_type: check on this option, error out otherwise
         solution_type=options.getfieldvalue('solution_type')
-        if solution_type in (DiagnosticSolutionEnum,PrognosticSolutionEnum,ThermalSolutionEnum,\
+        if not solution_type in (DiagnosticSolutionEnum,PrognosticSolutionEnum,ThermalSolutionEnum,\
                         SteadystateSolutionEnum,TransientSolutionEnum,EnthalpySolutionEnum,\
                         BalancethicknessSolutionEnum,BedSlopeSolutionEnum,SurfaceSlopeSolutionEnum,HydrologySolutionEnum,FlaimSolutionEnum):
@@ -42 +43 @@
         outoptions['keep']=options.getfieldvalue('keep','y')
         outoptions['latsgn']=options.getfieldvalue('latsgn',0)
-        outoptions['cmap']=options.getfieldvalue('cmap',None)
+        outoptions['cmap']=options.getfieldvalue('cmap',[])
 
         return outoptions

issm/trunk-jpl/src/m/model/solve.py

@@ -2 +2 @@
 import os
 import shutil
+from pairoptions import *
+from process_solve_options import *
+from EnumDefinitions import *
+from ismodelselfconsistent import *
 
 def solve(md,solutionenum,*args):

issm/trunk-jpl/test/NightlyRun/test101.py

@@ -3 +3 @@
 from setmask import *
 from parameterize import *
+from setflowequation import *
+from EnumDefinitions import *
+from solve import *
+from MatlabFuncs import *
 
 md=model()
@@ -8 +12 @@
 md=setmask(md,'all','')
 md=parameterize(md,'../Par/SquareShelfConstrained.py')
+md=setflowequation(md,'macayeal','all')
+md.cluster=generic('name',oshostname(),'np',3)
+md.diagnostic.requested_outputs=StressTensorEnum
+md=solve(md,DiagnosticSolutionEnum)
 
 #Fields and tolerances to track changes