Changeset 14019

Timestamp:

11/27/12 15:26:14 (12 years ago)

Author:

jschierm

Message:

CHG: Changed md.transient boolean parameters to bool.

Location:

issm/trunk-jpl/src/m

Files:

• classes/transient.m (modified) (1 diff)
• classes/transient.py (modified) (3 diffs)
• parameterization/setflowequation.py (modified) (2 diffs)

issm/trunk-jpl/src/m/classes/transient.m

@@ -46 +46 @@
 
                         fielddisplay(obj,'isprognostic','indicates if a prognostic solution is used in the transient');
+                        fielddisplay(obj,'isdiagnostic','indicates if a diagnostic solution is used in the transient');
                         fielddisplay(obj,'isthermal','indicates if a thermal solution is used in the transient');
-                        fielddisplay(obj,'isdiagnostic','indicates if a diagnostic solution is used in the transient');
                         fielddisplay(obj,'isgroundingline','indicates if a groundingline migration is used in the transient');
                         fielddisplay(obj,'requested_outputs','list of additional outputs requested');

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

@@ -16 +16 @@
         def __init__(self):
                 # {{{ Properties
-                self.isprognostic      = 0
-                self.isdiagnostic      = 0
-                self.isthermal         = 0
-                self.isgroundingline   = 0
+                self.isprognostic      = False
+                self.isdiagnostic      = False
+                self.isthermal         = False
+                self.isgroundingline   = False
                 self.requested_outputs = float('NaN')
 
@@ -30 +30 @@
                 string='   transient solution parameters:'
                 string="%s\n%s"%(string,fielddisplay(self,'isprognostic','indicates if a prognostic solution is used in the transient'))
+                string="%s\n%s"%(string,fielddisplay(self,'isdiagnostic','indicates if a diagnostic solution is used in the transient'))
                 string="%s\n%s"%(string,fielddisplay(self,'isthermal','indicates if a thermal solution is used in the transient'))
-                string="%s\n%s"%(string,fielddisplay(self,'isdiagnostic','indicates if a diagnostic solution is used in the transient'))
                 string="%s\n%s"%(string,fielddisplay(self,'isgroundingline','indicates if a groundingline migration is used in the transient'))
                 string="%s\n%s"%(string,fielddisplay(self,'requested_outputs','list of additional outputs requested'))
@@ -41 +41 @@
                 
                 #full analysis: Diagnostic, Prognostic and Thermal but no groundingline migration for now
-                self.isprognostic=1
-                self.isdiagnostic=1
-                self.isthermal=1
-                self.isgroundingline=0
+                self.isprognostic=True
+                self.isdiagnostic=True
+                self.isthermal=True
+                self.isgroundingline=False
 
                 return self

issm/trunk-jpl/src/m/parameterization/setflowequation.py

@@ -94 +94 @@
                                               numpy.logical_not(numpy.isnan(md.diagnostic.spcvy)).astype(int)+ \
                                               numpy.logical_not(numpy.isnan(md.diagnostic.spcvz)).astype(int)==3, \
-                                              numpy.logical_and(nodeonpattyn,nodeonstokes).reshape(-1,1)).astype(int)    #find all the nodes on the boundary of the domain without icefront
+                                              numpy.logical_and(nodeonpattyn,nodeonstokes).reshape(-1,1))    #find all the nodes on the boundary of the domain without icefront
 #               fullspcelems=double(sum(fullspcnodes(md.mesh.elements),2)==6);         %find all the nodes on the boundary of the domain without icefront
                 fullspcelems=(numpy.sum(fullspcnodes[md.mesh.elements-1],axis=1)==6).astype(int)    #find all the nodes on the boundary of the domain without icefront
@@ -232 +232 @@
                         raise TypeError("type of coupling not supported yet")
 
-        #Create MacaAyealPattynApproximation where needed
+        #Create MacAyealPattynApproximation where needed
         md.flowequation.element_equation=numpy.zeros(md.mesh.numberofelements,int)
         md.flowequation.element_equation[numpy.nonzero(noneflag)]=0