Changeset 18096

Timestamp:

06/03/14 16:07:45 (11 years ago)

Author:

seroussi

Message:

BUG: forgot class changes

File:

• issm/trunk-jpl/src/m/classes/linearbasalforcings.m (modified) (3 diffs)

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

@@ -4 +4 @@
 %      linearbasalforcings=linearbasalforcings();
 
-classdef basalforcings
+classdef linearbasalforcings
         properties (SetAccess=public) 
                 groundedice_melting_rate  = NaN;
@@ -50 +50 @@
                         if ismember(MasstransportAnalysisEnum(),analyses) & ~(solution==TransientSolutionEnum() & md.transient.ismasstransport==0),
                                 md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'forcing',1);
-                                md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'forcing',1);
+                                md = checkfield(md,'fieldname','basalforcings.deepwater_melting_rate','>=',0,'numel',1);
+                                md = checkfield(md,'fieldname','basalforcings.deepwater_elevation','<','basalforcings.upperwater_elevation','numel',1);
+                                md = checkfield(md,'fieldname','basalforcings.upperwater_elevation','<',0,'numel',1);
                         end
                         if ismember(BalancethicknessAnalysisEnum(),analyses),
                                 md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'size',[md.mesh.numberofvertices 1]);
-                                md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'size',[md.mesh.numberofvertices 1]);
+                                md = checkfield(md,'fieldname','basalforcings.deepwater_melting_rate','>=',0,'numel',1);
+                                md = checkfield(md,'fieldname','basalforcings.deepwater_elevation','<','basalforcings.upperwater_elevation','numel',1);
+                                md = checkfield(md,'fieldname','basalforcings.upperwater_elevation','<',0,'numel',1);
                         end
                         if ismember(ThermalAnalysisEnum(),analyses) & ~(solution==TransientSolutionEnum() & md.transient.isthermal==0),
@@ -78 +82 @@
                         yts=365.0*24.0*3600.0;
 
-                        floatingice_melting_rate=zeros(size(groundedice_melting_rate));
-                        floatingice_melting_rate(find(md.geometry.base<=deepwater_elevation))=deepwater_melting_rate;
-                        pos=find(md.geometry.base>deepwater_elevation & md.geometry.base<upperwater_elevation);
-                        floatingice_melting_rate(pos)=deepwater_melting_rate*(md.geometry.base(pos)-upperwater_elevation)/(deepwater_elevation-upperwater_elevation);
+                        floatingice_melting_rate=zeros(md.mesh.numberofvertices,1);
+                        floatingice_melting_rate(find(md.geometry.base<=md.basalforcings.deepwater_elevation))=md.basalforcings.deepwater_melting_rate;
+                        pos=find(md.geometry.base>md.basalforcings.deepwater_elevation & md.geometry.base<md.basalforcings.upperwater_elevation);
+                        floatingice_melting_rate(pos)=md.basalforcings.deepwater_melting_rate*(md.geometry.base(pos)-md.basalforcings.upperwater_elevation)/(md.basalforcings.deepwater_elevation-md.basalforcings.upperwater_elevation);
                         WriteData(fid,'enum',BasalforcingsEnum(),'data',LinearFloatingMeltRateEnum(),'format','Integer');
-                        WriteData(fid,'object',obj,'fieldname','groundedice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
+                        WriteData(fid,'data',floatingice_melting_rate,'format','DoubleMat','enum',BasalforcingsFloatingiceMeltingRateEnum(),'mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
+                        WriteData(fid,'object',obj,'fieldname','groundedice_melting_rate','format','DoubleMat','enum',BasalforcingsGroundediceMeltingRateEnum(),'mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
+                        WriteData(fid,'object',obj,'fieldname','geothermalflux','enum',BasalforcingsGeothermalfluxEnum(),'format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);
                         WriteData(fid,'object',obj,'fieldname','deepwater_melting_rate','format','Double','enum',BasalforcingsDeepwaterMeltingRateEnum(),'scale',1./yts)
                         WriteData(fid,'object',obj,'fieldname','deepwater_elevation','format','Double','enum',BasalforcingsDeepwaterElevationEnum())
                         WriteData(fid,'object',obj,'fieldname','upperwater_elevation','format','Double','enum',BasalforcingsUpperwaterElevationEnum())
-                        WriteData(fid,'object',obj,'fieldname','geothermalflux','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);
                 end % }}}
         end