Changeset 12574

Timestamp:

06/27/12 15:27:39 (13 years ago)

Author:

Mathieu Morlighem

Message:

edges now do not hold NaN anymore but -1, no more cast from double to int in edges

Location:

issm/trunk-jpl/src/c

Files:

• modules/ModelProcessorx/NodesPartitioning.cpp (modified) (4 diffs)
• objects/Bamg/Mesh.cpp (modified) (1 diff)
• objects/IoModel.cpp (modified) (2 diffs)
• objects/Loads/Numericalflux.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/modules/ModelProcessorx/NodesPartitioning.cpp ¶

@@ -69 +69 @@
         bool*   my_nodes=NULL;
 
-        int     i1,i2;
-        int     cols;
-        IssmDouble  e1,e2;
-        int     pos;
-        int     numberofedges;
-        IssmDouble* edges=NULL;
-        IssmDouble* elements=NULL;
+        int  i1,i2;
+        int  cols;
+        int  e1,e2;
+        int  pos;
+        int  numberofedges;
+        int *edges         = NULL;
+        int *elements      = NULL;
 
         /*Fetch parameters: */
@@ -125 +125 @@
                  * we must clone the nodes on this partition so that the loads (Numericalflux)
                  * will have access to their properties (dofs,...)*/
-                if(my_elements[reCast<int>(e1)] && !xIsNan<IssmDouble>(e2) && !my_elements[reCast<int>(e2)]){
+                if(my_elements[e1] && e2!=-2 && !my_elements[e2]){
 
                         /*1: Get vertices ids*/
-                        i1=reCast<int>(edges[4*i+0]);
-                        i2=reCast<int>(edges[4*i+1]);
+                        i1=edges[4*i+0];
+                        i2=edges[4*i+1];
 
                         /*2: Get the column where these ids are located in the index*/
                         pos=UNDEF;
                         for(j=0;j<3;j++){
-                                if (reCast<int>(elements[3*(reCast<int>(e2))+j])==i1) pos=j;
+                                if (elements[3*e2+j]==i1) pos=j;
                         }
 
@@ -140 +140 @@
                          * we can now create the corresponding nodes:*/
                         if (pos==0){
-                                my_nodes[reCast<int>(e2)*3+0]=true;
-                                my_nodes[reCast<int>(e2)*3+2]=true;
+                                my_nodes[e2*3+0]=true;
+                                my_nodes[e2*3+2]=true;
                         }
                         else if(pos==1){
-                                my_nodes[reCast<int>(e2)*3+1]=true;
-                                my_nodes[reCast<int>(e2)*3+0]=true;
+                                my_nodes[e2*3+1]=true;
+                                my_nodes[e2*3+0]=true;
                         }
                         else if (pos==2){
-                                my_nodes[reCast<int>(e2)*3+2]=true;
-                                my_nodes[reCast<int>(e2)*3+1]=true;
+                                my_nodes[e2*3+2]=true;
+                                my_nodes[e2*3+1]=true;
                         }
                         else{
@@ -158 +158 @@
 
         /*Free data: */
-        xDelete<IssmDouble>(elements);
-        xDelete<IssmDouble>(edges);
+        xDelete<int>(elements);
+        xDelete<int>(edges);
 
         /*Assign output pointers:*/

issm/trunk-jpl/src/c/objects/Bamg/Mesh.cpp ¶

@@ -618 +618 @@
                 double* elemedge=NULL;
                 elemedge=xNew<double>(3*nbt);
-                for (i=0;i<3*nbt;i++) elemedge[i]=NAN;
+                for (i=0;i<3*nbt;i++) elemedge[i]=-2.;//will become -1
                 k=0;
                 for (i=0;i<nbt;i++){

issm/trunk-jpl/src/c/objects/IoModel.cpp ¶

@@ -474 +474 @@
         extern int my_rank;
         extern int num_procs;
-        
 
         /*output: */
@@ -496 +495 @@
         /*Assign output pointers: */
         *pinteger=integer;
-
 }
 /*}}}*/

issm/trunk-jpl/src/c/objects/Loads/Numericalflux.cpp ¶

@@ -59 +59 @@
         numericalflux_mparid=numberofelements+1; //matlab indexing
 
-        /*First, see wether this is an internal or boundary edge (if e2=NaN)*/
-        if (xIsNan<IssmDouble>((IssmDouble)iomodel->Data(MeshEdgesEnum)[4*i+3])){ //edges are [node1 node2 elem1 elem2]
+        /*First, see wether this is an internal or boundary edge (if e2=-1)*/
+        if (iomodel->Data(MeshEdgesEnum)[4*i+3]==-1.){ //edges are [node1 node2 elem1 elem2]
                 /* Boundary edge, only one element */
                 e1=reCast<int>(iomodel->Data(MeshEdgesEnum)[4*i+2]);
@@ -67 +67 @@
                 num_nodes=2;
                 numericalflux_type=BoundaryEnum;
-                numericalflux_elem_ids[0]=reCast<int>(e1);
+                numericalflux_elem_ids[0]=e1;
         }
         else{
@@ -76 +76 @@
                 num_nodes=4;
                 numericalflux_type=InternalEnum;
-                numericalflux_elem_ids[0]=reCast<int>(e1);
-                numericalflux_elem_ids[1]=reCast<int>(e2);
+                numericalflux_elem_ids[0]=e1;
+                numericalflux_elem_ids[1]=e2;
         }