Changeset 4882

Timestamp:

07/29/10 11:52:20 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added PentaRef

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (2 diffs)
• objects/Elements/Penta.cpp (modified) (5 diffs)
• objects/Elements/Penta.h (modified) (3 diffs)
• objects/Elements/PentaRef.cpp (added)
• objects/Elements/PentaRef.h (added)
• objects/Elements/Tria.cpp (modified) (1 diff)
• objects/Inputs/PentaVertexInput.cpp (modified) (1 diff)
• objects/Inputs/PentaVertexInput.h (modified) (1 diff)
• objects/objects.h (modified) (1 diff)

issm/trunk/src/c/Makefile.am

@@ -163 +163 @@
                                         ./objects/Elements/PentaHook.h\
                                         ./objects/Elements/PentaHook.cpp\
+                                        ./objects/Elements/PentaRef.h\
+                                        ./objects/Elements/PentaRef.cpp\
                                         ./objects/Materials/Matice.h\
                                         ./objects/Materials/Matice.cpp\
@@ -727 +729 @@
                                         ./objects/Elements/PentaHook.h\
                                         ./objects/Elements/PentaHook.cpp\
+                                        ./objects/Elements/PentaRef.h\
+                                        ./objects/Elements/PentaRef.cpp\
                                         ./objects/Materials/Matice.h\
                                         ./objects/Materials/Matice.cpp\

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

@@ -27 +27 @@
         this->matpar=NULL;
         this->neighbors=NULL;
-        
         this->inputs=NULL;
+        this->parameters=NULL;
         this->results=NULL;
-        this->parameters=NULL;
 }
 /*}}}*/
@@ -41 +40 @@
 /*}}}*/
 /*FUNCTION Penta::Penta(int id, int index, IoModel* iomodel,int nummodels) {{{1*/
-Penta::Penta(int penta_id, int index, IoModel* iomodel,int nummodels):
-
-        PentaHook(nummodels,index+1,iomodel->numberofelements+1) //index+1: matice id, iomodel->numberofelements+1: matpar id
+Penta::Penta(int penta_id, int index, IoModel* iomodel,int nummodels)
+        :PentaRef(nummodels)
+        ,PentaHook(nummodels,index+1,iomodel->numberofelements+1) //index+1: matice id, iomodel->numberofelements+1: matpar id
                                                                       { //i is the element index
 
@@ -58 +57 @@
         this->id=penta_id;
 
-        /*penta_elements_ids: */
-        if isnan(iomodel->upperelements[index]){
-                penta_elements_ids[1]=this->id; //upper penta is the same penta
-        }
-        else{
-                penta_elements_ids[1]=(int)(iomodel->upperelements[index]);
-        }
-        
-        if isnan(iomodel->lowerelements[index]){
-                penta_elements_ids[0]=this->id; //lower penta is the same penta
-        }
-        else{
-                penta_elements_ids[0]=(int)(iomodel->lowerelements[index]);
-        }
+        /*Build neighbors list*/
+        if isnan(iomodel->upperelements[index]) penta_elements_ids[1]=this->id; //upper penta is the same penta
+        else                                    penta_elements_ids[1]=(int)(iomodel->upperelements[index]);
+        if isnan(iomodel->lowerelements[index]) penta_elements_ids[0]=this->id; //lower penta is the same penta
+        else                                    penta_elements_ids[0]=(int)(iomodel->lowerelements[index]);
         this->InitHookNeighbors(penta_elements_ids);
 
@@ -1752 +1742 @@
         /*Intermediaries*/
         IssmInt i;
-        int penta_node_ids[6];
-        int penta_vertex_ids[6];
-        double nodeinputs[6];
+        int     penta_type;
+        int     penta_node_ids[6];
+        int     penta_vertex_ids[6];
+        double  nodeinputs[6];
 
         /*Checks if debuging*/
@@ -1760 +1751 @@
         ISSMASSERT(iomodel->elements);
         /*}}}*/
+
+        /*Recover element type*/
+        if ((analysis_type==PrognosticAnalysisEnum || analysis_type==BalancedthicknessAnalysisEnum) && iomodel->prognostic_DG){
+                /*P1 Discontinuous Galerkin*/
+                penta_type=P1DGEnum;
+        }
+        else{
+                /*P1 Continuous Galerkin*/
+                penta_type=P1Enum;
+        }
+        this->SetElementType(penta_type,analysis_counter);
 
         /*Recover vertices ids needed to initialize inputs*/

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

@@ -3 +3 @@
  */
 
-#ifndef _PENTA_H
-#define _PENTA_H
+#ifndef _PENTA_H_
+#define _PENTA_H_
 
 /*Headers:*/
@@ -10 +10 @@
 #include "./Element.h"
 #include "./PentaHook.h"
+#include "./PentaRef.h"
 class  Object;
 class Parameters;
@@ -19 +20 @@
 class Tria;
 
+#include "../../include/include.h"
 #include "../../shared/Exceptions/exceptions.h"
-#include "../../include/include.h"
-
 /*}}}*/
 
-class Penta: public Element,public PentaHook{
+class Penta: public Element,public PentaHook,public PentaRef{
 
         public:

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

@@ -2080 +2080 @@
                 tria_type=P1Enum;
         }
-
-        /*Set TriaRef*/
         this->SetElementType(tria_type,analysis_counter);
 

issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp

@@ -24 +24 @@
 /*}}}*/
 /*FUNCTION PentaVertexInput::PentaVertexInput(int in_enum_type,double* values){{{1*/
-PentaVertexInput::PentaVertexInput(int in_enum_type,double* in_values){
+PentaVertexInput::PentaVertexInput(int in_enum_type,double* in_values)
+                :PentaRef(1)
+{
+
+        /*Set PentaRef*/
+        this->SetElementType(P1Enum,0);
+        this->element_type=P1Enum;
 
         enum_type=in_enum_type;

issm/trunk/src/c/objects/Inputs/PentaVertexInput.h

@@ -10 +10 @@
 /*{{{1*/
 #include "./Input.h"
+#include "../Elements/PentaRef.h"
 /*}}}*/
 
-class PentaVertexInput: public Input{
+class PentaVertexInput: public Input, public PentaRef{
 
         public:

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

@@ -37 +37 @@
 #include "./Elements/Penta.h"
 #include "./Elements/PentaHook.h"
+#include "./Elements/PentaRef.h"
 #include "./Elements/Tria.h"
 #include "./Elements/TriaHook.h"