Changeset 23777

Timestamp:

03/08/19 09:18:13 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixed some fields in ISMIP6 forcing

File:

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

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

@@ -6 +6 @@
 classdef basalforcingsismip6
         properties (SetAccess=public) 
+                num_basins                = 0;
                 basin_id                  = NaN;
                 gamma_0                   = 0.;
                 tf                        = NaN;
-                tf_depths                 = 0.;
+                tf_depths                 = NaN;
+                tf_times                  = NaN;
                 delta_t                   = NaN;
                 geothermalflux            = NaN;
@@ -22 +24 @@
                         self.groundedice_melting_rate=project3d(md,'vector',self.groundedice_melting_rate,'type','node','layer',1);
                 end % }}}
-                function self = basalforcingspico(varargin) % {{{
+                function self = basalforcingsismip6(varargin) % {{{
                         switch nargin
                                 case 0
@@ -49 +51 @@
                 function md = checkconsistency(self,md,solution,analyses) % {{{
 
-                                md = checkfield(md,'fieldname','basalforcings.basin_id','Inf',1,'>=',0,'<=',md.basalforcings.num_basins,'size',[md.mesh.numberofelements 1]);
-                                md = checkfield(md,'fieldname','basalforcings.gamma_0','numel',1,'NaN',1,'Inf',1,'>',0);
-                                md = checkfield(md,'fieldname','basalforcings.tf','Inf',1,'NaN',1);
-                                md = checkfield(md,'fieldname','basalforcings.tf_depths','numel',1,'NaN',1,'Inf',1,'>',0);
-                                md = checkfield(md,'fieldname','basalforcings.delta_t','NaN',1,'Inf',1,'size',[md.basalforcings.num_basins NaN]);
-                                md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'Inf',1,'>=',0,'timeseries',1);
-                                md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1);
+                        md = checkfield(md,'fieldname','basalforcings.num_basins','numel',1,'NaN',1,'Inf',1,'>',0);
+                        md = checkfield(md,'fieldname','basalforcings.basin_id','Inf',1,'>=',0,'<=',md.basalforcings.num_basins,'size',[md.mesh.numberofelements 1]);
+                        md = checkfield(md,'fieldname','basalforcings.gamma_0','numel',1,'NaN',1,'Inf',1,'>',0);
+                        md = checkfield(md,'fieldname','basalforcings.tf_times','NaN',1,'Inf',1);
+                        md = checkfield(md,'fieldname','basalforcings.tf_depths','NaN',1,'Inf',1);
+                        md = checkfield(md,'fieldname','basalforcings.tf','size',[md.mesh.numberofvertices,numel(md.basalforcings.delta_t),numel(md.basalforcings.tf_depths)],'NaN',1,'Inf',1);
+                        md = checkfield(md,'fieldname','basalforcings.delta_t','NaN',1,'Inf',1,'numel',md.basalforcings.num_basins);
+                        md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'Inf',1,'>=',0,'timeseries',1);
+                        md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1);
 
                 end % }}}
                 function disp(self) % {{{
                         disp(sprintf('   ISMIP6 basal melt rate parameterization:'));
+                        fielddisplay(self,'num_basins','number of basins the model domain is partitioned into [unitless]');
                         fielddisplay(self,'basin_id','basin number assigned to each node (unitless)');
                         fielddisplay(self,'gamma_0','melt rate coefficient (m/yr)');
+                        fielddisplay(self,'tf_depths','Number of vertical layers in ocean thermal forcing dataset');
+                        fielddisplay(self,'tf_times','time for each tf (in yr) ');
                         fielddisplay(self,'tf','thermal forcing (ocean temperature minus freezing point) (degrees C)');
-                        fielddisplay(self,'tf_depths','Number of vertical layers in ocean thermal forcing dataset');
                         fielddisplay(self,'delta_t','Ocean temperature correction per basin (degrees C)');
                         fielddisplay(self,'geothermalflux','geothermal heat flux (W/m^2)');
@@ -74 +80 @@
                         yts=md.constants.yts;
 
-                        WriteData(fid,prefix,'name','md.basalforcings.model','data',5,'format','Integer');
+                        WriteData(fid,prefix,'name','md.basalforcings.model','data',6,'format','Integer');
+                        WriteData(fid,prefix,'object',self,'fieldname','num_basins','format','Integer');
                         WriteData(fid,prefix,'object',self,'fieldname','basin_id','data',self.basin_id-1,'name','md.basalforcings.basin_id','format','IntMat','mattype',2);   %0-indexed
                         WriteData(fid,prefix,'object',self,'fieldname','gamma_0','format','Double');