Changeset 15372 for issm/trunk-jpl/src/c/classes/Elements/Tria.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/Tria.cpp (modified) (4 diffs)

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

@@ -41 +41 @@
 Tria::Tria(int tria_id, int tria_sid, int index, IoModel* iomodel,int nummodels)
         :TriaRef(nummodels)
-        ,TriaHook(nummodels,index+1,iomodel){
+        ,ElementHook(nummodels,index+1,3,iomodel){
 
                 /*id: */
@@ -85 +85 @@
         for(i=0;i<this->numanalyses;i++) tria->element_type_list[i]=this->element_type_list[i];
 
-        //deal with TriaHook mother class
+        //deal with ElementHook mother class
         tria->numanalyses=this->numanalyses;
         tria->hnodes=new Hook*[tria->numanalyses];
@@ -2729 +2729 @@
 
         /*Intermediaries*/
-        int    i,j;
-        int    tria_node_ids[3];
-        int    tria_vertex_ids[3];
-        int    tria_type;
+        int        i                   ,j;
+        int        tria_node_ids[3];
+        int        tria_vertex_ids[3];
+        int        tria_type;
         IssmDouble nodeinputs[3];
         IssmDouble yts;
-        int    progstabilization,balancestabilization;
-        bool   dakota_analysis;
+        int        progstabilization,balancestabilization;
+        bool       dakota_analysis;
 
         /*Checks if debuging*/
@@ -2780 +2780 @@
 
         /*hooks: */
-        this->SetHookNodes(tria_node_ids,analysis_counter); this->nodes=NULL; //set hook to nodes, for this analysis type
+        this->SetHookNodes(tria_node_ids,3,analysis_counter); this->nodes=NULL; //set hook to nodes, for this analysis type
 
         /*Fill with IoModel*/