Changeset 4410

Timestamp:

07/06/10 11:22:23 (15 years ago)

Author:

Mathieu Morlighem

Message:

Better way to handle hnodes (NULL pointer)

Location:

issm/trunk/src/c

Files:

• modules/ConfigureObjectsx/ConfigureObjectsx.cpp (modified) (2 diffs)
• objects/Elements/Penta.cpp (modified) (2 diffs)
• objects/Elements/PentaHook.cpp (modified) (1 diff)
• objects/Elements/Tria.cpp (modified) (1 diff)
• objects/Elements/TriaHook.cpp (modified) (2 diffs)

issm/trunk/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp

@@ -23 +23 @@
         parameters->FindParam(&analysis_type,AnalysisTypeEnum);
         
-        //_printf_("      Configuring elements...\n");
+        _printf_("      Configuring elements...\n");
         for (i=0;i<elements->Size();i++){
                 element=(Element*)elements->GetObjectByOffset(i);
                 element->Configure(elements,loads,nodes,materials,parameters);
         }
-        //_printf_("      Configuring loads...\n");
+        _printf_("      Configuring loads...\n");
         for (i=0;i<loads->Size();i++){
                 load=(Load*)loads->GetObjectByOffset(i);
@@ -35 +35 @@
                 }
         }
-        //_printf_("      Configuring nodes...\n");
+        _printf_("      Configuring nodes...\n");
         for (i=0;i<nodes->Size();i++){
                 node=(Node*)nodes->GetObjectByOffset(i);

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -602 +602 @@
         /*Take care of hooking up all objects for this element, ie links the objects in the hooks to their respective 
          * datasets, using internal ids and offsets hidden in hooks: */
-        this->hnodes[analysis_counter]->configure(nodesin);
+        if (this->hnodes[analysis_counter]) this->hnodes[analysis_counter]->configure(nodesin);
         this->hmatice->configure(materialsin);
         this->hmatpar->configure(materialsin);
@@ -608 +608 @@
 
         /*Now, go pick up the objects inside the hooks: */
-        this->nodes=(Node**)this->hnodes[analysis_counter]->deliverp();
+        if (this->hnodes[analysis_counter]) this->nodes=(Node**)this->hnodes[analysis_counter]->deliverp();
+        else this->nodes=NULL;
         this->matice=(Matice*)this->hmatice->delivers();
         this->matpar=(Matpar*)this->hmatpar->delivers();

issm/trunk/src/c/objects/Elements/PentaHook.cpp

@@ -53 +53 @@
         this->hneighbors=NULL; 
 
+        //Initialize hnodes as NULL
+        for(int i=0;i<this->numanalyses;i++){
+                this->hnodes[i]=NULL;
+        }
+
 }
 /*}}}*/

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -487 +487 @@
         /*Take care of hooking up all objects for this element, ie links the objects in the hooks to their respective 
          * datasets, using internal ids and offsets hidden in hooks: */
-        this->hnodes[analysis_counter]->configure(nodesin);
+        if(this->hnodes[analysis_counter]) this->hnodes[analysis_counter]->configure(nodesin);
         this->hmatice->configure(materialsin);
         this->hmatpar->configure(materialsin);
 
         /*Now, go pick up the objects inside the hooks: */
-        this->nodes=(Node**)this->hnodes[analysis_counter]->deliverp();
+        if(this->hnodes[analysis_counter]) this->nodes=(Node**)this->hnodes[analysis_counter]->deliverp();
+        else this->nodes=NULL;
         this->matice=(Matice*)this->hmatice->delivers();
         this->matpar=(Matpar*)this->hmatpar->delivers();

issm/trunk/src/c/objects/Elements/TriaHook.cpp

@@ -50 +50 @@
         this->hmatpar=new Hook(&matpar_id,1);
 
-        //Initialize hnodes
+        //Initialize hnodes as NULL
         for(int i=0;i<this->numanalyses;i++){
-                this->hnodes[i]=new Hook();
+                this->hnodes[i]=NULL;
         }
 
@@ -60 +60 @@
 void TriaHook::SetHookNodes(int* node_ids,int analysis_counter){
 
-        /*Delete existing Hook (empty)*/
-        delete this->hnodes[analysis_counter];
-
-        /*Replace by new Hook*/
+        /*initialize hook*/
         this->hnodes[analysis_counter]=new Hook(node_ids,3);
 }