Changeset 27393

Timestamp:

11/15/22 18:43:59 (2 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing GlaDS py

Location:

issm/trunk-jpl/src/m/classes

Files:

• hydrologyglads.m (modified) (2 diffs)
• hydrologyglads.py (modified) (3 diffs)

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

@@ -14 +14 @@
                 %Channels
                 ischannels           = 0;
-                channel_conductivity = 0.;
+                channel_conductivity = NaN;
                 channel_sheet_width  = 0.;
 
@@ -71 +71 @@
                         %Channels
                         md = checkfield(md,'fieldname','hydrology.ischannels','numel',[1],'values',[0 1]);
-                        md = checkfield(md,'fieldname','hydrology.channel_conductivity','size',[md.mesh.numberofvertices],'>=',0,'NaN',1,'Inf',1);      
+                        md = checkfield(md,'fieldname','hydrology.channel_conductivity','size',[md.mesh.numberofvertices 1],'>=',0,'NaN',1,'Inf',1);    
                         md = checkfield(md,'fieldname','hydrology.channel_sheet_width','numel',[1],'>=',0);     
 

issm/trunk-jpl/src/m/classes/hydrologyglads.py

@@ -22 +22 @@
         #Channels
         self.ischannels = 0
-        self.channel_conductivity = 0.
+        self.channel_conductivity = np.nan
         self.channel_sheet_width = 0.
 
@@ -95 +95 @@
         #Channels
         md = checkfield(md, 'fieldname', 'hydrology.ischannels', 'numel', [1], 'values', [0, 1])
-        md = checkfield(md, 'fieldname', 'hydrology.channel_conductivity', 'numel', [1], '>', 0)
+        md = checkfield(md, 'fieldname', 'hydrology.channel_conductivity', 'size', [md.mesh.numberofvertices], '>', 0)
         md = checkfield(md, 'fieldname', 'hydrology.channel_sheet_width', 'numel', [1], '>=', 0)
 
@@ -122 +122 @@
         #Channels
         WriteData(fid, prefix, 'object', self, 'class', 'hydrology', 'fieldname', 'ischannels', 'format', 'Boolean')
-        WriteData(fid, prefix, 'object', self, 'class', 'hydrology', 'fieldname', 'channel_conductivity', 'format', 'Double')
+        WriteData(fid, prefix, 'object', self, 'class', 'hydrology', 'fieldname', 'channel_conductivity', 'format', 'DoubleMat', 'mattype', 1)
         WriteData(fid, prefix, 'object', self, 'class', 'hydrology', 'fieldname', 'channel_sheet_width', 'format', 'Double')