Changeset 4426

Timestamp:

07/07/10 10:42:36 (15 years ago)

Author:

Mathieu Morlighem

Message:

minor

File:

• issm/trunk/src/c/objects/Loads/Numericalflux.cpp (modified) (7 diffs)

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

@@ -391 +391 @@
         /*dynamic objects pointed to by hooks: */
         Node**  nodes=NULL;
-        Tria**  trias=NULL;
 
         /*Retrieve parameters: */
@@ -398 +397 @@
         /*recover objects from hooks: */
         nodes=(Node**)hnodes->deliverp();
-        trias=(Tria**)helements->deliverp();
 
         /*recover parameters: */
@@ -510 +508 @@
         /*dynamic objects pointed to by hooks: */
         Node**  nodes=NULL;
-        Tria**  trias=NULL;
 
         /*Retrieve parameters: */
@@ -517 +514 @@
         /*recover objects from hooks: */
         nodes=(Node**)hnodes->deliverp();
-        trias=(Tria**)helements->deliverp();
 
         /*recover parameters: */
@@ -639 +635 @@
         /*dynamic objects pointed to by hooks: */
         Node**  nodes=NULL;
-        Tria**  trias=NULL;
 
         /*recover objects from hooks: */
         nodes=(Node**)hnodes->deliverp();
-        trias=(Tria**)helements->deliverp();
 
         /*Retrieve parameters: */
@@ -843 +837 @@
 
         /*dynamic objects pointed to by hooks: */
-        Tria**  trias=NULL;
-        Node**  nodes=NULL;
+        Tria*  tria=NULL;
+        Node** nodes=NULL;
 
         /*recover type: */
@@ -851 +845 @@
 
         /*recover objects from hooks: */
-        trias=(Tria**)helements->deliverp();
+        tria=(Tria*)helements[0].deliverp();
         nodes=(Node**)hnodes->deliverp();
 
-        if (type==InternalEnum){
-                /*Get value on Element 1 and 2 and take the average*/
-                trias[0]->GetParameterValue(&value1,nodes[0],nodes[1],gauss_coord,enumtype);
-                trias[1]->GetParameterValue(&value2,nodes[2],nodes[3],gauss_coord,enumtype);
-                value=0.5*(value1+value2);
-        }
-        else{
-                /*Get value on Element*/
-                trias[0]->GetParameterValue(&value,nodes[0],nodes[1],gauss_coord,enumtype);
-        }
+        /*Get value on Element 1*/
+        tria->GetParameterValue(&value,nodes[0],nodes[1],gauss_coord,enumtype);
 
         /*Assign output pointers:*/