Changeset 12565

Timestamp:

06/27/12 12:10:36 (13 years ago)

Author:

utke

Message:

reCast

Location:

issm/trunk-jpl/src/c

Files:

• modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp (modified) (4 diffs)
• shared/Numerics/IsInputConverged.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp

@@ -83 +83 @@
                 iomodel->FetchData(&riftinfo,&numrifts,NULL,RiftsRiftstructEnum);
                 for(i=0;i<numrifts;i++){
-                        el1=(int)*(riftinfo+RIFTINFOSIZE*i+2)-1; //matlab indexing to c indexing
-                        el2=(int)*(riftinfo+RIFTINFOSIZE*i+3)-1; //matlab indexing to c indexing
+                        el1=reCast<int>(*(riftinfo+RIFTINFOSIZE*i+2))-1; //matlab indexing to c indexing
+                        el2=reCast<int>(*(riftinfo+RIFTINFOSIZE*i+3))-1; //matlab indexing to c indexing
                         epart[el2]=epart[el1]; //ensures that this pair of elements will be in the same partition, as well as the corresponding vertices;
                 }
@@ -107 +107 @@
                          into the vertices coordinates. If we start plugging 1 into my_vertices for each index[n][i] (i=0:2), then my_vertices 
                          will hold which vertices belong to this partition*/
-                        my_vertices[(int)*(elements+elements_width*i+0)-1]=1;
-                        my_vertices[(int)*(elements+elements_width*i+1)-1]=1;
-                        my_vertices[(int)*(elements+elements_width*i+2)-1]=1;
+                        my_vertices[reCast<int>(*(elements+elements_width*i+0))-1]=1;
+                        my_vertices[reCast<int>(*(elements+elements_width*i+1))-1]=1;
+                        my_vertices[reCast<int>(*(elements+elements_width*i+2))-1]=1;
                         
                         if(elements_width==6){
-                                my_vertices[(int)*(elements+elements_width*i+3)-1]=1;
-                                my_vertices[(int)*(elements+elements_width*i+4)-1]=1;
-                                my_vertices[(int)*(elements+elements_width*i+5)-1]=1;
+                                my_vertices[reCast<int>(*(elements+elements_width*i+3))-1]=1;
+                                my_vertices[reCast<int>(*(elements+elements_width*i+4))-1]=1;
+                                my_vertices[reCast<int>(*(elements+elements_width*i+5))-1]=1;
                         }
                 }
@@ -126 +126 @@
         iomodel->FetchData(&vertex_pairing,&numvertex_pairing,NULL,DiagnosticVertexPairingEnum);
         for(i=0;i<numvertex_pairing;i++){
-                if(my_vertices[(int)vertex_pairing[2*i+0]-1] && !my_vertices[(int)vertex_pairing[2*i+1]-1]){
-                        my_vertices[(int)vertex_pairing[2*i+1]-1]=2; //to know that these elements are not on the partition
+                if(my_vertices[reCast<int>(vertex_pairing[2*i+0])-1] && !my_vertices[reCast<int>(vertex_pairing[2*i+1])-1]){
+                        my_vertices[reCast<int>(vertex_pairing[2*i+1])-1]=2; //to know that these elements are not on the partition
                 }
         }
@@ -133 +133 @@
         iomodel->FetchData(&vertex_pairing,&numvertex_pairing,NULL,PrognosticVertexPairingEnum);
         for(i=0;i<numvertex_pairing;i++){
-                if(my_vertices[(int)vertex_pairing[2*i+0]-1] && !my_vertices[(int)vertex_pairing[2*i+1]-1]){
-                        my_vertices[(int)vertex_pairing[2*i+1]-1]=2; //to know that these elements are not on the partition
+                if(my_vertices[reCast<int>(vertex_pairing[2*i+0])-1] && !my_vertices[reCast<int>(vertex_pairing[2*i+1])-1]){
+                        my_vertices[reCast<int>(vertex_pairing[2*i+1])-1]=2; //to know that these elements are not on the partition
                 }
         }

issm/trunk-jpl/src/c/shared/Numerics/IsInputConverged.cpp

@@ -50 +50 @@
 
                 /*now, compute eps: */
-                if(nu)eps=ndu/nu;
+                if(reCast<bool>(nu))eps=ndu/nu;
                 else eps=0;
         }