Changeset 10301

Timestamp:

10/25/11 15:50:59 (13 years ago)

Author:

seroussi

Message:

grounding lines in 2d serial

Location:

issm/trunk/src/m/classes

Files:

• groundingline.m (modified) (1 diff)
• transient.m (modified) (1 diff)

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

@@ -47 +47 @@
 
                         if ~strcmp(obj.migration,'None'),
-                                if (md.mesh.dimension==3 | strcmpi(md.cluster.name,'none')),
-                                        checkmessage(['requesting grounding line migration, but grounding line module only implemented for 2d models and parallel runs!']);
+                                if (md.mesh.dimension==3),
+                                        checkmessage(['requesting grounding line migration, but grounding line module only implemented for 2d models !']);
                                 end
                                 if isnan(md.geometry.bathymetry),

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

@@ -54 +54 @@
                         checkfield(md,'transient.isgroundingline','numel',1,'values',[0 1]);
 
-                        %check that groundingline is not activated in serial model
-                        if md.transient.isgroundingline & strcmp(md.cluster.name,'none'),
-                                checkmessage(['model not consistent: ' md.private.solution ' is only implemented in parallel mode !']);
-                        end
-
                         %Check that grounding line migration is in 2d
                         if md.transient.isgroundingline & md.mesh.dimension~=2