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

Timestamp:

11/07/14 15:38:27 (10 years ago)

Author:

srebuffi

Message:

CHG: added calving class

File:

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

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

@@ -7 +7 @@
         properties (SetAccess=public) 
                  spcthickness           = NaN;
-                 iscalvingrate          = 0;
-                 calvingrate            = NaN;
-                 levermann_calving_coeff= 0;
                  isfreesurface          = 0;
                  min_thickness          = 0;
@@ -45 +42 @@
         end
         methods
-         function createxml(obj,fid) % {{{
-            fprintf(fid, '<!-- masstransport -->\n');            
-                    
-            % Masstransport solution parameters
-            fprintf(fid,'%s\n%s\n%s\n','<frame key="1" label="Masstransport solution parameters">','<section name="masstransport" />');                    
-            fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','  <parameter key ="spcthickness" type="',class(obj.spcthickness),'" default="',convert2str(obj.spcthickness),'">','     <section name="masstransport" />','     <help> thickness constraints (NaN means no constraint) [m] </help>','  </parameter>');
-                                fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','  <parameter key ="iscalvingrate" type="',class(obj.iscalvingrate),'" default="',convert2str(obj.iscalvingrate),'">','     <section name="masstransport" />','     <help> do we use calving (loss of ice) </help>','  </parameter>');
-            fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','  <parameter key ="calvingrate" type="',class(obj.calvingrate),'" default="',convert2str(obj.calvingrate),'">','     <section name="masstransport" />','     <help> calving rate at given location [m/a] </help>','  </parameter>');
-                                fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','  <parameter key ="levermann_calving_coeff" type="',class(obj.levermann_calving_coeff),'" default="',convert2str(obj.levermann_calving_coeff),'">','     <section name="masstransport" />','     <help> Proportionality coefficient in Levermann model  </help>','  </parameter>');
-            fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','  <parameter key ="isfreesurface" type="',class(obj.isfreesurface),'" default="',convert2str(obj.isfreesurface),'">','     <section name="masstransport" />','     <help> do we use free surfaces (FS only) are mass conservation </help>','  </parameter>');
-            fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','  <parameter key ="min_thickness" type="',class(obj.min_thickness),'" default="',convert2str(obj.min_thickness),'">','     <section name="masstransport" />','     <help> minimum ice thickness allowed [m] </help>','  </parameter>');
-            
-            % hydrostatic_adjustment drop-down (incremental or absolute )
-            fprintf(fid,'%s\n%s\n%s\n%s\n','  <parameter key ="hydrostatic_adjustment" type="alternative" optional ="false">','     <section name="masstransport" />','     <help> adjustment of ice shelves surface and bed elevations: ''Incremental'' or ''Absolute''  </help>');
-            fprintf(fid,'%s\n','       <option value="Incremental" type="string" default="true"> </option>');
-            fprintf(fid,'%s\n%s\n','       <option value="Absolute" type="string" default="false"> </option>','</parameter>');
-            
-            %stabilization drop-down (0, 1, 2, or 3)
-            fprintf(fid,'%s\n%s\n%s\n%s\n','  <parameter key ="stabilization" type="alternative" optional="false">','     <section name="masstransport" />','     <help> 0: no, 1:  artificial_diffusivity, 2: streamline upwinding, 3: discontinuous Galerkin </help>');
-            fprintf(fid,'%s\n','       <option value="0" type="string" default="true"> </option>');
-            fprintf(fid,'%s\n','       <option value="1" type="string" default="false"> </option>');
-            fprintf(fid,'%s\n','       <option value="2" type="string" default="false"> </option>');
-            fprintf(fid,'%s\n%s\n','       <option value="3" type="string" default="false"> </option>','</parameter>');
-
-            fprintf(fid,'%s\n%s\n','</frame>');    
-            
-            %Penalty options
-            fprintf(fid,'%s\n%s\n%s\n','<frame key="2" label="Penalty options">','<section name="masstransport" />'); 
-            fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','  <parameter key ="vertex_pairing" type="',class(obj.vertex_pairing),'" default="',convert2str(obj.vertex_pairing),'">','     <section name="masstransport" />','     <help> offset used by penalties: penalty = Kmax*10^offset </help>','  </parameter>');
-            fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','  <parameter key ="penalty_factor" type="',class(obj.penalty_factor),'" default="',convert2str(obj.penalty_factor),'">','     <section name="masstransport" />','     <help> pairs of vertices that are penalized </help>','  </parameter>');
-            fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','  <parameter key ="requested_outputs" type="',class(obj.requested_outputs),'" default="',convert2str(obj.requested_outputs),'">','     <section name="masstransport" />','     <help> additional outputs requested </help>','  </parameter>');
-            fprintf(fid,'%s\n%s\n','</frame>');
-        
-        end % }}}
                 function obj = masstransport(varargin) % {{{
                         switch nargin
@@ -104 +67 @@
                 function obj = setdefaultparameters(obj) % {{{
 
-                        %Proportionality coefficient in Levermann model
-                        obj.levermann_calving_coeff=8e21;
-                        
                         %Type of stabilization to use 0:nothing 1:artificial_diffusivity 3:Discontinuous Galerkin
                         obj.stabilization=1;
@@ -128 +88 @@
 
                         md = checkfield(md,'fieldname','masstransport.spcthickness','forcing',1);
-                        if(ismember(LevelsetAnalysisEnum(), analyses) & md.transient.islevelset)
-                                md = checkfield(md,'fieldname','masstransport.iscalvingrate','values',[0 1]);
-                                md = checkfield(md,'fieldname','masstransport.calvingrate','NaN',1,'size',[md.mesh.numberofvertices 1],'>=',0);
-                                md = checkfield(md,'fieldname','masstransport.levermann_calving_coeff','>',0);
-                        end
-
                         md = checkfield(md,'fieldname','masstransport.isfreesurface','values',[0 1]);
                         md = checkfield(md,'fieldname','masstransport.hydrostatic_adjustment','values',{'Absolute' 'Incremental'});
@@ -144 +98 @@
                         disp(sprintf('   Masstransport solution parameters:'));
                         fielddisplay(obj,'spcthickness','thickness constraints (NaN means no constraint) [m]');
-                        fielddisplay(obj,'iscalvingrate','do we use calving (loss of ice)');
-                        fielddisplay(obj,'calvingrate','calving rate at given location [m/a]');
-                        fielddisplay(obj,'levermann_calving_coeff','proportionality coefficient in Levermann model');
                         fielddisplay(obj,'isfreesurface','do we use free surfaces (FS only) are mass conservation');
                         fielddisplay(obj,'min_thickness','minimum ice thickness allowed [m]');
@@ -163 +114 @@
 
                         WriteData(fid,'object',obj,'fieldname','spcthickness','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);
-                        WriteData(fid,'object',obj,'fieldname','calvingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts);
-                        WriteData(fid,'object',obj,'fieldname','iscalvingrate','format','Boolean');
                         WriteData(fid,'object',obj,'fieldname','isfreesurface','format','Boolean');
-                        WriteData(fid,'object',obj,'fieldname','levermann_calving_coeff','format','Double');
                         WriteData(fid,'object',obj,'fieldname','min_thickness','format','Double');
                         WriteData(fid,'data',StringToEnum(obj.hydrostatic_adjustment),'format','Integer','enum',MasstransportHydrostaticAdjustmentEnum());