Changeset 15396 for issm/trunk/src/m/classes/thermal.py

Timestamp:

07/02/13 09:24:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 15394

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/m/classes/thermal.py (modified) (7 diffs)

issm/trunk

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

issm/trunk/src/m/classes/thermal.py

@@ -1 @@
-#module imports
 import numpy
 from fielddisplay import fielddisplay
@@ -14 +13 @@
         """
 
-        #properties
-        def __init__(self):
-                # {{{ Properties
+        def __init__(self): # {{{
                 self.spctemperature    = float('NaN')
                 self.penalty_threshold = 0
@@ -29 +26 @@
 
                 #}}}
-        def __repr__(self):
-                # {{{ Display
+        def __repr__(self): # {{{
                 string='   Thermal solution parameters:'
-                string="%s\n%s"%(string,fielddisplay(self,'spctemperature','temperature constraints (NaN means no constraint)'))
-                string="%s\n%s"%(string,fielddisplay(self,'stabilization','0->no, 1->artificial_diffusivity, 2->SUPG'))
+                string="%s\n%s"%(string,fielddisplay(self,'spctemperature','temperature constraints (NaN means no constraint) [K]'))
+                string="%s\n%s"%(string,fielddisplay(self,'stabilization','0: no, 1: artificial_diffusivity, 2: SUPG'))
                 string="%s\n%s"%(string,fielddisplay(self,'maxiter','maximum number of non linear iterations'))
                 string="%s\n%s"%(string,fielddisplay(self,'penalty_lock','stabilize unstable thermal constraints that keep zigzagging after n iteration (default is 0, no stabilization)'))
@@ -40 +36 @@
                 return string
                 #}}}
-                
-        def setdefaultparameters(self):
-                # {{{setdefaultparameters
+        def setdefaultparameters(self): # {{{
                 
                 #Number of unstable constraints acceptable
@@ -61 +55 @@
                 return self
         #}}}
-
         def checkconsistency(self,md,solution,analyses):    # {{{
 
@@ -78 +71 @@
                 return md
         # }}}
-
-        def marshall(self,fid):    # {{{
-                WriteData(fid,'object',self,'fieldname','spctemperature','format','DoubleMat','mattype',1)
+        def marshall(self,md,fid):    # {{{
+                WriteData(fid,'object',self,'fieldname','spctemperature','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1)
                 WriteData(fid,'object',self,'fieldname','penalty_threshold','format','Integer')
                 WriteData(fid,'object',self,'fieldname','stabilization','format','Integer')
@@ -88 +80 @@
                 WriteData(fid,'object',self,'fieldname','isenthalpy','format','Boolean')
         # }}}
-

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache