Changeset 4456

Timestamp:

07/08/10 08:25:07 (15 years ago)

Author:

seroussi

Message:

fixed problem with nodes in loads -> node_id depend on iomodel->nodecounter

Location:

issm/trunk/src/c/objects/Loads

Files:

• Icefront.cpp (modified) (3 diffs)
• Numericalflux.cpp (modified) (2 diffs)
• Pengrid.cpp (modified) (1 diff)
• Riftfront.cpp (modified) (1 diff)

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

@@ -56 +56 @@
         icefront_mparid=iomodel->numberofelements+1; //matlab indexing
 
-        icefront_node_ids[0]=(int)*(iomodel->pressureload+segment_width*i+0);
-        icefront_node_ids[1]=(int)*(iomodel->pressureload+segment_width*i+1);
+        icefront_node_ids[0]=iomodel->nodecounter+(int)*(iomodel->pressureload+segment_width*i+0);
+        icefront_node_ids[1]=iomodel->nodecounter+(int)*(iomodel->pressureload+segment_width*i+1);
 
         if (in_analysis_type==DiagnosticHorizAnalysisEnum){
@@ -65 +65 @@
                 else if ((int)*(iomodel->elements_type+2*element+0)==PattynFormulationEnum){ //this is a real 3d element, icefront will be 3d.
                         icefront_type=QuadIceFrontEnum;
-                        icefront_node_ids[2]=(int)*(iomodel->pressureload+segment_width*i+2);
-                        icefront_node_ids[3]=(int)*(iomodel->pressureload+segment_width*i+3);
+                        icefront_node_ids[2]=iomodel->nodecounter+(int)*(iomodel->pressureload+segment_width*i+2);
+                        icefront_node_ids[3]=iomodel->nodecounter+(int)*(iomodel->pressureload+segment_width*i+3);
                 }
                 else ISSMERROR(" element type %i not supported yet",(int)*(iomodel->elements_type+2*element+0));
@@ -73 +73 @@
                 //We have a Stokes element, so we need a 3d Icefront
                 icefront_type=QuadIceFrontEnum;
-                icefront_node_ids[2]=(int)*(iomodel->pressureload+segment_width*i+2);
-                icefront_node_ids[3]=(int)*(iomodel->pressureload+segment_width*i+3);
+                icefront_node_ids[2]=iomodel->nodecounter+(int)*(iomodel->pressureload+segment_width*i+2);
+                icefront_node_ids[3]=iomodel->nodecounter+(int)*(iomodel->pressureload+segment_width*i+3);
         }
         else ISSMERROR("analysis_type %s not supported yet!",EnumAsString(in_analysis_type));

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

@@ -86 +86 @@
                 /*3: We have the id of the elements and the position of the vertices in the index
                  * we can compute their dofs!*/
-                numericalflux_node_ids[0]=3*(e1-1)+pos1;       //ex: 1 2 3
-                numericalflux_node_ids[1]=3*(e1-1)+(pos1%3)+1; //ex: 2 3 1
-                numericalflux_node_ids[2]=3*(e2-1)+pos2;           //ex: 1 2 3
-                numericalflux_node_ids[3]=3*(e2-1)+((pos2+1)%3)+1; //ex: 3 1 2
+                numericalflux_node_ids[0]=iomodel->nodecounter+3*(e1-1)+pos1;       //ex: 1 2 3
+                numericalflux_node_ids[1]=iomodel->nodecounter+3*(e1-1)+(pos1%3)+1; //ex: 2 3 1
+                numericalflux_node_ids[2]=iomodel->nodecounter+3*(e2-1)+pos2;           //ex: 1 2 3
+                numericalflux_node_ids[3]=iomodel->nodecounter+3*(e2-1)+((pos2+1)%3)+1; //ex: 3 1 2
         }
         else{
@@ -102 +102 @@
                 /*3: We have the id of the elements and the position of the vertices in the index
                  * we can compute their dofs!*/
-                numericalflux_node_ids[0]=3*(e1-1)+pos1;
-                numericalflux_node_ids[1]=3*(e1-1)+(pos1%3)+1;
+                numericalflux_node_ids[0]=iomodel->nodecounter+3*(e1-1)+pos1;
+                numericalflux_node_ids[1]=iomodel->nodecounter+3*(e1-1)+(pos1%3)+1;
         }
 

issm/trunk/src/c/objects/Loads/Pengrid.cpp

@@ -50 +50 @@
         
         /*hooks: */
-        pengrid_node_id=index+1;
+        pengrid_node_id=iomodel->nodecounter+index+1;
         pengrid_element_id=iomodel->singlenodetoelementconnectivity[index];
         pengrid_matpar_id=iomodel->numberofelements+1; //refers to the constant material parameters object

issm/trunk/src/c/objects/Loads/Riftfront.cpp

@@ -58 +58 @@
 
         /*hooks: */
-        riftfront_node_ids[0]=grid1;
-        riftfront_node_ids[1]=grid2;
+        riftfront_node_ids[0]=iomodel->nodecounter+grid1;
+        riftfront_node_ids[1]=iomodel->nodecounter+grid2;
         riftfront_matpar_id=iomodel->numberofelements+1; //matlab indexing