Index: /issm/trunk-jpl/src/m/classes/calving.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/calving.m (revision 18757)
+++ /issm/trunk-jpl/src/m/classes/calving.m (revision 18757)
@@ -0,0 +1,73 @@
+%CALVING class definition
+%
+% Usage:
+% calving=calving();
+
+classdef calving
+ properties (SetAccess=public)
+ calvingrate = 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% }}}
+ end
+ methods
+ function obj = calving(varargin) % {{{
+ switch nargin
+ case 0
+ obj=setdefaultparameters(obj);
+ case 1
+ inputstruct=varargin{1};
+ list1 = properties('calving');
+ list2 = fieldnames(inputstruct);
+ for i=1:length(list1)
+ fieldname = list1{i};
+ if ismember(fieldname,list2),
+ obj.(fieldname) = inputstruct.(fieldname);
+ end
+ end
+ otherwise
+ error('constructor not supported');
+ end
+ end % }}}
+ function obj = setdefaultparameters(obj) % {{{
+
+ end % }}}
+ function md = checkconsistency(obj,md,solution,analyses) % {{{
+ %Early return
+ if (solution~=TransientSolutionEnum() | md.transient.iscalving==0), return; end
+ md = checkfield(md,'fieldname','calving.calvingrate','NaN',1,'size',[md.mesh.numberofvertices 1],'>=',0);
+ end % }}}
+ function disp(obj) % {{{
+ disp(sprintf(' Calving parameters:'));
+ fielddisplay(obj,'calvingrate','calving rate at given location [m/a]');
+ end % }}}
+ function marshall(obj,md,fid) % {{{
+ yts=365.0*24.0*3600.0;
+ WriteData(fid,'enum',CalvingLawEnum(),'data',DefaultCalvingEnum(),'format','Integer');
+ WriteData(fid,'object',obj,'fieldname','calvingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts);
+ end % }}}
+ end
+end
Index: /issm/trunk-jpl/src/m/classes/calving.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/calving.py (revision 18757)
+++ /issm/trunk-jpl/src/m/classes/calving.py (revision 18757)
@@ -0,0 +1,52 @@
+from fielddisplay import fielddisplay
+from EnumDefinitions import *
+from StringToEnum import StringToEnum
+from checkfield import checkfield
+from WriteData import WriteData
+
+class calving(object):
+ """
+ CALVING class definition
+
+ Usage:
+ calving=calving();
+ """
+
+ def __init__(self): # {{{
+ self.calvingrate = float('NaN')
+
+ #set defaults
+ self.setdefaultparameters()
+
+ #}}}
+ def __repr__(self): # {{{
+ string=' Calving parameters:'
+ string="%s\n%s"%(string,fielddisplay(self,'calvingrate','calving rate at given location [m/a]'))
+
+ return string
+ #}}}
+ def defaultoutputs(self,md): # {{{
+
+ return []
+
+ #}}}
+ def setdefaultparameters(self): # {{{
+
+ return self
+ #}}}
+ def checkconsistency(self,md,solution,analyses): # {{{
+
+ #Early return
+ if (solution!=TransientSolutionEnum()) or (not md.transient.iscalving):
+ return md
+
+ md = checkfield(md,'fieldname','calving.calvingrate','NaN',1,'size',[md.mesh.numberofvertices],'>=',0)
+ return md
+ # }}}
+ def marshall(self,md,fid): # {{{
+
+ yts=365.*24.*3600.
+
+ WriteData(fid,'enum',CalvingLawEnum(),'data',DefaultCalvingEnum(),'format','Integer');
+ WriteData(fid,'object',self,'fieldname','calvingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts)
+ # }}}
Index: /issm/trunk-jpl/src/m/classes/calvinglevermann.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/calvinglevermann.m (revision 18757)
+++ /issm/trunk-jpl/src/m/classes/calvinglevermann.m (revision 18757)
@@ -0,0 +1,48 @@
+%CALVINGLEVERMANN class definition
+%
+% Usage:
+% calvinglevermann=calvinglevermann();
+
+classdef calvinglevermann
+ properties (SetAccess=public)
+ coeff = 0;
+ end
+ methods
+ function obj = calvinglevermann(varargin) % {{{
+ switch nargin
+ case 0
+ obj=setdefaultparameters(obj);
+ case 1
+ inputstruct=varargin{1};
+ list1 = properties('calvinglevermann');
+ list2 = fieldnames(inputstruct);
+ for i=1:length(list1)
+ fieldname = list1{i};
+ if ismember(fieldname,list2),
+ obj.(fieldname) = inputstruct.(fieldname);
+ end
+ end
+ otherwise
+ error('constructor not supported');
+ end
+ end % }}}
+ function obj = setdefaultparameters(obj) % {{{
+ %Proportionality coefficient in Levermann model
+ obj.coeff=2e13;
+ end % }}}
+ function md = checkconsistency(obj,md,solution,analyses) % {{{
+ %Early return
+ if (solution~=TransientSolutionEnum() | md.transient.iscalving==0), return; end
+ md = checkfield(md,'fieldname','calving.coeff','>',0,'size',[md.mesh.numberofvertices 1]);
+ end % }}}
+ function disp(obj) % {{{
+ disp(sprintf(' Calving parameters:'));
+ fielddisplay(obj,'coeff','proportionality coefficient in Levermann model');
+
+ end % }}}
+ function marshall(obj,md,fid) % {{{
+ WriteData(fid,'enum',CalvingLawEnum(),'data',CalvingLevermannEnum(),'format','Integer');
+ WriteData(fid,'enum',CalvinglevermannCoeffEnum(),'data',obj.coeff,'format','DoubleMat','mattype',1);
+ end % }}}
+ end
+end
Index: /issm/trunk-jpl/src/m/classes/masstransport.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/masstransport.m (revision 18756)
+++ /issm/trunk-jpl/src/m/classes/masstransport.m (revision 18757)
@@ -7,7 +7,4 @@
properties (SetAccess=public)
spcthickness = NaN;
- iscalvingrate = 0;
- calvingrate = NaN;
- levermann_calving_coeff= 0;
isfreesurface = 0;
min_thickness = 0;
@@ -45,38 +42,4 @@
end
methods
- function createxml(obj,fid) % {{{
- fprintf(fid, '\n');
-
- % Masstransport solution parameters
- fprintf(fid,'%s\n%s\n%s\n','','');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' thickness constraints (NaN means no constraint) [m] ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' do we use calving (loss of ice) ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' calving rate at given location [m/a] ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' Proportionality coefficient in Levermann model ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' do we use free surfaces (FS only) are mass conservation ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' minimum ice thickness allowed [m] ',' ');
-
- % hydrostatic_adjustment drop-down (incremental or absolute )
- fprintf(fid,'%s\n%s\n%s\n%s\n',' ',' ',' adjustment of ice shelves surface and bed elevations: ''Incremental'' or ''Absolute'' ');
- fprintf(fid,'%s\n',' ');
- fprintf(fid,'%s\n%s\n',' ','');
-
- %stabilization drop-down (0, 1, 2, or 3)
- fprintf(fid,'%s\n%s\n%s\n%s\n',' ',' ',' 0: no, 1: artificial_diffusivity, 2: streamline upwinding, 3: discontinuous Galerkin ');
- fprintf(fid,'%s\n',' ');
- fprintf(fid,'%s\n',' ');
- fprintf(fid,'%s\n',' ');
- fprintf(fid,'%s\n%s\n',' ','');
-
- fprintf(fid,'%s\n%s\n','');
-
- %Penalty options
- fprintf(fid,'%s\n%s\n%s\n','','');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' offset used by penalties: penalty = Kmax*10^offset ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' pairs of vertices that are penalized ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' additional outputs requested ',' ');
- fprintf(fid,'%s\n%s\n','');
-
- end % }}}
function obj = masstransport(varargin) % {{{
switch nargin
@@ -104,7 +67,4 @@
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,10 +88,4 @@
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,7 +98,4 @@
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,8 +114,5 @@
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());
Index: /issm/trunk-jpl/src/m/classes/model.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/model.m (revision 18756)
+++ /issm/trunk-jpl/src/m/classes/model.m (revision 18757)
@@ -37,4 +37,5 @@
steadystate = 0;
transient = 0;
+ calving = 0;
gia = 0;
@@ -796,9 +797,12 @@
end
md.masstransport.spcthickness=project3d(md,'vector',md.masstransport.spcthickness,'type','node');
- md.masstransport.calvingrate=project3d(md,'vector',md.masstransport.calvingrate,'type','node');
md.balancethickness.spcthickness=project3d(md,'vector',md.balancethickness.spcthickness,'type','node');
md.damage.spcdamage=project3d(md,'vector',md.damage.spcdamage,'type','node');
md.stressbalance.referential=project3d(md,'vector',md.stressbalance.referential,'type','node');
md.stressbalance.loadingforce=project3d(md,'vector',md.stressbalance.loadingforce,'type','node');
+
+ % Calving variables
+ if isa(md.calving,'calving'),md.calving.calvingrate=project3d(md,'vector',md.calving.calvingrate,'type','node');end;
+ if isa(md.calving,'calvinglevermann'),md.calving.coeff=project3d(md,'vector',md.calving.coeff,'type','node');end;
% Hydrologydc variables
@@ -1160,4 +1164,5 @@
md.steadystate = steadystate();
md.transient = transient();
+ md.calving = calving();
md.gia = gia();
md.seaice = seaice();
@@ -1320,15 +1325,16 @@
disp(sprintf('%19s: %-22s -- %s','verbose' ,['[1x1 ' class(obj.verbose) ']'],'verbosity level in solve'));
disp(sprintf('%19s: %-22s -- %s','settings' ,['[1x1 ' class(obj.settings) ']'],'settings properties'));
- disp(sprintf('%19s: %-22s -- %s','toolkits' ,['[1x1 ' class(obj.toolkits) ']'],'PETSc options for each solution'));
+ disp(sprintf('%19s: %-22s -- %s','toolkits' ,['[1x1 ' class(obj.toolkits) ']'],'PETSc options for each solution'));
disp(sprintf('%19s: %-22s -- %s','cluster' ,['[1x1 ' class(obj.cluster) ']'],'cluster parameters (number of cpus...)'));
disp(sprintf('%19s: %-22s -- %s','balancethickness',['[1x1 ' class(obj.balancethickness) ']'],'parameters for balancethickness solution'));
- disp(sprintf('%19s: %-22s -- %s','stressbalance' ,['[1x1 ' class(obj.stressbalance) ']'],'parameters for stressbalance solution'));
+ disp(sprintf('%19s: %-22s -- %s','stressbalance' ,['[1x1 ' class(obj.stressbalance) ']'],'parameters for stressbalance solution'));
disp(sprintf('%19s: %-22s -- %s','groundingline' ,['[1x1 ' class(obj.groundingline) ']'],'parameters for groundingline solution'));
disp(sprintf('%19s: %-22s -- %s','hydrology' ,['[1x1 ' class(obj.hydrology) ']'],'parameters for hydrology solution'));
- disp(sprintf('%19s: %-22s -- %s','masstransport' ,['[1x1 ' class(obj.masstransport) ']'],'parameters for masstransport solution'));
+ disp(sprintf('%19s: %-22s -- %s','masstransport' ,['[1x1 ' class(obj.masstransport) ']'],'parameters for masstransport solution'));
disp(sprintf('%19s: %-22s -- %s','thermal' ,['[1x1 ' class(obj.thermal) ']'],'parameters for thermal solution'));
disp(sprintf('%19s: %-22s -- %s','steadystate' ,['[1x1 ' class(obj.steadystate) ']'],'parameters for steadystate solution'));
disp(sprintf('%19s: %-22s -- %s','transient' ,['[1x1 ' class(obj.transient) ']'],'parameters for transient solution'));
- disp(sprintf('%19s: %-22s -- %s','gia' ,['[1x1 ' class(obj.gia) ']'],'parameters for gia solution'));
+ disp(sprintf('%19s: %-22s -- %s','calving' ,['[1x1 ' class(obj.calving) ']'],'parameters for calving'));
+ disp(sprintf('%19s: %-22s -- %s','gia' ,['[1x1 ' class(obj.gia) ']'],'parameters for gia solution'));
disp(sprintf('%19s: %-22s -- %s','autodiff' ,['[1x1 ' class(obj.autodiff) ']'],'automatic differentiation parameters'));
disp(sprintf('%19s: %-22s -- %s','flaim' ,['[1x1 ' class(obj.flaim) ']'],'flaim parameters'));
Index: /issm/trunk-jpl/src/m/classes/model.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/model.py (revision 18756)
+++ /issm/trunk-jpl/src/m/classes/model.py (revision 18757)
@@ -15,4 +15,5 @@
from basalforcings import basalforcings
from matice import matice
+from calving import calving
from damage import damage
from friction import friction
@@ -88,4 +89,5 @@
self.steadystate = steadystate()
self.transient = transient()
+ self.calving = calving()
self.gia = gia()
@@ -129,4 +131,5 @@
'steadystate',\
'transient',\
+ 'calving',\
'gia',\
'autodiff',\
@@ -168,4 +171,5 @@
string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("steadystate","[%s,%s]" % ("1x1",obj.steadystate.__class__.__name__),"parameters for steadystate solution"))
string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("transient","[%s,%s]" % ("1x1",obj.transient.__class__.__name__),"parameters for transient solution"))
+ string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("calving","[%s,%s]" % ("1x1",obj.calving.__class__.__name__),"parameters for calving"))
string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("autodiff","[%s,%s]" % ("1x1",obj.autodiff.__class__.__name__),"automatic differentiation parameters"))
string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("flaim","[%s,%s]" % ("1x1",obj.flaim.__class__.__name__),"flaim parameters"))
@@ -658,5 +662,10 @@
md.stressbalance.referential=project3d(md,'vector',md.stressbalance.referential,'type','node')
md.stressbalance.loadingforce=project3d(md,'vector',md.stressbalance.loadingforce,'type','node')
- md.masstransport.calvingrate=project3d(md,'vector',md.masstransport.calvingrate,'type','node')
+
+ # Calving variables
+ if hasattr(md.calving,'calving'):
+ md.calving.calvingrate=project3d(md,'vector',md.calving.calvingrate,'type','node')
+ if hasattr(md.calving,'calvinglevermann'):
+ md.calving.coeff=project3d(md,'vector',md.calving.coeff,'type','node')
# Hydrologydc variables
Index: /issm/trunk-jpl/src/m/classes/transient.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/transient.m (revision 18756)
+++ /issm/trunk-jpl/src/m/classes/transient.m (revision 18757)
@@ -13,4 +13,5 @@
isdamageevolution = 0;
islevelset = 0;
+ iscalving = 0;
ishydrology = 0;
requested_outputs = {};
@@ -29,4 +30,5 @@
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' indicates whether damage evolution is used in the transient ',' ');
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' LEVEL SET DESCRIPTION... ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' indicates whether calving is used in the transient ',' ');
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' list of additional outputs requested ',' ');
fprintf(fid,'%s\n%s\n','');
@@ -51,4 +53,5 @@
obj.isdamageevolution = 0;
obj.islevelset = 0;
+ obj.iscalving =0;
obj.ishydrology = 0;
@@ -66,4 +69,5 @@
obj.isdamageevolution = 0;
obj.islevelset = 0;
+ obj.iscalving = 0;
obj.ishydrology = 0;
@@ -90,4 +94,5 @@
md = checkfield(md,'fieldname','transient.isdamageevolution','numel',[1],'values',[0 1]);
md = checkfield(md,'fieldname','transient.islevelset','numel',[1],'values',[0 1]);
+ md = checkfield(md,'fieldname','transient.iscalving','numel',[1],'values',[0 1]);
md = checkfield(md,'fieldname','transient.ishydrology','numel',[1],'values',[0 1]);
md = checkfield(md,'fieldname','transient.requested_outputs','stringrow',1);
@@ -104,4 +109,5 @@
fielddisplay(obj,'isdamageevolution','indicates whether damage evolution is used in the transient');
fielddisplay(obj,'islevelset','LEVEL SET DESCRIPTION...');
+ fielddisplay(obj,'iscalving','indicates whether calving is used in the transient');
fielddisplay(obj,'ishydrology','indicates whether an hydrology model is used');
fielddisplay(obj,'requested_outputs','list of additional outputs requested');
@@ -117,4 +123,5 @@
WriteData(fid,'object',obj,'fieldname','ishydrology','format','Boolean');
WriteData(fid,'object',obj,'fieldname','islevelset','format','Boolean');
+ WriteData(fid,'object',obj,'fieldname','iscalving','format','Boolean');
%process requested outputs