Changeset 27092

Timestamp:

06/22/22 16:10:14 (3 years ago)

Author:

Eric.Larour

Message:

CHG: diverse mods.

Location:

issm/branches/trunk-larour-SLPS2022/src/m/contrib/larour

Files:

• ismip6.m (modified) (1 diff)
• oceanmip.m (modified) (3 diffs)

issm/branches/trunk-larour-SLPS2022/src/m/contrib/larour/ismip6.m ¶

@@ -22 +22 @@
                 deltathicknesshal = {};   %placeholder for delta thicknesses halosteric origins
                 deltathicknessbar = {};   %placeholder for delta thicknesses halosteric origins
+                vdeltathicknessbar = {};   %placeholder for delta thicknesses halosteric origins on vertices
                 thicknesscorrection={};  
                 icemask        = {};   %placeholder for ice masks

issm/branches/trunk-larour-SLPS2022/src/m/contrib/larour/oceanmip.m ¶

@@ -258 +258 @@
                 end
         end %}}}
+        function arrays= bottompressures(self,varargin) % {{{
+                options=pairoptions(varargin{:});
+                units=getfieldvalue(options,'units','m');
+                
+                arrays=cell(self.n,1);
+                for i=1:self.n,
+                        pbo=self.mesh_pbo{i}; 
+                        if strcmpi(units,'m'),
+                                pbo=pbo*1e-3;
+                        end
+                        time=self.time{i};
+                        array=[pbo;time'];
+                        arrays{i}=array;
+                end
+        end %}}}
         function arrays= dzoss(self,varargin) % {{{
                 options=pairoptions(varargin{:});
@@ -274 +289 @@
                 end
         end     %}}}
+        function arrays= zoss(self,varargin) % {{{
+                
+                options=pairoptions(varargin{:});
+                units=getfieldvalue(options,'units','m');
+                
+                arrays=cell(self.n,1);
+                for i=1:self.n,
+                        zos=self.mesh_zos{i}; 
+                        if strcmpi(units,'m'),
+                                zos=zos*1e-3;
+                        end
+                        time=self.time{i};
+                        array=[zos;time'];
+                        arrays{i}=array;
+                end
+        end     %}}}
         function arrays= dzostogass(self,varargin) % {{{
                 options=pairoptions(varargin{:});
@@ -287 +318 @@
                         time=self.time{i};time=time(1:end-1);
                         array=[dzostoga';time'];
+                        arrays{i}=array;
+                end
+        end     %}}}
+        function arrays= zostogas(self,varargin) % {{{
+                options=pairoptions(varargin{:});
+                units=getfieldvalue(options,'units','m');
+
+                arrays=cell(self.n,1);
+                for i=1:self.n,
+                        z=self.zostoga{i}; 
+                        if strcmpi(units,'m'),
+                                z=z*1e-3;
+                        end
+                        time=self.time{i};
+                        array=[z';time'];
                         arrays{i}=array;
                 end