Changeset 16274

Timestamp:

09/30/13 16:44:13 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: python should also marshall ThermalIsdynamicbasalspc

Location:

issm/trunk-jpl/src/m/classes

Files:

• thermal.m (modified) (4 diffs)
• thermal.py (modified) (4 diffs)

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

@@ -13 +13 @@
                 penalty_factor    = 0;
                 isenthalpy        = 0;
-                isdynamicbasalspc = 0;
+                isdynamicbasalspc = 0;
         end
         methods
@@ -41 +41 @@
                         obj.isenthalpy=0;
 
-                        %will basal boundary conditions be set dynamically
-                        obj.isdynamicbasalspc=0;
+                        %will basal boundary conditions be set dynamically
+                        obj.isdynamicbasalspc=0;
                 end % }}}
                 function md = checkconsistency(obj,md,solution,analyses) % {{{
@@ -56 +56 @@
                                 md = checkfield(md,'thermal.spctemperature(find(md.thermal.spctemperature(1:md.mesh.numberofvertices,:)~=NaN))','<',md.materials.meltingpoint-md.materials.beta*md.materials.rho_ice*md.constants.g*replicate(pos),'message','spctemperature should be below the adjusted melting point');
                                 md = checkfield(md,'thermal.isenthalpy','numel',[1],'values',[0 1]);
-                                md = checkfield(md,'thermal.isdynamicbasalspc','numel',[1],'values',[0 1]);
+                                md = checkfield(md,'thermal.isdynamicbasalspc','numel',[1],'values',[0 1]);
                         end
                 end % }}}
@@ -69 +69 @@
                         fielddisplay(obj,'penalty_factor','scaling exponent (default is 3)');
                         fielddisplay(obj,'isenthalpy','use an enthalpy formulation to include temperate ice (default is 0)');
-                        fielddisplay(obj,'isdynamicbasalspc',['enable dynamic setting of basal forcing. required for enthalpy formulation (default is 0)']);
+                        fielddisplay(obj,'isdynamicbasalspc',['enable dynamic setting of basal forcing. required for enthalpy formulation (default is 0)']);
 
                 end % }}}

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

@@ -21 +21 @@
                 self.penalty_factor    = 0
                 self.isenthalpy        = 0
+                self.isdynamicbasalspc = 0;
 
                 #set defaults
@@ -34 +35 @@
                 string="%s\n%s"%(string,fielddisplay(self,'penalty_threshold','threshold to declare convergence of thermal solution (default is 0)'))
                 string="%s\n%s"%(string,fielddisplay(self,'isenthalpy','use an enthalpy formulation to include temperate ice (default is 0)'))
+                string="%s\n%s"%(string,fielddisplay(self,'isdynamicbasalspc','enable dynamic setting of basal forcing. required for enthalpy formulation (default is 0)'))
                 return string
                 #}}}
@@ -53 +55 @@
                 self.isenthalpy=0
 
+                #will basal boundary conditions be set dynamically
+                self.isdynamicbasalspc=0;
                 return self
+
         #}}}
         def checkconsistency(self,md,solution,analyses):    # {{{
@@ -68 +73 @@
                         md = checkfield(md,'thermal.spctemperature[numpy.nonzero(numpy.logical_not(numpy.isnan(md.thermal.spctemperature[0:md.mesh.numberofvertices,:])))]','<',md.materials.meltingpoint-md.materials.beta*md.materials.rho_ice*md.constants.g*replicate[pos],'message',"spctemperature should be below the adjusted melting point")
                         md = checkfield(md,'thermal.isenthalpy','numel',[1],'values',[0,1])
+                        md = checkfield(md,'thermal.isdynamicbasalspc','numel',[1],'values',[0,1]);
 
                 return md