Changeset 24292

Timestamp:

10/30/19 09:01:20 (5 years ago)

Author:

jdquinn

Message:

CHG: Added check of stressbalance.vertex_pairing field to MATLAB

Location:

issm/trunk-jpl/src/m/classes

Files:

• masstransport.m (modified) (4 diffs)
• masstransport.py (modified) (1 diff)
• stressbalance.m (modified) (4 diffs)
• stressbalance.py (modified) (1 diff)

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

@@ -5 +5 @@
 
 classdef masstransport
-        properties (SetAccess=public) 
+        properties (SetAccess=public)
                  spcthickness           = NaN;
                  isfreesurface          = 0;
@@ -95 +95 @@
                         md = checkfield(md,'fieldname','masstransport.min_thickness','>',0);
                         md = checkfield(md,'fieldname','masstransport.requested_outputs','stringrow',1);
-
+                        if ~any(isnan(md.stressbalance.vertex_pairing)),
+                                md = checkfield(md,'fieldname','stressbalance.vertex_pairing','>',0);
+                        end
                 end % }}}
                 function disp(self) % {{{
@@ -122 +124 @@
                         WriteData(fid,prefix,'object',self,'fieldname','vertex_pairing','format','DoubleMat','mattype',3);
                         WriteData(fid,prefix,'object',self,'fieldname','penalty_factor','format','Double');
-                        
+
                         %process requested outputs
                         outputs = self.requested_outputs;
@@ -133 +135 @@
                 end % }}}
                 function savemodeljs(self,fid,modelname) % {{{
-                
+
                         writejs1Darray(fid,[modelname '.masstransport.spcthickness'],self.spcthickness);
                         writejsdouble(fid,[modelname '.masstransport.isfreesurface'],self.isfreesurface);

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

@@ -75 +75 @@
         md = checkfield(md, 'fieldname', 'masstransport.min_thickness', '>', 0)
         md = checkfield(md, 'fieldname', 'masstransport.requested_outputs', 'stringrow', 1)
-        if not np.any(np.isnan(self.vertex_pairing)):
-            md = checkfield(md, 'fieldname', 'masstransport.vertex_pairing', '>', 0)
+        if not np.any(np.isnan(self.vertex_pairing)) and len(self.vertex_pairing) > 0:
+            md = checkfield(md, 'fieldname', 'stressbalance.vertex_pairing', '>', 0)
 
         return md

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

@@ -5 +5 @@
 
 classdef stressbalance
-        properties (SetAccess=public) 
+        properties (SetAccess=public)
                 spcvx                  = NaN;
                 spcvy                  = NaN;
@@ -57 +57 @@
 
                          %Convergence criterion: absolute, relative and residual
-                         self.restol=10^-4; 
+                         self.restol=10^-4;
                          self.reltol=0.01;
                          self.abstol=10;
@@ -97 +97 @@
                         md = checkfield(md,'fieldname','stressbalance.loadingforce','size',[md.mesh.numberofvertices 3]);
                         md = checkfield(md,'fieldname','stressbalance.requested_outputs','stringrow',1);
-
+                        if ~any(isnan(md.stressbalance.vertex_pairing)),
+                                md = checkfield(md,'fieldname','stressbalance.vertex_pairing','>',0);
+                        end
                         %singular solution
                         if ((~(any(~isnan(md.stressbalance.spcvx)) | any(~isnan(md.stressbalance.spcvy)))) & ~any(md.mask.groundedice_levelset>0)),
@@ -202 +204 @@
                 end % }}}
                 function savemodeljs(self,fid,modelname) % {{{
-                
+
                         writejs1Darray(fid,[modelname '.stressbalance.spcvx'],self.spcvx);
                         writejs1Darray(fid,[modelname '.stressbalance.spcvy'],self.spcvy);

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

@@ -134 +134 @@
         md = checkfield(md, 'fieldname', 'stressbalance.loadingforce', 'size', [md.mesh.numberofvertices, 3])
         md = checkfield(md, 'fieldname', 'stressbalance.requested_outputs', 'stringrow', 1)
-        if not np.any(np.isnan(self.vertex_pairing)) and len(self.vertex_pairing)>0:
+        if not np.any(np.isnan(self.vertex_pairing)) and len(self.vertex_pairing) > 0:
             md = checkfield(md, 'fieldname', 'stressbalance.vertex_pairing', '>', 0)
         #singular solution