Changeset 16435

Timestamp:

10/16/13 15:01:25 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing free surfaces

Location:

issm/trunk-jpl/src/c

Files:

• classes/Node.cpp (modified) (1 diff)
• modules/ModelProcessorx/FreeSurfaceTop/CreateNodesFreeSurfaceTop.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Node.cpp

@@ -104 +104 @@
         }
         if(analysis_type==FreeSurfaceTopAnalysisEnum){
-                if(iomodel->meshtype==Mesh3DEnum){
+                if(iomodel->meshtype==Mesh3DEnum || iomodel->meshtype==Mesh2DverticalEnum){
                         /*On a 3d mesh, we may have collapsed elements, hence dead nodes. Freeze them out: */
                         _assert_(iomodel->Data(MeshVertexonsurfaceEnum));

issm/trunk-jpl/src/c/modules/ModelProcessorx/FreeSurfaceTop/CreateNodesFreeSurfaceTop.cpp

@@ -12 +12 @@
 
         /*Create Nodes either DG or CG depending on stabilization*/
-        if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum);
+        if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum);
         CreateNodes(pnodes,iomodel,FreeSurfaceTopAnalysisEnum,P1Enum);
         iomodel->DeleteData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum);