Changeset 16458

Timestamp:

10/18/13 12:48:38 (11 years ago)

Author:

seroussi

Message:

BUG: changing checkconsistency for requested_outpus

Location:

issm/trunk-jpl/src/m/classes

Files:

• masstransport.m (modified) (1 diff)
• masstransport.py (modified) (1 diff)
• steadystate.m (modified) (1 diff)
• steadystate.py (modified) (1 diff)
• stressbalance.m (modified) (1 diff)
• stressbalance.py (modified) (1 diff)
• transient.m (modified) (1 diff)
• transient.py (modified) (1 diff)

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

@@ -84 +84 @@
                         md = checkfield(md,'masstransport.stabilization','values',[0 1 2 3]);
                         md = checkfield(md,'masstransport.min_thickness','>',0);
-                        if ~isempty(md.masstransport.requested_outputs),
-                                md = checkfield(md,'masstransport.requested_outputs','size',[1 NaN]);
-                        end
+                        md = checkfield(md,'masstransport.requested_outputs','stringrow',1);
 
                 end % }}}

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

@@ -65 +65 @@
                 md = checkfield(md,'masstransport.stabilization','values',[0,1,2,3])
                 md = checkfield(md,'masstransport.min_thickness','>',0)
-                if md.masstransport.requested_outputs:
-                        md = checkfield(md,'masstransport.requested_outputs','cell',1)
+                md = checkfield(md,'masstransport.requested_outputs','stringrow',1)
 
                 return md

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

@@ -34 +34 @@
                                 md = checkmessage(md,['for a steadystate computation, timestepping.time_step must be zero.']);
                         end
+                        md = checkfield(md,'steadystate.requested_outputs','stringrow',1);
 
                         if isnan(md.stressbalance.reltol),

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

@@ -51 +51 @@
                         md.checkmessage("for a steadystate computation, stressbalance.reltol (relative convergence criterion) must be defined!")
 
-                if md.steadystate.requested_outputs:
-                        md = checkfield(md,'steadystate.requested_outputs','cell',1)
+                md = checkfield(md,'steadystate.requested_outputs','stringrow',1)
 
                 return md

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

@@ -91 +91 @@
                         md = checkfield(md,'stressbalance.referential','size',[md.mesh.numberofvertices 6]);
                         md = checkfield(md,'stressbalance.loadingforce','size',[md.mesh.numberofvertices 3]);
-                        if ~isempty(md.stressbalance.requested_outputs),
-                                md = checkfield(md,'stressbalance.requested_outputs','size',[1 NaN]);
-                        end
+                        md = checkfield(md,'stressbalance.requested_outputs','stringrow',1);
 
                         %singular solution

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

@@ -123 +123 @@
                 md = checkfield(md,'stressbalance.referential','size',[md.mesh.numberofvertices,6])
                 md = checkfield(md,'stressbalance.loadingforce','size',[md.mesh.numberofvertices,3])
-                if md.stressbalance.requested_outputs:
-                        md = checkfield(md,'stressbalance.requested_outputs','cell',1);
+                md = checkfield(md,'stressbalance.requested_outputs','stringrow',1);
 
                 #singular solution

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

@@ -45 +45 @@
                         md = checkfield(md,'transient.isgia','numel',[1],'values',[0 1]);
                         md = checkfield(md,'transient.isdamage','numel',[1],'values',[0 1]);
-                        if ~isempty(md.transient.requested_outputs),
-                                md = checkfield(md,'transient.requested_outputs','size',[1 NaN]);
-                        end
+                        md = checkfield(md,'transient.requested_outputs','stringrow',1);
 
                 end % }}}

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

@@ -56 +56 @@
                 md = checkfield(md,'transient.isgroundingline','numel',[1],'values',[0,1])
                 md = checkfield(md,'transient.isgia','numel',[1],'values',[0,1])
-                if md.transient.requested_outputs:
-                        md = checkfield(md,'transient.requested_outputs','cell',1)
+                md = checkfield(md,'transient.requested_outputs','stringrow',1)
 
                 return md