Changeset 15372 for issm/trunk-jpl/src/c/classes/Elements/ElementHook.cpp

Timestamp:

06/30/13 17:32:20 (12 years ago)

Author:

Mathieu Morlighem

Message:

NEW:merged PentaHook and TriaHook into ElementHook

File:

• issm/trunk-jpl/src/c/classes/Elements/ElementHook.cpp (moved) (moved from issm/trunk-jpl/src/c/classes/Elements/PentaHook.cpp ) (4 diffs)

issm/trunk-jpl/src/c/classes/Elements/ElementHook.cpp

@@ -1 @@
-/*!\file PentaHook.c
- * \brief: implementation of the PentaHook object
+/*!\file ElementHook.c
+ * \brief: implementation of the ElementHook object
  */
 
@@ -16 +16 @@
 
 /*Object constructors and destructor*/
-/*FUNCTION PentaHook::PentaHook(){{{*/
-PentaHook::PentaHook(){
+/*FUNCTION ElementHook::ElementHook(){{{*/
+ElementHook::ElementHook(){
         numanalyses=UNDEF;
         this->hnodes     = NULL;
@@ -26 +26 @@
 }
 /*}}}*/
-/*FUNCTION PentaHook::~PentaHook(){{{*/
-PentaHook::~PentaHook(){
+/*FUNCTION ElementHook::~ElementHook(){{{*/
+ElementHook::~ElementHook(){
 
         int i;
@@ -41 +41 @@
 }
 /*}}}*/
-/*FUNCTION PentaHook::PentaHook(int in_numanalyses,int element_id, int matpar_id){{{*/
-PentaHook::PentaHook(int in_numanalyses,int element_id, IoModel* iomodel){
+/*FUNCTION ElementHook::ElementHook(int in_numanalyses,int element_id, int numvertices,IoModel* iomodel){{{*/
+ElementHook::ElementHook(int in_numanalyses,int element_id,int numvertices,IoModel* iomodel){
 
         /*intermediary: */
         int matpar_id;
         int material_id;
-        int penta_vertex_ids[6];
 
         /*retrieve material_id: */
         iomodel->Constant(&matpar_id,MeshNumberofelementsEnum); matpar_id++;
 
-        /*retrive material_id*/
+        /*retrieve material_id*/
         material_id = element_id;
 
         /*retrieve vertices ids*/
-        for(int i=0;i<6;i++){ 
-                penta_vertex_ids[i]=reCast<int>(iomodel->Data(MeshElementsEnum)[6*(element_id-1)+i]);
+        int* vertex_ids = xNew<int>(numvertices);
+        for(int i=0;i<numvertices;i++){ 
+                vertex_ids[i]=reCast<int>(iomodel->Data(MeshElementsEnum)[(element_id-1)*numvertices+i]);
         }
 
         this->numanalyses = in_numanalyses;
         this->hnodes      = new Hook*[in_numanalyses];
-        this->hvertices   = new Hook(&penta_vertex_ids[0],6);
+        this->hvertices   = new Hook(&vertex_ids[0],numvertices);
         this->hmaterial   = new Hook(&material_id,1);
         this->hmatpar     = new Hook(&matpar_id,1);
         this->hneighbors  = NULL;
 
-        //Initialize hnodes as NULL
+        /*Initialize hnodes as NULL*/
         for(int i=0;i<this->numanalyses;i++){
                 this->hnodes[i]=NULL;
         }
 
+        /*Clean up*/
+        xDelete<int>(vertex_ids);
+
 }
 /*}}}*/
 
-/*FUNCTION PentaHook::SetHookNodes{{{*/
-void PentaHook::SetHookNodes(int* node_ids,int analysis_counter){
-        this->hnodes[analysis_counter]= new Hook(node_ids,6);
+/*FUNCTION ElementHook::SetHookNodes{{{*/
+void ElementHook::SetHookNodes(int* node_ids,int numnodes,int analysis_counter){
+        this->hnodes[analysis_counter]= new Hook(node_ids,numnodes);
 }
 /*}}}*/
-/*FUNCTION PentaHook::InitHookNeighbors{{{*/
-void PentaHook::InitHookNeighbors(int* element_ids){
+/*FUNCTION ElementHook::InitHookNeighbors{{{*/
+void ElementHook::InitHookNeighbors(int* element_ids){
         this->hneighbors=new Hook(element_ids,2);
-
 }
 /*}}}*/
-/*FUNCTION PentaHook::SpawnTriaHook{{{*/
-void PentaHook::SpawnTriaHook(TriaHook* triahook,int* indices){
+/*FUNCTION ElementHook::SpawnTriaHook{{{*/
+void ElementHook::SpawnTriaHook(ElementHook* triahook,int* indices){
 
         int i;