Changeset 15878 for issm/trunk-jpl/src/m/classes/masstransport.py

Timestamp:

08/22/13 11:44:11 (12 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added free surface solver for bottom and upper surface, not working yet

File:

• issm/trunk-jpl/src/m/classes/masstransport.py (modified) (4 diffs)

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

@@ -15 +15 @@
         def __init__(self): # {{{
                 self.spcthickness           = float('NaN')
+                self.isfreesurface          = 0
                 self.min_thickness          = 0
                 self.hydrostatic_adjustment = 0
@@ -29 +30 @@
                 string='   Masstransport solution parameters:'
                 string="%s\n%s"%(string,fielddisplay(self,'spcthickness','thickness constraints (NaN means no constraint) [m]'))
+                string="%s\n%s"%(string,fielddisplay(self,'isfreesurface','do we use free surfaces (FS only) are mass conservation'))
                 string="%s\n%s"%(string,fielddisplay(self,'min_thickness','minimum ice thickness allowed [m]'))
                 string="%s\n%s"%(string,fielddisplay(self,'hydrostatic_adjustment','adjustment of ice shelves surface and bed elevations: ''Incremental'' or ''Absolute'' '))
@@ -59 +61 @@
 
                 md = checkfield(md,'masstransport.spcthickness','forcing',1)
+                md = checkfield(md,'masstransport.isfreesurface','values',[0 1])
                 md = checkfield(md,'masstransport.hydrostatic_adjustment','values',['Absolute','Incremental'])
                 md = checkfield(md,'masstransport.stabilization','values',[0,1,2,3])
@@ -69 +72 @@
         def marshall(self,md,fid):    # {{{
                 WriteData(fid,'object',self,'fieldname','spcthickness','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1)
+                WriteData(fid,'object',self,'fieldname','isfreesurface','format','Boolean')
                 WriteData(fid,'object',self,'fieldname','min_thickness','format','Double')
                 WriteData(fid,'data',StringToEnum(self.hydrostatic_adjustment)[0],'format','Integer','enum',MasstransportHydrostaticAdjustmentEnum())