Changeset 14004

Timestamp:

11/27/12 09:37:01 (12 years ago)

Author:

jschierm

Message:

CHG: Check upperelements and lowerelements for both NaN (for Matlab) and -1 (for Python).

File:

• issm/trunk-jpl/src/c/classes/objects/Elements/Penta.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/objects/Elements/Penta.cpp

@@ -66 +66 @@
 
         /*Build neighbors list*/
-        if (xIsNan<IssmDouble>(iomodel->Data(MeshUpperelementsEnum)[index])) penta_elements_ids[1]=this->id; //upper penta is the same penta
+        if (xIsNan<IssmDouble>(iomodel->Data(MeshUpperelementsEnum)[index]) || iomodel->Data(MeshUpperelementsEnum)[index]==-1.) penta_elements_ids[1]=this->id; //upper penta is the same penta
         else                                    penta_elements_ids[1]=reCast<int,IssmDouble>((iomodel->Data(MeshUpperelementsEnum)[index]));
-        if (xIsNan<IssmDouble>(iomodel->Data(MeshLowerelementsEnum)[index])) penta_elements_ids[0]=this->id; //lower penta is the same penta
+        if (xIsNan<IssmDouble>(iomodel->Data(MeshLowerelementsEnum)[index]) || iomodel->Data(MeshLowerelementsEnum)[index]==-1.) penta_elements_ids[0]=this->id; //lower penta is the same penta
         else                                    penta_elements_ids[0]=reCast<int,IssmDouble>((iomodel->Data(MeshLowerelementsEnum)[index]));
         this->InitHookNeighbors(penta_elements_ids);