Changeset 25836 for issm/trunk/src/m/classes/basalforcingsbeckmanngoosse.m

Timestamp:

12/08/20 08:45:53 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 25834

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/basalforcingsbeckmanngoosse.m (modified) (5 diffs)

issm/trunk/src/m/classes/basalforcingsbeckmanngoosse.m

@@ -1 @@
-%MISMIP BASAL FORCINGS class definition
+%BECKMANNGOOSSE BASAL FORCINGS class definition
 %
 %   Usage:
@@ -8 +8 @@
                 groundedice_melting_rate  = NaN;
                 geothermalflux            = NaN;
-                meltrate_factor           = NaN;
-                ocean_temp                = NaN;
+                meltrate_factor           = 0.;
+                ocean_temp                = 0.;
                 ocean_salinity            = NaN;
         end
@@ -64 +64 @@
                                 md = checkfield(md,'fieldname','basalforcings.ocean_temp','NaN',1,'Inf',1,'timeseries',1);
                                 md = checkfield(md,'fieldname','basalforcings.ocean_salinity','NaN',1,'Inf',1,'timeseries',1);  
-                                md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'numel',1);
+                                md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'universal',1,'NaN',1,'Inf',1);
                         end
                         if ismember('BalancethicknessAnalysis',analyses),
@@ -70 +70 @@
                                 md = checkfield(md,'fieldname','basalforcings.ocean_temp','NaN',1,'Inf',1,'timeseries',1);
                                 md = checkfield(md,'fieldname','basalforcings.ocean_salinity','NaN',1,'Inf',1,'timeseries',1);
-                                md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'numel',1);
+                                md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'universal',1,'NaN',1,'Inf',1);
                         end
                         if ismember('ThermalAnalysis',analyses) & ~(solution=='TransientSolution' & md.transient.isthermal==0),
                                 md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1);
-                                md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'numel',1);
                                 md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'Inf',1,'timeseries',1,'>=',0);
+                                md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'universal',1,'NaN',1,'Inf',1);
                         end
                 end % }}}
@@ -98 +98 @@
 
 
-WriteData(fid,prefix,'name','md.basalforcings.model','data',8,'format','Integer');
+                        WriteData(fid,prefix,'name','md.basalforcings.model','data',8,'format','Integer');
                         WriteData(fid,prefix,'data',floatingice_melting_rate,'format','DoubleMat','name','md.basalforcings.floatingice_melting_rate','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
                         WriteData(fid,prefix,'object',self,'fieldname','groundedice_melting_rate','format','DoubleMat','name','md.basalforcings.groundedice_melting_rate','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
                         WriteData(fid,prefix,'object',self,'fieldname','geothermalflux','name','md.basalforcings.geothermalflux','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
-                        WriteData(fid,prefix,'object',self,'fieldname','meltrate_factor','format','Double','name','md.basalforcings.meltrate_factor');
+                        WriteData(fid,prefix,'object',self,'fieldname','meltrate_factor','format','DoubleMat','mattype',1,'name','md.basalforcings.meltrate_factor');
                         WriteData(fid,prefix,'object',self,'fieldname','ocean_temp','format','DoubleMat','name','md.basalforcings.ocean_temp','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
                         WriteData(fid,prefix,'object',self,'fieldname','ocean_salinity','format','DoubleMat','name','md.basalforcings.ocean_salinity','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);