Changeset 13020 for issm/trunk-jpl/src/m/classes/groundingline.m

Timestamp:

08/13/12 14:41:11 (13 years ago)

Author:

jschierm

Message:

NEW: Still another bunch more python checkconsistency and marshall methods for sub-classes (plus other minor changes).

File:

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

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

@@ -36 +36 @@
                                         md = checkmessage(md,['requesting grounding line migration, but bathymetry is absent!']);
                                 end
-                                pos=find(md.mask.vertexongroundedice); 
+                                pos=find(md.mask.vertexongroundedice);
                                 if any(abs(md.geometry.bed(pos)-md.geometry.bathymetry(pos))>10^-10),
-                                        md = checkmessage(md,['bathymetry not equal to bed on grounded ice !']);
+                                        md = checkmessage(md,['bathymetry not equal to bed on grounded ice!']);
                                 end
-                                pos=find(md.mask.vertexonfloatingice); 
+                                pos=find(md.mask.vertexonfloatingice);
                                 if any(md.geometry.bathymetry(pos)-md.geometry.bed(pos)>10^-9),
-                                        md = checkmessage(md,['bathymetry superior to bed on floating ice !']);
+                                        md = checkmessage(md,['bathymetry superior to bed on floating ice!']);
                                 end
                         end
@@ -55 +55 @@
                 end % }}}
                 function marshall(obj,fid) % {{{
-                        WriteData(fid,'data',StringToEnum(obj.migration),'enum',GroundinglineMigrationEnum,'format','Integer');
+                        WriteData(fid,'data',StringToEnum(obj.migration),'enum',GroundinglineMigrationEnum(),'format','Integer');
                         WriteData(fid,'object',obj,'fieldname','melting_rate','format','Double');
                 end % }}}