Changeset 13101 for issm/branches/trunk-jpl-damage/src/m/classes/steadystate.py

Timestamp:

08/20/12 17:39:30 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl through revision 13099 into branch

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (2 props)
• src/m/classes/steadystate.py (modified) (2 diffs)

issm/branches/trunk-jpl-damage

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

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

@@ -1 +1 @@
 #module imports
+import numpy
 from fielddisplay import fielddisplay
+from EnumDefinitions import *
+from checkfield import *
+from WriteData import *
 
-class steadystate:
+class steadystate(object):
+        """
+        STEADYSTATE class definition
+
+           Usage:
+              steadystate=steadystate();
+        """
+
         #properties
         def __init__(self):
@@ -14 +25 @@
 
                 #}}}
-        def __repr__(obj):
+        def __repr__(self):
                 # {{{ Display
                 string='   steadystate solution parameters:'
-                string="%s\n%s"%(string,fielddisplay(obj,'reltol','relative tolerance criterion'))
-                string="%s\n%s"%(string,fielddisplay(obj,'maxiter','maximum number of iterations'))
-                string="%s\n%s"%(string,fielddisplay(obj,'requested_outputs','additional requested outputs'))
+                string="%s\n%s"%(string,fielddisplay(self,'reltol','relative tolerance criterion'))
+                string="%s\n%s"%(string,fielddisplay(self,'maxiter','maximum number of iterations'))
+                string="%s\n%s"%(string,fielddisplay(self,'requested_outputs','additional requested outputs'))
                 return string
                 #}}}
                 
-        def setdefaultparameters(obj):
+        def setdefaultparameters(self):
                 # {{{setdefaultparameters
                 
                 #maximum of steady state iterations
-                obj.maxiter=100
+                self.maxiter=100
 
                 #Relative tolerance for the steadystate convertgence
-                obj.reltol=0.01
+                self.reltol=0.01
 
-                return obj
+                return self
         #}}}
 
+        def checkconsistency(self,md,solution,analyses):    # {{{
+
+                #Early return
+                if not solution==SteadystateSolutionEnum():
+                        return md
+
+                if not md.timestepping.time_step==0:
+                        md.checkmessage("for a steadystate computation, timestepping.time_step must be zero.")
+
+                if numpy.isnan(md.diagnostic.reltol):
+                        md.checkmessage("for a steadystate computation, diagnostic.reltol (relative convergence criterion) must be defined!")
+
+                return md
+        # }}}
+
+        def marshall(self,fid):    # {{{
+                WriteData(fid,'object',self,'fieldname','reltol','format','Double')
+                WriteData(fid,'object',self,'fieldname','maxiter','format','Integer')
+                WriteData(fid,'object',self,'fieldname','requested_outputs','format','DoubleMat','mattype',3)
+        # }}}
+

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4