Changeset 10446

Timestamp:

11/03/11 09:07:01 (13 years ago)

Author:

seroussi

Message:

minor cleaning

Location:

issm/trunk/src

Files:

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

issm/trunk/src/c/solutions/transient_core.cpp

@@ -97 +97 @@
 
                 if(isgroundingline){
-                //      if(dim==3) _error_("Grounding line migration not implemented in 3d");
                         _printf_(VerboseSolution(),"   computing new grounding line position\n");
                         #ifdef _HAVE_GROUNDINGLINE_

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

@@ -47 +47 @@
 
                         if ~strcmp(obj.migration,'None'),
-        %                       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),
                                         checkmessage(['requesting grounding line migration, but bathymetry is absent!']);

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

@@ -58 +58 @@
 
                 if (isgroundingline)
-                %       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]=...