Changeset 12580

Timestamp:

06/29/12 07:53:52 (13 years ago)

Author:

utke

Message:

recast

Location:

issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic

Files:

• CreateLoadsPrognostic.cpp (modified) (2 diffs)
• CreateNodesPrognostic.cpp (modified) (1 diff)

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

@@ -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: */
@@ -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*/

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

@@ -72 +72 @@
 
                                         //Get index of the vertex on which the current node is located
-                                        vertex_id=(int)*(iomodel->Data(MeshElementsEnum)+3*i+j); //(Matlab indexing)
+                                        vertex_id=reCast<int>(*(iomodel->Data(MeshElementsEnum)+3*i+j)); //(Matlab indexing)
                                         io_index=vertex_id-1;                      //(C indexing)
                                         _assert_(vertex_id>0 && vertex_id<=numberofvertices);