Changeset 25996

Timestamp:

02/17/21 13:36:17 (4 years ago)

Author:

bulthuis

Message:

NEW: add new class sampling to model for stochastic sampling capability

Location:

issm/trunk-jpl/src/m

Files:

• classes/model.m (modified) (4 diffs)
• classes/sampling.m (added)
• consistency/ismodelselfconsistent.m (modified) (1 diff)

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

@@ -39 +39 @@
                 steadystate      = 0;
                 transient        = 0;
-                levelset                          = 0;
+                levelset             = 0;
                 calving          = 0;
                 frontalforcings  = 0;
-                love                         = 0;
-                gia                               = 0;
+                love                     = 0;
+                gia                              = 0;
                 esa              = 0;
+        sampling         = 0;
 
                 autodiff         = 0;
@@ -187 +188 @@
                                         end
                                 end
-                        end
+            end
+            %2021 February 17
+                        if isa(md.sampling,'double'); md.sampling=sampling(); end
                 end% }}}
         end
@@ -241 +244 @@
                         md.love             = fourierlove();
                         md.esa              = esa();
+            md.sampling         = sampling();
                         md.autodiff         = autodiff();
                         md.inversion        = inversion();
@@ -1505 +1509 @@
                         disp(sprintf('%19s: %-22s -- %s','esa'             ,['[1x1 ' class(self.esa) ']'],'parameters for elastic adjustment solution'));
                         disp(sprintf('%19s: %-22s -- %s','love'            ,['[1x1 ' class(self.love) ']'],'parameters for love solution'));
+            disp(sprintf('%19s: %-22s -- %s','sampling'        ,['[1x1 ' class(self.sampling) ']'],'parameters for stochastic sampler'));
                         disp(sprintf('%19s: %-22s -- %s','autodiff'        ,['[1x1 ' class(self.autodiff) ']'],'automatic differentiation parameters'));
                         disp(sprintf('%19s: %-22s -- %s','inversion'       ,['[1x1 ' class(self.inversion) ']'],'parameters for inverse methods'));

issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m

@@ -78 +78 @@
         elseif strcmp(solutiontype,'DamageEvolutionSolution')
                 analyses={'DamageEvolutionAnalysis'};
+    elseif strcmp(solutiontype,'SamplingSolution')
+                analyses={'SamplingAnalysis'};    
         else
                 error(' solution type: %s' , solutiontype, ' not supported yet!');