Changeset 18346

Timestamp:

08/08/14 09:18:05 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added FCT correction

Location:

issm/trunk-jpl/src/m/classes

Files:

• masstransport.m (modified) (2 diffs)
• masstransport.py (modified) (2 diffs)

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

@@ -127 +127 @@
                         md = checkfield(md,'fieldname','masstransport.isfreesurface','values',[0 1]);
                         md = checkfield(md,'fieldname','masstransport.hydrostatic_adjustment','values',{'Absolute' 'Incremental'});
-                        md = checkfield(md,'fieldname','masstransport.stabilization','values',[0 1 2 3]);
+                        md = checkfield(md,'fieldname','masstransport.stabilization','values',[0 1 2 3 4]);
                         md = checkfield(md,'fieldname','masstransport.min_thickness','>',0);
                         md = checkfield(md,'fieldname','masstransport.requested_outputs','stringrow',1);
@@ -139 +139 @@
                         fielddisplay(obj,'min_thickness','minimum ice thickness allowed [m]');
                         fielddisplay(obj,'hydrostatic_adjustment','adjustment of ice shelves surface and bed elevations: ''Incremental'' or ''Absolute'' ');
-                        fielddisplay(obj,'stabilization','0: no, 1: artificial_diffusivity, 2: streamline upwinding, 3: discontinuous Galerkin');
+                        fielddisplay(obj,'stabilization','0: no, 1: artificial_diffusivity, 2: streamline upwinding, 3: discontinuous Galerkin, 4: Flux Correction Transport');
 
                         disp(sprintf('\n      %s','Penalty options:'));

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

@@ -35 +35 @@
                 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'' '))
-                string="%s\n%s"%(string,fielddisplay(self,'stabilization','0: no, 1: artificial_diffusivity, 2: streamline upwinding, 3: discontinuous Galerkin'))
+                string="%s\n%s"%(string,fielddisplay(self,'stabilization','0: no, 1: artificial_diffusivity, 2: streamline upwinding, 3: discontinuous Galerkin, 4: Flux Correction Transport'))
                 string="%s\n%s"%(string,fielddisplay(self,'requested_outputs','additional outputs requested'))
 
@@ -74 +74 @@
                 md = checkfield(md,'fieldname','masstransport.isfreesurface','values',[0,1])
                 md = checkfield(md,'fieldname','masstransport.hydrostatic_adjustment','values',['Absolute','Incremental'])
-                md = checkfield(md,'fieldname','masstransport.stabilization','values',[0,1,2,3])
+                md = checkfield(md,'fieldname','masstransport.stabilization','values',[0,1,2,3,4])
                 md = checkfield(md,'fieldname','masstransport.min_thickness','>',0)
                 md = checkfield(md,'fieldname','masstransport.requested_outputs','stringrow',1)