Changeset 24848

Timestamp:

05/12/20 18:22:47 (5 years ago)

Author:

Eric.Larour

Message:

CHG: diverse

Location:

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

Files:

• glacier_inventory.m (modified) (3 diffs)
• glaciermip.m (added)

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

@@ -93 +93 @@
                 end
                 %}}}
+                function totalarea=area(self,varargin) % {{{
+                        region=-1;
+                        totalarea=0;
+                        if nargin==2,
+                                region=varargin{1};
+                        end
+                        if region==-1,
+                                %figure out the areas of everybody: 
+                                for i=1:self.nregions(),
+                                        totalarea=totalarea+sum(self.regions(i).Area);
+                                end
+                        else
+                                totalarea=totalarea+sum(self.regions(region).Area);
+                        end
+
+                end % }}}
                 function [mpartition,npartition]=partition(self,varargin) % {{{
                         mpartition=zeros(self.nregions(),1);
@@ -240 +256 @@
                 function mesh_connectivity(self,mesh) % {{{
                         
-                        %initialize glacier_connectivity: 
+                        %initialize glacier and element connectivity: 
                         glacier_connectivity=zeros(self.nglaciers,1);
 
@@ -326 +342 @@
                         for j=1:length(glacier_connectivity),
                                 el=glacier_connectivity(j);
-                                if el==0,
-                                        continue;
-                                end
                                 count=element_connectivity(el,ny);
                                 if count>ny,
                                         error('need to enlarge connectivity table');
                                 end
-                                element_connectivity(el,count+1)=partition_counter+j;
+                                element_connectivity(el,count+1)=j;
                                 element_connectivity(el,ny)=count+1;
                         end