Changeset 20500 for issm/trunk/src/m/classes/linearbasalforcings.m

Timestamp:

04/12/16 21:32:01 (9 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 20497

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/m/classes/linearbasalforcings.m (modified) (4 diffs)

issm/trunk

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad

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

@@ -13 +13 @@
         end
         methods
-     function createxml(self,fid) % {{{
-            fprintf(fid, '\n\n');
-            fprintf(fid, '%s\n', '<!-- basalforcings -->');
-                         fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',    '<parameter key ="melting_rate" type="',            class(self.melting_rate),'" default="',              num2str(self.melting_rate),'">',              '     <section name="basalforcings" />','     <help> basal melting rate (positive if melting) [m/yr] </help>','</parameter>');
-             fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',        '<parameter key ="geothermalflux" type="',          class(self.geothermalflux),'" default="',            num2str(self.geothermalflux),'">',            '     <section name="basalforcings" />','     <help> geothermal heat flux [W/m^2] </help>','</parameter>');
-             
-        end % }}}
                 function self = linearbasalforcings(varargin) % {{{
                         switch nargin
@@ -49 +42 @@
 
                         if ismember(MasstransportAnalysisEnum(),analyses) & ~(solution==TransientSolutionEnum() & md.transient.ismasstransport==0),
-                                md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1);
+                                md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1);
                                 md = checkfield(md,'fieldname','basalforcings.deepwater_melting_rate','>=',0,'numel',1);
                                 md = checkfield(md,'fieldname','basalforcings.deepwater_elevation','<','basalforcings.upperwater_elevation','numel',1);
@@ -55 +48 @@
                         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.groundedice_melting_rate','NaN',1,'Inf',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);
@@ -61 +54 @@
                         end
                         if ismember(ThermalAnalysisEnum(),analyses) & ~(solution==TransientSolutionEnum() & md.transient.isthermal==0),
-                                md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1);
+                                md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',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);
-                                md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'timeseries',1,'>=',0);
+                                md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'Inf',1,'timeseries',1,'>=',0);
                         end
                 end % }}}

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad