Changeset 9383

Timestamp:

08/23/11 10:46:27 (14 years ago)

Author:

Mathieu Morlighem

Message:

segfault fixes

Location:

issm/trunk/src/c

Files:

• modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp (modified) (1 diff)
• modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp (modified) (2 diffs)
• objects/Elements/Penta.cpp (modified) (1 diff)

issm/trunk/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp

@@ -44 +44 @@
 
                         /*Get left and right elements*/
-                        element=(int)iomodel->f(EdgesEnum)[4*i+2]-1; //edges are [node1 node2 elem1 elem2]
+                        element=(int)(iomodel->f(EdgesEnum)[4*i+2])-1; //edges are [node1 node2 elem1 elem2]
 
                         /*Now, if this element is not in the partition, pass: */

issm/trunk/src/c/modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp

@@ -49 +49 @@
 
         /*First fetch data: */
-        iomodel->FetchData(6,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum);
+        iomodel->FetchData(7,ElementsEnum,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum);
         if(continuous_galerkin){
 
@@ -88 +88 @@
 
         /*Clean fetched data: */
-        iomodel->DeleteData(6,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum);
+        iomodel->DeleteData(7,ElementsEnum,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum);
 
         /*Assign output pointer: */

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -7515 +7515 @@
         int     prognostic_DG;
         bool    qmu_analysis;
-        int     isstokes;
+        bool    isstokes;
         double  beta,heatcapacity,referencetemperature,meltingpoint,latentheat;