Changeset 26006

Timestamp:

02/20/21 08:50:40 (4 years ago)

Author:

bulthuis

Message:

CGH: updating matlab classes initialization and transient for transient sampling

Location:

issm/trunk-jpl/src/m/classes

Files:

• initialization.m (modified) (5 diffs)
• transient.m (modified) (7 diffs)

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

@@ -20 +20 @@
                 hydraulic_potential = NaN;
                 channelarea         = NaN;
+        sample              = NaN;
         end
         methods
@@ -109 +110 @@
                                                 md = checkfield(md,'fieldname','initialization.epl_thickness','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
                                         end
-                                end
+                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 % }}}
@@ -129 +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');
                 end % }}}
                 function marshall(self,prefix,md,fid) % {{{
@@ -147 +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);
+            
                         if md.thermal.isenthalpy,
                                 if numel(self.enthalpy) <= 1,
@@ -177 +184 @@
                         writejs1Darray(fid,[modelname '.initialization.hydraulic_potential'],self.hydraulic_potential);
                         writejs1Darray(fid,[modelname '.initialization.channel'],self.channelarea);
-
+            writejs1Darray(fid,[modelname '.initialization.sample'],self.sample);
+            
                 end % }}}
         end

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

@@ -16 +16 @@
                 ismovingfront     = 0;
                 ishydrology       = 0;
+        issampling        = 0;
                 isslc             = 0;
                 iscoupler         = 0;
@@ -44 +45 @@
                         self.ismovingfront   =0;
                         self.ishydrology     = 0;
+            self.issampling      = 0;
                         self.isslc           = 0;
                         self.isoceancoupling = 0;
@@ -65 +67 @@
                         self.ismovingfront   = 0;
                         self.ishydrology     = 0;
+            self.issampling      = 0;
                         self.isslc           = 0;
                         self.isoceancoupling = 0;
@@ -99 +102 @@
                         md = checkfield(md,'fieldname','transient.isoceancoupling','numel',[1],'values',[0 1]);
                         md = checkfield(md,'fieldname','transient.iscoupler','numel',[1],'values',[0 1]);
+            md = checkfield(md,'fieldname','transient.issampling','numel',[1],'values',[0 1]);  
                         md = checkfield(md,'fieldname','transient.amr_frequency','numel',[1],'>=',0,'NaN',1,'Inf',1);
 
@@ -121 +125 @@
                         fielddisplay(self,'ismovingfront','indicates whether a moving front capability is used in the transient');
                         fielddisplay(self,'ishydrology','indicates whether an hydrology model is used');
+            fielddisplay(self,'issampling','indicates whether sampling is used in the transient')
                         fielddisplay(self,'isslc','indicates whether a sea-level change solution is used in the transient');
                         fielddisplay(self,'isoceancoupling','indicates whether a coupling with an ocean model is used in the transient');
@@ -139 +144 @@
                         WriteData(fid,prefix,'object',self,'fieldname','ishydrology','format','Boolean');
                         WriteData(fid,prefix,'object',self,'fieldname','ismovingfront','format','Boolean');
+            WriteData(fid,prefix,'object',self,'fieldname','issampling','format','Boolean'); 
                         WriteData(fid,prefix,'object',self,'fieldname','isslc','format','Boolean');
                         WriteData(fid,prefix,'object',self,'fieldname','isoceancoupling','format','Boolean');
@@ -165 +171 @@
                         writejsdouble(fid,[modelname '.trans.ismovingfront'],self.ismovingfront);
                         writejsdouble(fid,[modelname '.trans.ishydrology'],self.ishydrology);
+            writejsdouble(fid,[modelname '.trans.issampling'],self.issampling); 
                         writejsdouble(fid,[modelname '.trans.isslc'],self.isslc);
                         writejsdouble(fid,[modelname '.trans.isoceancoupling'],self.isoceancoupling);