Changeset 12878 for issm/branches/trunk-jpl-damage/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp

Timestamp:

08/02/12 17:13:12 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into trunk-jpl-damage through revision 12877

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp (modified) (5 diffs)

issm/branches/trunk-jpl-damage/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp

@@ -6 +6 @@
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../../include/include.h"
@@ -47 +47 @@
 
                         /*Get left and right elements*/
-                        element=(int)(iomodel->Data(MeshEdgesEnum)[4*i+2])-1; //edges are [node1 node2 elem1 elem2]
+                        element=reCast<int>(iomodel->Data(MeshEdgesEnum)[4*i+2])-1; //edges are [node1 node2 elem1 elem2]
 
                         /*Now, if this element is not in the partition, pass: */
@@ -61 +61 @@
 
         /*Create Penpair for vertex_pairing: */
-        double *vertex_pairing=NULL;
-        double *nodeonbed=NULL;
+        IssmDouble *vertex_pairing=NULL;
+        IssmDouble *nodeonbed=NULL;
         iomodel->FetchData(&vertex_pairing,&numvertex_pairing,NULL,PrognosticVertexPairingEnum);
         iomodel->FetchData(&nodeonbed,NULL,NULL,MeshVertexonbedEnum);
@@ -68 +68 @@
         for(i=0;i<numvertex_pairing;i++){
 
-                if(iomodel->my_vertices[(int)vertex_pairing[2*i+0]-1]){
+                if(iomodel->my_vertices[reCast<int>(vertex_pairing[2*i+0])-1]){
 
                         /*In debugging mode, check that the second node is in the same cpu*/
-                        _assert_(iomodel->my_vertices[(int)vertex_pairing[2*i+1]-1]);
+                        _assert_(iomodel->my_vertices[reCast<int>(vertex_pairing[2*i+1])-1]);
 
                         /*Skip if one of the two is not on the bed*/
-                        if(!nodeonbed[(int)vertex_pairing[2*i+0]-1] || !nodeonbed[(int)vertex_pairing[2*i+1]-1]) continue;
+                        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*/
-                        penpair_ids[0]=iomodel->nodecounter+(int)vertex_pairing[2*i+0];
-                        penpair_ids[1]=iomodel->nodecounter+(int)vertex_pairing[2*i+1];
+                        penpair_ids[0]=iomodel->nodecounter+reCast<int>(vertex_pairing[2*i+0]);
+                        penpair_ids[1]=iomodel->nodecounter+reCast<int>(vertex_pairing[2*i+1]);
 
                         /*Create Load*/
@@ -90 +90 @@
 
         /*free ressources: */
-        xfree((void**)&vertex_pairing);
-        xfree((void**)&nodeonbed);
-
+        xDelete<IssmDouble>(vertex_pairing);
+        xDelete<IssmDouble>(nodeonbed);
 
         /*Assign output pointer: */