Changeset 10408

Timestamp:

11/01/11 11:40:59 (13 years ago)

Author:

seroussi

Message:

grounding lines allowed in 3d for Aggressive migration only

Location:

issm/trunk/src/m

Files:

• classes/groundingline.m (modified) (1 diff)
• classes/transient.m (modified) (1 diff)
• solutions/transient_core.m (modified) (1 diff)

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

@@ -47 +47 @@
 
                         if ~strcmp(obj.migration,'None'),
-                                if (md.mesh.dimension==3),
-                                        checkmessage(['requesting grounding line migration, but grounding line module only implemented for 2d models !']);
+                                if (md.mesh.dimension==3 & strcmpi(md.groundingline.migration,'SoftMigration')),
+                                        checkmessage(['requesting grounding line migration with SoftMigration, but only AgressiveMigration is implemented in 3d 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 grounding line migration is in 2d
-                        if md.transient.isgroundingline & md.mesh.dimension~=2
-                                checkmessage(['model not consistent: for a ' md.private.solution ' computation, the grounding line module is only implemented in 2d !']);
-                        end
-
                 end % }}}
                 function disp(obj) % {{{

issm/trunk/src/m/solutions/transient_core.m

@@ -58 +58 @@
 
                 if (isgroundingline)
-                        if (dim==3), error('grounding line migration not implemented in 3d'); end
+                        if (dim==3 & groundinglinemigration==SoftMigrationEnum), error('grounding line migration not implemented in 3d'); end
                         issmprintf(VerboseSolution,'\n%s',['   computing new grounding line']);
                         [femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters]=...