Changeset 26008

Timestamp:

02/20/21 18:01:48 (4 years ago)

Author:

bulthuis

Message:

CGH: remove matlab classes initialization for transient sampling

File:

• issm/trunk-jpl/src/m/classes/initialization.m (modified) (5 diffs)

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

@@ -20 +20 @@
                 hydraulic_potential = NaN;
                 channelarea         = NaN;
-        %sample              = NaN;
+        sample              = NaN;
         end
         methods
@@ -112 +112 @@
                 end
             end
-%             if ismember('SamplingAnalysis',analyses) & ~(strcmp(solution,'TransientSolution') & md.transient.issampling == 0),
-%                 if ~isnan(md.initialization.sample)
-%                     md = checkfield(md,'fieldname','initialization.sample','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
-%                 end
-%                       end
+            if ismember('SamplingAnalysis',analyses) & ~(strcmp(solution,'TransientSolution') & md.transient.issampling == 0),
+                if ~isnan(md.initialization.sample)
+                    md = checkfield(md,'fieldname','initialization.sample','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
+                end
+                        end
                 end % }}}
                 function disp(self) % {{{
@@ -135 +135 @@
                         fielddisplay(self,'hydraulic_potential','Hydraulic potential (for GlaDS) [Pa]');
                         fielddisplay(self,'channelarea','subglacial water channel area (for GlaDS) [m2]');
-            %fielddisplay(self,'sample','Realization of a Gaussian random field');
+            fielddisplay(self,'sample','Realization of a Gaussian random field');
                 end % }}}
                 function marshall(self,prefix,md,fid) % {{{
@@ -153 +153 @@
                         WriteData(fid,prefix,'object',self,'fieldname','channelarea','format','DoubleMat','mattype',1);
                         WriteData(fid,prefix,'object',self,'fieldname','hydraulic_potential','format','DoubleMat','mattype',1);
-            %WriteData(fid,prefix,'object',self,'fieldname','sample','format','DoubleMat','mattype',1);
+            WriteData(fid,prefix,'object',self,'fieldname','sample','format','DoubleMat','mattype',1);
             
                         if md.thermal.isenthalpy,
@@ -184 +184 @@
                         writejs1Darray(fid,[modelname '.initialization.hydraulic_potential'],self.hydraulic_potential);
                         writejs1Darray(fid,[modelname '.initialization.channel'],self.channelarea);
-           % writejs1Darray(fid,[modelname '.initialization.sample'],self.sample);
+            writejs1Darray(fid,[modelname '.initialization.sample'],self.sample);
             
                 end % }}}