Changeset 4369

Timestamp:

06/30/10 16:05:31 (15 years ago)

Author:

Eric.Larour

Message:

PentaHook can now spawn a TriaHook. Will fix the SpawnTria created leak

Location:

issm/trunk/src/c/objects

Files:

• Elements/Penta.cpp (modified) (5 diffs)
• Elements/PentaHook.cpp (modified) (1 diff)
• Elements/PentaHook.h (modified) (2 diffs)
• Hook.cpp (modified) (1 diff)
• Hook.h (modified) (1 diff)

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

@@ -996 +996 @@
         
         /*Do nothing if we  don't find it: */
-        if(!input) return;
+        if(!input)return;
 
         /*Constrain input using cm_min and cm_max: */
@@ -1045 +1045 @@
         /*Make a copy of the original input: */
         original=(Input*)this->inputs->GetInput(original_enum);
-        if(!original)ISSMERROR(" could not find old input with enum: %s",EnumAsString(original_enum));
         copy=(Input*)original->copy();
 
@@ -1062 +1061 @@
         /*Make a copy of the original input: */
         input=(Input*)this->inputs->GetInput(enum_type);
-        if(!input)ISSMERROR(" could not find old input with enum: %s",EnumAsString(enum_type));
 
         /*Scale: */
@@ -1765 +1763 @@
 
         int i;
+        int analysis_counter;
+        
+        /*go into parameters and get the analysis_counter: */
+        this->parameters->FindParam(&analysis_counter,AnalysisCounterEnum);
 
         /*out of grids g0,g1 and g2 from Penta, build a tria element: */
@@ -1787 +1789 @@
         tria->results=tria_results;
         tria->parameters=tria_parameters;
+        this->SpawnTriaHook(dynamic_cast<TriaHook*>(tria),&indices[0]);
+
+        /*recover nodes, matice and matpar: */
+        this->nodes=(Node**)this->hnodes[analysis_counter].deliverp();
+        this->matice=(Matice*)this->hmatice.delivers();
+        this->matpar=(Matpar*)this->hmatpar.delivers();
         
-        /*now deal with nodes, matice and matpar: */
-        tria->nodes=(Node**)xmalloc(3*sizeof(Node*));
-        for(i=0;i<3;i++)tria->nodes[i]=this->nodes[indices[i]];
-        tria->matice=this->matice;
-        tria->matpar=this->matpar;
-
         return tria;
 }

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

@@ -62 +62 @@
 }
 /*}}}*/
+/*FUNCTION PentaHook::SpawnTriaHook(TriaHook* triahook,int* indices);{{{1*/
+void PentaHook::SpawnTriaHook(TriaHook* triahook,int* indices){
+
+        int i;
+        int zero=0;
+
+        triahook->numanalyses=this->numanalyses;
+        triahook->hnodes=new Hook[this->numanalyses];
+
+        for(i=0;i<this->numanalyses;i++){
+                this->hnodes[i].Spawn(&triahook->hnodes[i],indices,3);
+        }
+        
+        this->hmatice.copy(&triahook->hmatice);
+        this->hmatpar.copy(&triahook->hmatpar);
+}
+/*}}}*/

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

@@ -7 +7 @@
 
 class Hook;
+class TriaHook;
 
 class PentaHook{
@@ -25 +26 @@
                 void InitHookMatpar(int matpar_id);
                 void InitHookNeighbors(int* element_ids);
+                void SpawnTriaHook(TriaHook* triahook,int* indices);
                 /*}}}*/
-
 };
 

issm/trunk/src/c/objects/Hook.cpp

@@ -363 +363 @@
 /*}}}*/
 /*FUNCTION Hook::Spawn{{{1*/
-Hook* Hook::Spawn(int* indices, int numindices){
-
-        int i;
-        Object** subobjects=NULL;
-        int       subnum;
-        int*      suboffsets=NULL;
-        int*      subids=NULL;
+void Hook::Spawn(Hook* spawnedhook, int* indices, int numindices){
+
+        int i;
 
         /*go pickup the correct objects, ids and offsets :*/
-        subnum=numindices;
-        if(subnum<1) ISSMERROR("Trying to spawn an empty ElementProperties!");
-
-        subobjects=(Object**)xmalloc(subnum*sizeof(Object*));
-        subids=(int*)xmalloc(subnum*sizeof(int));
-        suboffsets=(int*)xmalloc(subnum*sizeof(int));
-
-        for(i=0;i<subnum;i++){
-                subobjects[i]=this->objects[indices[i]];
-                subids[i]=this->ids[indices[i]];
-                suboffsets[i]=this->offsets[indices[i]];
-        }
-
-        return new Hook(subobjects,subids,suboffsets,subnum);
-}
-/*}}}*/
+        spawnedhook->num=numindices;
+        if(spawnedhook->num<1) ISSMERROR("Trying to spawn an empty ElementProperties!");
+
+        spawnedhook->objects=(Object**)xmalloc(spawnedhook->num*sizeof(Object*));
+        spawnedhook->ids=(int*)xmalloc(spawnedhook->num*sizeof(int));
+        spawnedhook->offsets=(int*)xmalloc(spawnedhook->num*sizeof(int));
+
+        for(i=0;i<spawnedhook->num;i++){
+                spawnedhook->objects[i]=this->objects[indices[i]];
+                spawnedhook->ids[i]=this->ids[indices[i]];
+                spawnedhook->offsets[i]=this->offsets[indices[i]];
+        }
+}
+/*}}}*/

issm/trunk/src/c/objects/Hook.h

@@ -46 +46 @@
                 Object**   deliverp(void); //deliver all objects
                 void       configure(DataSet* dataset);
-                Hook*      Spawn(int* indices, int numindices);
+                void       Spawn(Hook* spawnedhook, int* indices, int numindices);
                 Object**   GetObjects(void);
                 int*       Ids(void);