Changeset 12557

Timestamp:

06/26/12 11:24:21 (13 years ago)

Author:

utke

Message:

use reCast

Location:

issm/trunk-jpl/src/c/objects

Files:

• Loads/Icefront.cpp (modified) (2 diffs)
• Loads/Numericalflux.cpp (modified) (1 diff)
• Materials/Matice.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/objects/Loads/Icefront.cpp

@@ -65 +65 @@
         }
         _assert_(iomodel->Data(DiagnosticIcefrontEnum));
-        element=(int)(*(iomodel->Data(DiagnosticIcefrontEnum)+segment_width*i+segment_width-2)-1); //element is in the penultimate column (node1 node2 ... elem fill)
+        element=reCast<int,IssmDouble>(*(iomodel->Data(DiagnosticIcefrontEnum)+segment_width*i+segment_width-2)-1); //element is in the penultimate column (node1 node2 ... elem fill)
 
         /*Build ids for hook constructors: */
-        icefront_eid=(int) *(iomodel->Data(DiagnosticIcefrontEnum)+segment_width*i+segment_width-2); //matlab indexing
+        icefront_eid=reCast<int,IssmDouble>( *(iomodel->Data(DiagnosticIcefrontEnum)+segment_width*i+segment_width-2)); //matlab indexing
         icefront_mparid=numberofelements+1; //matlab indexing
 
         if (in_icefront_type==MacAyeal2dIceFrontEnum || in_icefront_type==MacAyeal3dIceFrontEnum){
-                icefront_node_ids[0]=iomodel->nodecounter+(int)*(iomodel->Data(DiagnosticIcefrontEnum)+segment_width*i+0);
-                icefront_node_ids[1]=iomodel->nodecounter+(int)*(iomodel->Data(DiagnosticIcefrontEnum)+segment_width*i+1);
+                icefront_node_ids[0]=iomodel->nodecounter+reCast<int>(*(iomodel->Data(DiagnosticIcefrontEnum)+segment_width*i+0));
+                icefront_node_ids[1]=iomodel->nodecounter+reCast<int>(*(iomodel->Data(DiagnosticIcefrontEnum)+segment_width*i+1));
         }
         else if (in_icefront_type==PattynIceFrontEnum || in_icefront_type==StokesIceFrontEnum){
-                icefront_node_ids[0]=iomodel->nodecounter+(int)*(iomodel->Data(DiagnosticIcefrontEnum)+segment_width*i+0);
-                icefront_node_ids[1]=iomodel->nodecounter+(int)*(iomodel->Data(DiagnosticIcefrontEnum)+segment_width*i+1);
-                icefront_node_ids[2]=iomodel->nodecounter+(int)*(iomodel->Data(DiagnosticIcefrontEnum)+segment_width*i+2);
-                icefront_node_ids[3]=iomodel->nodecounter+(int)*(iomodel->Data(DiagnosticIcefrontEnum)+segment_width*i+3);
+                icefront_node_ids[0]=iomodel->nodecounter+reCast<int>(*(iomodel->Data(DiagnosticIcefrontEnum)+segment_width*i+0));
+                icefront_node_ids[1]=iomodel->nodecounter+reCast<int>(*(iomodel->Data(DiagnosticIcefrontEnum)+segment_width*i+1));
+                icefront_node_ids[2]=iomodel->nodecounter+reCast<int>(*(iomodel->Data(DiagnosticIcefrontEnum)+segment_width*i+2));
+                icefront_node_ids[3]=iomodel->nodecounter+reCast<int>(*(iomodel->Data(DiagnosticIcefrontEnum)+segment_width*i+3));
         }
         else _error2_("in_icefront_type " << EnumToStringx(in_icefront_type) << " not supported yet!");
@@ -89 +89 @@
 
         /*Fill*/
-        icefront_fill=(int)iomodel->Data(DiagnosticIcefrontEnum)[segment_width*i+segment_width-1];
+        icefront_fill=reCast<int>(iomodel->Data(DiagnosticIcefrontEnum)[segment_width*i+segment_width-1]);
         
         /*Ok, we have everything to build the object: */

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

@@ -62 +62 @@
         if (xIsNan<IssmDouble>((IssmDouble)iomodel->Data(MeshEdgesEnum)[4*i+3])){ //edges are [node1 node2 elem1 elem2]
                 /* Boundary edge, only one element */
-                e1=(int)iomodel->Data(MeshEdgesEnum)[4*i+2];
-                e2=(int)UNDEF;
+                e1=reCast<int>(iomodel->Data(MeshEdgesEnum)[4*i+2]);
+                e2=reCast<int>(UNDEF);
                 num_elems=1;
                 num_nodes=2;
                 numericalflux_type=BoundaryEnum;
-                numericalflux_elem_ids[0]=(int)e1;
+                numericalflux_elem_ids[0]=reCast<int>(e1);
         }
         else{
                 /* internal edge: connected to 2 elements */
-                e1=(int)iomodel->Data(MeshEdgesEnum)[4*i+2];
-                e2=(int)iomodel->Data(MeshEdgesEnum)[4*i+3];
+                e1=reCast<int>(iomodel->Data(MeshEdgesEnum)[4*i+2]);
+                e2=reCast<int>(iomodel->Data(MeshEdgesEnum)[4*i+3]);
                 num_elems=2;
                 num_nodes=4;
                 numericalflux_type=InternalEnum;
-                numericalflux_elem_ids[0]=(int)e1;
-                numericalflux_elem_ids[1]=(int)e2;
+                numericalflux_elem_ids[0]=reCast<int>(e1);
+                numericalflux_elem_ids[1]=reCast<int>(e2);
         }
 
         /*1: Get vertices ids*/
-        i1=(int)iomodel->Data(MeshEdgesEnum)[4*i+0];
-        i2=(int)iomodel->Data(MeshEdgesEnum)[4*i+1];
+        i1=reCast<int>(iomodel->Data(MeshEdgesEnum)[4*i+0]);
+        i2=reCast<int>(iomodel->Data(MeshEdgesEnum)[4*i+1]);
 
         if (numericalflux_type==InternalEnum){

issm/trunk-jpl/src/c/objects/Materials/Matice.cpp

@@ -677 +677 @@
                 /*Get B*/
                 if (iomodel->Data(MaterialsRheologyBEnum)) {
-                        for(i=0;i<num_vertices;i++) nodeinputs[i]=iomodel->Data(MaterialsRheologyBEnum)[int(iomodel->Data(MeshElementsEnum)[num_vertices*index+i]-1)];
+                        for(i=0;i<num_vertices;i++) nodeinputs[i]=iomodel->Data(MaterialsRheologyBEnum)[reCast<int,IssmDouble>(iomodel->Data(MeshElementsEnum)[num_vertices*index+i]-1)];
                         this->inputs->AddInput(new TriaP1Input(MaterialsRheologyBbarEnum,nodeinputs));
                 }