Changeset 16764 for issm/trunk-jpl/src/m/classes/damage.m

Timestamp:

11/14/13 14:50:13 (11 years ago)

Author:

Eric.Larour

Message:

CHG: checkfield could not run for massatfluggate or misfit classes, because these classes do not
have access to their own fields through the model! So we modified checkfield.m and checkfield.py to accept
either directly a field, or indirectly a fieldname which then is used to retrieve from the model.

File:

• issm/trunk-jpl/src/m/classes/damage.m (modified) (1 diff)

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

@@ -80 +80 @@
                 function md = checkconsistency(obj,md,solution,analyses) % {{{
                         
-                        md = checkfield(md,'damage.D','>=',0,'<=',obj.max_damage,'size',[md.mesh.numberofvertices 1]);
-                        md = checkfield(md,'damage.max_damage','<',1,'>=',0);
-                        md = checkfield(md,'damage.law','values',{'undamaged','pralong'});
-                        md = checkfield(md,'damage.spcdamage','forcing',1);
+                        md = checkfield(md,'fieldname','damage.D','>=',0,'<=',obj.max_damage,'size',[md.mesh.numberofvertices 1]);
+                        md = checkfield(md,'fieldname','damage.max_damage','<',1,'>=',0);
+                        md = checkfield(md,'fieldname','damage.law','values',{'undamaged','pralong'});
+                        md = checkfield(md,'fieldname','damage.spcdamage','forcing',1);
                         
-                        md = checkfield(md,'damage.stabilization','numel',[1],'values',[0 1 2]);
-                        md = checkfield(md,'damage.maxiter','>=0',0);
-                        md = checkfield(md,'damage.penalty_factor','>=0',0);
-                        md = checkfield(md,'damage.penalty_lock','>=0',0);
-                        md = checkfield(md,'damage.penalty_threshold','>=0',0);
+                        md = checkfield(md,'fieldname','damage.stabilization','numel',[1],'values',[0 1 2]);
+                        md = checkfield(md,'fieldname','damage.maxiter','>=0',0);
+                        md = checkfield(md,'fieldname','damage.penalty_factor','>=0',0);
+                        md = checkfield(md,'fieldname','damage.penalty_lock','>=0',0);
+                        md = checkfield(md,'fieldname','damage.penalty_threshold','>=0',0);
 
                         if strcmpi(obj.law,'pralong'),
-                                md = checkfield(md,'damage.healing','>=',0);
-                                md = checkfield(md,'damage.c1','>=',0);
-                                md = checkfield(md,'damage.c2','>=',0);
-                                md = checkfield(md,'damage.c3','>=',0);
-                                md = checkfield(md,'damage.c4','>=',0);
-                                md = checkfield(md,'damage.stress_threshold','>=',0);
+                                md = checkfield(md,'fieldname','damage.healing','>=',0);
+                                md = checkfield(md,'fieldname','damage.c1','>=',0);
+                                md = checkfield(md,'fieldname','damage.c2','>=',0);
+                                md = checkfield(md,'fieldname','damage.c3','>=',0);
+                                md = checkfield(md,'fieldname','damage.c4','>=',0);
+                                md = checkfield(md,'fieldname','damage.stress_threshold','>=',0);
                         elseif strcmpi(obj.law,'undamaged'),
                                 if (solution==DamageEvolutionSolutionEnum),