Changeset 5737

Timestamp:

09/09/10 16:49:06 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added Hooked object as class fields

Location:

issm/trunk/src/c/objects/Loads

Files:

• Numericalflux.cpp (modified) (16 diffs)
• Numericalflux.h (modified) (1 diff)

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

@@ -24 +24 @@
         this->parameters=NULL;
         this->helement=NULL;
+        this->element=NULL;
         this->hnodes=NULL;
+        this->nodes=NULL;
 }
 /*}}}*/
@@ -123 +125 @@
         //this->parameters: we still can't point to it, it may not even exist. Configure will handle this.
         this->parameters=NULL;
+        this->element=NULL;
+        this->nodes=NULL;
 }
 /*}}}*/
@@ -248 +252 @@
         /*parameters: may not exist even yet, so let Configure handle it: */
         this->parameters=NULL;
+        this->element=NULL;
+        this->nodes=NULL;
 
         /*return: */
@@ -284 +290 @@
         numericalflux->helement=(Hook*)this->helement->copy();
 
+        /*corresponding fields*/
+        numericalflux->nodes  =(Node**)numericalflux->hnodes->deliverp();
+        numericalflux->element=(Element*)numericalflux->helement->delivers();
+
         return numericalflux;
-
 }
 /*}}}*/
@@ -298 +307 @@
         helement->configure(elementsin);
 
+        /*Initialize hooked fields*/
+        this->nodes  =(Node**)hnodes->deliverp();
+        this->element=(Element*)helement->delivers();
+
         /*point parameters to real dataset: */
         this->parameters=parametersin;
@@ -382 +395 @@
 
         /* local declarations */
-        int             i,j;
+        int             i,j,ig;
         int analysis_type;
 
@@ -391 +404 @@
         double    xyz_list[numgrids][3];
         double    normal[2];
-        int*        doflist=NULL;
+        int*      doflist=NULL;
 
         /* gaussian points: */
-        int     num_gauss,ig;
+        int     num_gauss;
         double* gauss_coords =NULL;
         double  gauss_coord;
@@ -417 +430 @@
 
         /*dynamic objects pointed to by hooks: */
-        Node  **nodes           = NULL;
-        Tria   *tria            = NULL;
         Input  *vxaverage_input = NULL;
         Input  *vyaverage_input = NULL;
@@ -427 +438 @@
 
         /*recover objects from hooks: */
-        nodes=(Node**)hnodes->deliverp();
-        tria=(Tria*)helement->delivers();
+        Tria* tria=(Tria*)element;
 
         /*recover parameters: */
@@ -549 +559 @@
 
         /*dynamic objects pointed to by hooks: */
-        Node**  nodes=NULL;
-        Tria*   tria=NULL;
         Input*  vxaverage_input=NULL;
         Input*  vyaverage_input=NULL;
@@ -559 +567 @@
 
         /*recover objects from hooks: */
-        nodes=(Node**)hnodes->deliverp();
-        tria=(Tria*)helement->delivers();
+        Tria* tria=(Tria*)element;
 
         /*recover parameters: */
@@ -692 +699 @@
 
         /*dynamic objects pointed to by hooks: */
-        Node**  nodes=NULL;
-        Tria*   tria=NULL;
         Input*  vxaverage_input=NULL;
         Input*  vyaverage_input=NULL;
@@ -699 +704 @@
 
         /*recover objects from hooks: */
-        nodes=(Node**)hnodes->deliverp();
-        tria=(Tria*)helement->delivers();
+        Tria* tria=(Tria*)element;
 
         /*Retrieve parameters: */
@@ -813 +817 @@
         /*output: */
         int* doflist=NULL;
-
-        /*pointers: */
-        Node**   nodes=NULL;
-        
-        /*recover pointers: */
-        nodes=(Node**)hnodes->deliverp();
         
         /*recover type: */
@@ -921 +919 @@
         double value;
 
-        /*dynamic objects pointed to by hooks: */
-        Tria*  tria=NULL;
-        Node** nodes=NULL;
-
         /*recover objects from hooks: */
-        tria=(Tria*)helement->delivers();
-        nodes=(Node**)hnodes->deliverp();
+        Tria* tria=(Tria*)element;
 
         /*Get value on Element 1*/
@@ -942 +935 @@
         double value;
 
-        /*dynamic objects pointed to by hooks: */
-        Tria*  tria=NULL;
-        Node** nodes=NULL;
-
         /*recover objects from hooks: */
-        tria=(Tria*)helement->delivers();
-        nodes=(Node**)hnodes->deliverp();
+        Tria* tria=(Tria*)element;
 
         /*Get value on Element 1*/

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

@@ -22 +22 @@
                 int analysis_type;
 
+                /*Hooks*/
                 Hook*       helement;
                 Hook*       hnodes;
+
+                /*Corresponding fields*/
+                Element* element;
+                Node**   nodes;
+
                 Parameters *parameters;
                 Inputs     *inputs;