Changeset 25326

Timestamp:

07/31/20 16:46:10 (5 years ago)

Author:

Eric.Larour

Message:

CHG: diverse.

Location:

issm/trunk-jpl/src/m/contrib/larour

Files:

• UQ (added)
• UQ/sampling.m (added)
• equiprobable_histogram_uncertain.m (modified) (1 diff)
• glaciermip.m (modified) (1 diff)
• oceanmip.m (modified) (1 diff)

issm/trunk-jpl/src/m/contrib/larour/equiprobable_histogram_uncertain.m

@@ -1 @@
-function [ids,probs,n]=equiprobable_histogram_uncertain(numberids)
+function [abscissas,counts,pair_per_variable]=equiprobable_histogram_uncertain(numberabscissas)
 
-        n=numberids+1;
-        ids=(1:(numberids+1))';
-        p=ones(numberids,1)/numberids;
-        probs=[p;0]; probs=probs/sum(probs);
+        pair_per_variable=numberabscissas+1;
+        abscissas=(1:(numberabscissas+1))';
+        p=ones(numberabscissas,1)/numberabscissas;
+        counts=[p;0]; counts=counts/sum(counts);

issm/trunk-jpl/src/m/contrib/larour/glaciermip.m

@@ -178 +178 @@
                         end
                 end % }}}
+                function part=partition(self,md,rgi2mesh,part,value) % {{{
+
+                        for i=1:size(rgi2mesh,2),
+                                dh=rgi2mesh(:,i);
+                                pos=find(dh);
+                                part(pos)=value;
+                        end
+
+                end  % }}}
         end 
 end

issm/trunk-jpl/src/m/contrib/larour/oceanmip.m

@@ -207 +207 @@
                 end
                 %}}}
-        function arrays= dbottompressures(self) % {{{
+        function arrays= dbottompressures(self,varargin) % {{{
+                options=pairoptions(varargin{:});
+                units=getfieldvalue(options,'units','mm/yr');
+                
                 arrays=cell(self.n,1);
                 for i=1:self.n,
-                        pbo=self.mesh_pbo{i}; pbo=pbo/1000; %in meters
+                        pbo=self.mesh_pbo{i}; 
                         dpbo=diff(pbo,1,2);
-                        time=self.time{i};
-                        time=time(1:end-1);
-                        array=[dpbo;dtime];
+                        if strcmpi(units,'m/yr'),
+                                dpbo=dpbo/1000;
+                        end
+                        time=self.time{i}; time=time(1:end-1);
+                        array=[dpbo;time'];
                         arrays{i}=array;
                 end
         end %}}}
-        function arrays= dzoss(self) % {{{
+        function arrays= dzoss(self,varargin) % {{{
+                options=pairoptions(varargin{:});
+                units=getfieldvalue(options,'units','mm/yr');
+                
                 arrays=cell(self.n,1);
                 for i=1:self.n,
-                        zos=self.mesh_zos{i}; zos=zos/1000; %in meters
+                        zos=self.mesh_zos{i}; 
                         dzos=diff(zos,1,2);
+                        if strcmpi(units,'m/yr'),
+                                dzos=dzos/1000;
+                        end
                         time=self.time{i};time=time(1:end-1);
-                        array=[dzos;time];
+                        array=[dzos;time'];
                         arrays{i}=array;
                 end
         end     %}}}
-        function arrays= dzostogass(self) % {{{
+        function arrays= dzostogass(self,varargin) % {{{
+                options=pairoptions(varargin{:});
+                units=getfieldvalue(options,'units','mm/yr');
+
                 arrays=cell(self.n,1);
                 for i=1:self.n,
-                        zostoga=self.zostoga{i}; zos=zos/1000; %in meters
-                        dzostoga=diff(dzostoga);
+                        zostoga=self.zostoga{i}; 
+                        dzostoga=diff(zostoga);
+                        if strcmpi(units,'m/yr'),
+                                dzostoga=dzostoga/1000;
+                        end
                         time=self.time{i};time=time(1:end-1);
-                        array=[dzostoga;time];
+                        array=[dzostoga';time'];
                         arrays{i}=array;
                 end