Changeset 5940

Timestamp:

09/22/10 09:41:50 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added hooked fields as element properties

Location:

issm/trunk/src/c/objects/Loads

Files:

• Penpair.cpp (modified) (8 diffs)
• Penpair.h (modified) (1 diff)

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

@@ -31 +31 @@
 
         this->hnodes=NULL;
+        this->nodes=NULL;
         this->parameters=NULL;
         return;
@@ -42 +43 @@
         this->hnodes=new Hook(penpair_node_ids,2);
         this->parameters=NULL;
+        this->nodes=NULL;
         
         return;
@@ -139 +141 @@
         hnodes=new Hook(); hnodes->Demarshall(&marshalled_dataset);
 
-        /*parameters: may not exist even yet, so let Configure handle it: */
-        this->parameters=NULL;
+        /*pointers are garbabe, until configuration is carried out: */
+        nodes=NULL;
+        parameters=NULL;
 
         /*return: */
@@ -166 +169 @@
         /*now deal with hooks and objects: */
         penpair->hnodes=(Hook*)this->hnodes->copy();
+        penpair->nodes =(Node**)penpair->hnodes->deliverp();
 
         /*point parameters: */
@@ -182 +186 @@
          * datasets, using internal ids and offsets hidden in hooks: */
         hnodes->configure(nodesin);
+
+        /*Initialize hooked fields*/
+        this->nodes  =(Node**)hnodes->deliverp();
+
         /*point parameters to real dataset: */
         this->parameters=parametersin;
@@ -265 +273 @@
 ElementMatrix* Penpair::PenaltyCreateKMatrixDiagnosticHoriz(double kmax){
 
-        Node** nodes=(Node**)hnodes->deliverp();
         int    approximation0=nodes[0]->GetApproximation();
         int    approximation1=nodes[1]->GetApproximation();
@@ -304 +311 @@
         double penalty_offset;
 
-        /*recover pointers: */
-        Node** nodes=(Node**)hnodes->deliverp();
-
         /*Initialize Element vector and return if necessary*/
         ElementMatrix* Ke=NewElementMatrix(nodes,NUMVERTICES,this->parameters);
@@ -334 +338 @@
         double penalty_offset;
 
-        /*recover pointers: */
-        Node** nodes=(Node**)hnodes->deliverp();
-
         /*Initialize Element vector and return if necessary*/
         ElementMatrix* Ke=NewElementMatrix(nodes,NUMVERTICES,this->parameters);

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

@@ -21 +21 @@
                 
                 Hook* hnodes;  //hook to 2 nodes
+                Node** nodes;
 
                 Parameters* parameters; //pointer to solution parameters