Changeset 17516 for issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp

Timestamp:

03/21/14 21:07:11 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: cosmetics, removed penalties from damage transient, merged some functions from Tria and Penta to Element

File:

• issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp

@@ -60 +60 @@
         IssmDouble *nodeonbed=NULL;
         iomodel->FetchData(&vertex_pairing,&numvertex_pairing,NULL,MasstransportVertexPairingEnum);
-        iomodel->FetchData(&nodeonbed,NULL,NULL,MeshVertexonbedEnum);
+        if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(&nodeonbed,NULL,NULL,MeshVertexonbedEnum);
         for(int i=0;i<numvertex_pairing;i++){
 
@@ -69 +69 @@
 
                         /*Skip if one of the two is not on the bed*/
-                        if(!(reCast<bool>(nodeonbed[reCast<int>(vertex_pairing[2*i+0])-1])) || !(reCast<bool>(nodeonbed[reCast<int>(vertex_pairing[2*i+1])-1]))) continue;
+                        if(iomodel->meshtype!=Mesh2DhorizontalEnum){
+                                if(!(reCast<bool>(nodeonbed[reCast<int>(vertex_pairing[2*i+0])-1])) || !(reCast<bool>(nodeonbed[reCast<int>(vertex_pairing[2*i+1])-1]))) continue;
+                        }
 
                         /*Get node ids*/