Changeset 26023

Timestamp:

02/22/21 16:19:16 (4 years ago)

Author:

bulthuis

Message:

CGH: checkfield samplingbeta only for sampling.robin

Location:

issm/trunk-jpl/src/m/classes

Files:

• sampling.m (modified) (1 diff)
• sampling.py (modified) (1 diff)

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

@@ -66 +66 @@
             md = checkfield(md,'fieldname','sampling.kappa','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1],'>',0);
             md = checkfield(md,'fieldname','sampling.tau','NaN',1,'Inf',1,'numel',1,'>',0);
-            md = checkfield(md,'fieldname','sampling.beta','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1],'>',0);
+            md = checkfield(md,'fieldname','sampling.robin','numel',1,'values',[0 1]);
+            if(md.sampling.robin)
+                md = checkfield(md,'fieldname','sampling.beta','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1],'>',0);
+            end    
             md = checkfield(md,'fieldname','sampling.phi','NaN',1,'Inf',1,'numel',1,'>=',0);
             md = checkfield(md,'fieldname','sampling.alpha','NaN',1,'Inf',1,'numel',1,'>',0);
-            md = checkfield(md,'fieldname','sampling.robin','numel',1,'values',[0 1]);
             md = checkfield(md,'fieldname','sampling.seed','NaN',1,'Inf',1,'numel',1);
             md = checkfield(md,'fieldname','sampling.requested_outputs','stringrow',1);

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

@@ -70 +70 @@
         md = checkfield(md,'fieldname','sampling.kappa','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices],'>',0)
         md = checkfield(md,'fieldname','sampling.tau','NaN',1,'Inf',1,'numel',1,'>',0)
-        md = checkfield(md,'fieldname','sampling.beta','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices],'>',0)
+        md = checkfield(md,'fieldname','sampling.robin','numel',1,'values',[0, 1])
+        if md.sampling.robin:
+            md = checkfield(md,'fieldname','sampling.beta','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices],'>',0)
         md = checkfield(md,'fieldname','sampling.phi','NaN',1,'Inf',1,'numel',1,'>=',0)
         md = checkfield(md,'fieldname','sampling.alpha','NaN',1,'Inf',1,'numel',1,'>',0)
-        md = checkfield(md,'fieldname','sampling.robin','numel',1,'values',[0, 1])
         md = checkfield(md,'fieldname','sampling.seed','NaN',1,'Inf',1,'numel',1)
         md = checkfield(md,'fieldname','sampling.requested_outputs','stringrow',1)