Changeset 24851

Timestamp:

05/13/20 09:55:24 (5 years ago)

Author:

Eric.Larour

Message:

CHG: final versions of glaciermip and rgi classes.

Location:

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

Files:

• glacier_inventory.m (modified) (2 diffs)
• glaciermip.m (modified) (6 diffs)

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

@@ -32 +32 @@
                                 self.shapefileroot=getfieldvalue(options,'shapefileroot');
                                 self.region_names=getfieldvalue(options,'region_names');
+                                regions_zone_shapefile=getfieldvalue(options,'regions_zone_shapefile','');
+
+                                %region region zones first if available: 
+                                if ~strcmpi(regions_zone_shapefile,''),
+                                        region_zones=shpread(regions_zone_shapefile);
+                                end
 
                                 %read the shape files and create the regions: 
@@ -40 +46 @@
                                         disp(['reading region: '  self.regions(i).name]);
                                         self.regions(i).id=i;
+                                        self.regions(i).zone=[region_zones(i).x,region_zones(i).y];
                                         contours=shpread([self.shapefileroot '/' self.regions(i).name '.shp']);
                                         

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

@@ -84 +84 @@
                         sc=getfieldvalue(options,'scenario',1:length(self.scenario));
                         zerostonan=getfieldvalue(options,'zerostonan',0);
+                        unit=getfieldvalue(options,'unit','Gt');
+                        sumregion=getfieldvalue(options,'sumregion',0);
 
                         if self.version==1,
@@ -90 +92 @@
 
                         %serialize: 
-                        masses=[];
-                        for i=rg,
-                                for j=cm,
-                                        for k=gm,
-                                                for l=sc,
-                                                        masses=[masses; squeeze(self.mass(i,:,j,k,l))];
+                        if sumregion,
+                                for i=rg,
+                                        masses_regioni=[];
+                                        for j=cm,
+                                                for k=gm,
+                                                        for l=sc,
+                                                                masses_regioni=[masses_regioni; squeeze(self.mass(i,:,j,k,l))];
+                                                        end
+                                                end
+                                        end
+                                        if i==1, 
+                                                masses=masses_regioni;
+                                        else
+                                                masses=masses+masses_regioni;
+                                        end
+                                end
+                        else
+                                masses=[];
+                                for i=rg,
+                                        for j=cm,
+                                                for k=gm,
+                                                        for l=sc,
+                                                                masses=[masses; squeeze(self.mass(i,:,j,k,l))];
+                                                        end
                                                 end
                                         end
@@ -103 +123 @@
                                 masses(find(masses==0))=NaN;
                         end
+                        if strcmpi(unit,'mmSLE'),
+                                masses=masses/sletogt();
+                        end
+
 
                 end % }}}
@@ -108 +132 @@
                 
                         options=pairoptions(varargin{:});
+
+                        unit=getfieldvalue(options,'unit','Gt/yr');
 
                         %get mass first: 
@@ -121 +147 @@
                         end
 
+                        if strcmpi(unit,'mmSLE/yr'),
+                                massrates=massrates/sletogt();
+                        end
 
                 end % }}}
@@ -149 +178 @@
                         end
                 end % }}}
-        end
+        end 
 end