Changeset 19167 for issm/trunk-jpl/src/m/classes/calvinglevermann.py

Timestamp:

02/27/15 08:31:27 (10 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixed calvinglevermann with spc levelset

File:

• issm/trunk-jpl/src/m/classes/calvinglevermann.py (modified) (5 diffs)

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

@@ -14 +14 @@
 
         def __init__(self): # {{{
+
                 self.stabilization = 0
+                self.spclevelset   = float('NaN')
                 self.coeff         = float('NaN')
                 self.meltingrate   = float('NaN')
@@ -24 +26 @@
         def __repr__(self): # {{{
                 string='   Calving Levermann parameters:'
+                string="%s\n%s"%(string,fielddisplay(self,'spclevelset','levelset constraints (NaN means no constraint)'))
                 string="%s\n%s"%(string,fielddisplay(self,'stabilization','0: no, 1: artificial_diffusivity, 2: streamline upwinding'))
                 string="%s\n%s"%(string,fielddisplay(self,'coeff','proportionality coefficient in Levermann model'))
@@ -31 +34 @@
                 #}}}
         def extrude(self,md): # {{{
+                self.spclevelset=project3d(md,'vector',self.spclevelset,'type','node')
                 self.coeff=project3d(md,'vector',self.coeff,'type','node')
                 self.meltingrate=project3d(md,'vector',self.meltingrate,'type','node')
@@ -49 +53 @@
                         return md
 
+                md = checkfield(md,'fieldname','calving.spclevelset','timeseries',1)
                 md = checkfield(md,'fieldname','calving.stabilization','values',[0,1,2]);
                 md = checkfield(md,'fieldname','calving.coeff','size',[md.mesh.numberofvertices],'>',0)
@@ -58 +63 @@
                 WriteData(fid,'enum',CalvingLawEnum(),'data',CalvingLevermannEnum(),'format','Integer');
                 WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',self.stabilization,'format','Integer');
+                WriteData(fid,'enum',SpcLevelsetEnum(),'data',self.spclevelset,'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
                 WriteData(fid,'enum',CalvinglevermannCoeffEnum(),'data',self.coeff,'format','DoubleMat','mattype',1)
                 WriteData(fid,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts)