Changeset 12663 for issm/trunk-jpl/src/m/classes/rifts.m

Timestamp:

07/19/12 15:32:17 (13 years ago)

Author:

Mathieu Morlighem

Message:

ismodelselfconsistant now uses a model field instead of a persistent variable

File:

• issm/trunk-jpl/src/m/classes/rifts.m (modified) (2 diffs)

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

@@ -21 +21 @@
 
                 end % }}}
-                function checkconsistency(obj,md,solution,analyses) % {{{
+                function md = checkconsistency(obj,md,solution,analyses) % {{{
                         if isempty(obj.riftstruct) | isnans(obj.riftstruct),
                                 numrifts=0;
@@ -29 +29 @@
                         if numrifts,
                                 if ~(md.mesh.dimension==2),
-                                        checkmessage(['models with rifts are only supported in 2d for now!']);
+                                        md = checkmessage(md,['models with rifts are only supported in 2d for now!']);
                                 end
                                 if ~isstruct(obj.riftstruct),
-                                        checkmessage(['rifts.riftstruct should be a structure!']);
+                                        md = checkmessage(md,['rifts.riftstruct should be a structure!']);
                                 end
                                 if ~isempty(find(md.mesh.segmentmarkers>=2)),
                                         %We have segments with rift markers, but no rift structure!
-                                        checkmessage(['model should be processed for rifts (run meshprocessrifts)!']);
+                                        md = checkmessage(md,['model should be processed for rifts (run meshprocessrifts)!']);
                                 end
-                                checkfield(md,'rifts.riftstruct.fill','values',[WaterEnum() AirEnum() IceEnum() MelangeEnum()]);
+                                md = checkfield(md,'rifts.riftstruct.fill','values',[WaterEnum() AirEnum() IceEnum() MelangeEnum()]);
                         else
                                 if ~isnans(obj.riftstruct),
-                                        checkmessage(['riftstruct shoud be NaN since numrifts is 0!']);
+                                        md = checkmessage(md,['riftstruct shoud be NaN since numrifts is 0!']);
                                 end
                         end