Changeset 19024

Timestamp:

01/20/15 14:08:09 (10 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added stabilization to calving

Location:

issm/trunk-jpl/src

Files:

• m/classes/calving.m (modified) (4 diffs)
• m/classes/calving.py (modified) (5 diffs)
• m/classes/calvinglevermann.m (modified) (5 diffs)
• m/classes/calvinglevermann.py (modified) (5 diffs)
• m/classes/calvingpi.m (modified) (5 diffs)
• wrappers/M1qn3/M1qn3.cpp (modified) (3 diffs)

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

@@ -6 +6 @@
 classdef calving
         properties (SetAccess=public) 
-                 calvingrate            = NaN;
-                 meltingrate            = NaN;
-        end
-        methods (Static)
-                function obj = loadobj(obj) % {{{
-                        % This function is directly called by matlab when a model object is
-                        % loaded. If the input is a struct it is an old version of this class and
-                        % old fields must be recovered (make sure they are in the deprecated
-                        % model properties)
-
-                        if verLessThan('matlab','7.9'),
-                                disp('Warning: your matlab version is old and there is a risk that load does not work correctly');
-                                disp('         if the model is not loaded correctly, rename temporarily loadobj so that matlab does not use it');
-
-                                % This is a Matlab bug: all the fields of md have their default value
-                                % Example of error message:
-                                % Warning: Error loading an object of class 'model':
-                                % Undefined function or method 'exist' for input arguments of type 'cell'
-                                %
-                                % This has been fixed in MATLAB 7.9 (R2009b) and later versions
-                        end
-
-                        if isstruct(obj)
-                                disp('Recovering calving from older version');
-                                objstruct = obj;
-                                obj = structtoobj(calving(),objstruct);
-                        end
-                end% }}}
+                stabilization = 0;
+                calvingrate   = NaN;
+                meltingrate   = NaN;
         end
         methods
@@ -56 +31 @@
                 function obj = setdefaultparameters(obj) % {{{
 
+                        %stabilization = 2 by default
+                        obj.stabilization = 2;
+
                 end % }}}
                 function md = checkconsistency(obj,md,solution,analyses) % {{{
                         %Early return
                         if (solution~=TransientSolutionEnum() | md.transient.iscalving==0), return; end
+
+                        md = checkfield(md,'fieldname','calving.stabilization','values',[0 1 2]);
                         md = checkfield(md,'fieldname','calving.calvingrate(1:md.mesh.numberofvertices,:)','>=',0,'forcing',1,'NaN',1);
                         md = checkfield(md,'fieldname','calving.meltingrate(1:md.mesh.numberofvertices,:)','>=',0,'forcing',1,'NaN',1);
@@ -65 +45 @@
                 function disp(obj) % {{{
                         disp(sprintf('   Calving parameters:'));
+                        fielddisplay(obj,'stabilization','0: no, 1: artificial_diffusivity, 2: streamline upwinding');
                         fielddisplay(obj,'calvingrate','calving rate at given location [m/a]');
                         fielddisplay(obj,'meltingrate','melting rate at given location [m/a]');
@@ -71 +52 @@
                         yts=365.0*24.0*3600.0;
                         WriteData(fid,'enum',CalvingLawEnum(),'data',DefaultCalvingEnum(),'format','Integer');
+                        WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',obj.stabilization,'format','Integer');
                         WriteData(fid,'object',obj,'fieldname','calvingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts);
                         WriteData(fid,'object',obj,'fieldname','meltingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts);

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

@@ -14 +14 @@
 
         def __init__(self): # {{{
-                self.calvingrate            = float('NaN')
-                self.meltingrate            = float('NaN')
+
+                self.stabilization = 0
+                self.calvingrate   = float('NaN')
+                self.meltingrate   = float('NaN')
 
                 #set defaults
@@ -23 +25 @@
         def __repr__(self): # {{{
                 string='   Calving parameters:'
+                string="%s\n%s"%(string,fielddisplay(self,'stabilization','0: no, 1: artificial_diffusivity, 2: streamline upwinding'))
                 string="%s\n%s"%(string,fielddisplay(self,'calvingrate','calving rate at given location [m/a]'))
                 string="%s\n%s"%(string,fielddisplay(self,'meltingrate','melting rate at given location [m/a]'))
@@ -29 +32 @@
                 #}}}
         def setdefaultparameters(self): # {{{
+
+                #stabilization = 2 by default
+                self.stabilization = 2
 
                 return self
@@ -38 +44 @@
                         return md
 
+                md = checkfield(md,'fieldname','calving.stabilization','values',[0,1,2]);
                 md = checkfield(md,'fieldname','calving.calvingrate','>=',0,'forcing',1,'NaN',1);
                 md = checkfield(md,'fieldname','calving.meltingrate','>=',0,'forcing',1,'NaN',1);
@@ -48 +55 @@
 
                 WriteData(fid,'enum',CalvingLawEnum(),'data',DefaultCalvingEnum(),'format','Integer');
+                WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',self.stabilization,'format','Integer');
                 WriteData(fid,'object',self,'fieldname','calvingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts)
                 WriteData(fid,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts)

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

@@ -6 +6 @@
 classdef calvinglevermann
         properties (SetAccess=public) 
-                 coeff       = NaN;
-                 meltingrate = NaN;
+                stabilization = 0;
+                coeff         = NaN;
+                meltingrate   = NaN;
         end
         methods
@@ -29 +30 @@
                 end % }}}
                 function obj = setdefaultparameters(obj) % {{{
+
+                        %stabilization = 2 by default
+                        obj.stabilization = 2;
+
                         %Proportionality coefficient in Levermann model
                         obj.coeff=2e13;
@@ -35 +40 @@
                         %Early return
                         if (solution~=TransientSolutionEnum() | md.transient.iscalving==0), return; end
+
+                        md = checkfield(md,'fieldname','calving.stabilization','values',[0 1 2]);
                         md = checkfield(md,'fieldname','calving.coeff','>',0,'size',[md.mesh.numberofvertices 1]);
                         md = checkfield(md,'fieldname','calving.meltingrate','NaN',1,'size',[md.mesh.numberofvertices 1],'>=',0);
@@ -40 +47 @@
                 function disp(obj) % {{{
                         disp(sprintf('   Calving Levermann parameters:'));
+                        fielddisplay(obj,'stabilization','0: no, 1: artificial_diffusivity, 2: streamline upwinding');
                         fielddisplay(obj,'coeff','proportionality coefficient in Levermann model');
                         fielddisplay(obj,'meltingrate','melting rate at given location [m/a]');
@@ -47 +55 @@
                         yts=365.0*24.0*3600.0;
                         WriteData(fid,'enum',CalvingLawEnum(),'data',CalvingLevermannEnum(),'format','Integer');
+                        WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',obj.stabilization,'format','Integer');
                         WriteData(fid,'enum',CalvinglevermannCoeffEnum(),'data',obj.coeff,'format','DoubleMat','mattype',1);
                         WriteData(fid,'object',obj,'fieldname','meltingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts);

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

@@ -14 +14 @@
 
         def __init__(self): # {{{
-                self.coeff       = float('NaN')
-                self.meltingrate = float('NaN')
+                self.stabilization = 0
+                self.coeff         = float('NaN')
+                self.meltingrate   = float('NaN')
 
                 #set defaults
@@ -23 +24 @@
         def __repr__(self): # {{{
                 string='   Calving Levermann parameters:'
+                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'))
                 string="%s\n%s"%(string,fielddisplay(self,'meltingrate','melting rate at given location [m/a]'))
@@ -29 +31 @@
                 #}}}
         def setdefaultparameters(self): # {{{
+
+                #stabilization = 2 by default
+                self.stabilization = 2
 
                 #Proportionality coefficient in Levermann model
@@ -39 +44 @@
                         return md
 
+                md = checkfield(md,'fieldname','calving.stabilization','values',[0,1,2]);
                 md = checkfield(md,'fieldname','calving.coeff','size',[md.mesh.numberofvertices],'>',0)
                 md = checkfield(md,'fieldname','calving.meltingrate','NaN',1,'size',[md.mesh.numberofvertices],'>=',0)
@@ -46 +52 @@
                 yts=365.*24.*3600.
                 WriteData(fid,'enum',CalvingLawEnum(),'data',CalvingLevermannEnum(),'format','Integer');
+                WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',self.stabilization,'format','Integer');
                 WriteData(fid,'enum',CalvinglevermannCoeffEnum(),'data',self.coeff,'format','DoubleMat','mattype',1)
                 WriteData(fid,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts)

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

@@ -6 +6 @@
 classdef calvingpi
         properties (SetAccess=public) 
-                 coeff       = NaN;
-                 meltingrate = NaN;
+                stabilization = 0;
+                coeff         = NaN;
+                meltingrate   = NaN;
         end
         methods
@@ -29 +30 @@
                 end % }}}
                 function obj = setdefaultparameters(obj) % {{{
+
+                        %stabilization = 2 by default
+                        obj.stabilization = 2;
+
                         %Proportionality coefficient in Pi model
                         obj.coeff=2e13;
@@ -35 +40 @@
                         %Early return
                         if (solution~=TransientSolutionEnum() | md.transient.iscalving==0), return; end
+
+                        md = checkfield(md,'fieldname','calving.stabilization','values',[0 1 2]);
                         md = checkfield(md,'fieldname','calving.coeff','>',0,'size',[md.mesh.numberofvertices 1]);
                         md = checkfield(md,'fieldname','calving.meltingrate','NaN',1,'size',[md.mesh.numberofvertices 1],'>=',0);
@@ -40 +47 @@
                 function disp(obj) % {{{
                         disp(sprintf('   Calving Pi parameters:'));
+                        fielddisplay(obj,'stabilization','0: no, 1: artificial_diffusivity, 2: streamline upwinding');
                         fielddisplay(obj,'coeff','proportionality coefficient in Pi model');
                         fielddisplay(obj,'meltingrate','melting rate at given location [m/a]');
@@ -47 +55 @@
                         yts=365.0*24.0*3600.0;
                         WriteData(fid,'enum',CalvingLawEnum(),'data',CalvingPiEnum(),'format','Integer');
+                        WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',obj.stabilization,'format','Integer');
                         WriteData(fid,'enum',CalvingpiCoeffEnum(),'data',obj.coeff,'format','DoubleMat','mattype',1);
                         WriteData(fid,'object',obj,'fieldname','meltingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts);

issm/trunk-jpl/src/wrappers/M1qn3/M1qn3.cpp

@@ -5 +5 @@
 #include "./M1qn3.h"
 
-#ifndef _HAVE_M1QN3_
+#ifdef _HAVE_M1QN3_
 /*m1qn3 prototypes {{{*/
 extern "C" void *ctonbe_; // DIS mode : Conversion
@@ -38 +38 @@
 WRAPPER(M1qn3){
 
-#ifndef _HAVE_M1QN3_
+#ifdef _HAVE_M1QN3_
         /*input: */
         double* Xs=NULL;
@@ -161 +161 @@
 
 
-#ifndef _HAVE_M1QN3_
+#ifdef _HAVE_M1QN3_
 void fakesimul(long* indic,long* n,double* X,double* pf,double* G,long izs[1],float rzs[1],void* dzs){