Changeset 16912 for issm/trunk-jpl/src/c/classes/Elements/Element.h

Timestamp:

11/24/13 10:53:58 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: moving more stuff from Tria to Element.cpp

File:

• issm/trunk-jpl/src/c/classes/Elements/Element.h (modified) (3 diffs)

issm/trunk-jpl/src/c/classes/Elements/Element.h

@@ -15 +15 @@
 class DataSet;
 class Parameters;
+class Parameter;
 class Elements;
 class Loads;
+class Nodes;
 class Node;
-class Nodes;
 class Vertices;
+class Vertex;
 class Materials;
+class Material;
 class Matpar;
+class Inputs;
 class Input;
-class Inputs;
 class Gauss;
 class ElementVector;
@@ -35 +38 @@
 
         public:
-                Inputs   *inputs;
-                Node    **nodes;
+                Inputs      *inputs;
+                Node       **nodes;
+                Vertex     **vertices;
+                Material    *material;
+                Matpar      *matpar;
+                Parameters  *parameters;
 
         public: 
@@ -47 +54 @@
                 bool   AllActive(void);
                 bool   AnyActive(void);
+                void   DeleteMaterials(void);
+                void   FindParam(bool* pvalue,int paramenum);
+                void   FindParam(int* pvalue,int paramenum);
+                void   FindParam(IssmDouble* pvalue,int paramenum);
+                void   FindParam(int** pvalues,int* psize,int paramenum);
                 Input* GetInput(int inputenum);
 
                 /*Virtual functions*/
-                virtual void   AddBasalInput(int input_enum, IssmDouble* values, int interpolation_enum)=0;
-                virtual void   AddInput(int input_enum, IssmDouble* values, int interpolation_enum)=0;
-                virtual void   AddMaterialInput(int input_enum, IssmDouble* values, int interpolation_enum)=0;
+                virtual void       AddBasalInput(int input_enum, IssmDouble* values, int interpolation_enum)=0;
+                virtual void       AddInput(int input_enum, IssmDouble* values, int interpolation_enum)=0;
+                virtual void       AddMaterialInput(int input_enum, IssmDouble* values, int interpolation_enum)=0;
                 virtual IssmDouble CharacteristicLength(void)=0;
-                virtual void   Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters)=0;
-                virtual void   SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Materials* materials,Parameters* parameters)=0;
-                virtual void   SetwiseNodeConnectivity(int* d_nz,int* o_nz,Node* node,bool* flags,int* flagsindices,int set1_enum,int set2_enum)=0;
+                virtual void       Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters)=0;
+                virtual void       SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Materials* materials,Parameters* parameters)=0;
+                virtual void       SetwiseNodeConnectivity(int* d_nz,int* o_nz,Node* node,bool* flags,int* flagsindices,int set1_enum,int set2_enum)=0;
                 virtual ElementMatrix* CreateKMatrix(void)=0;
                 virtual void   CreateDVector(Vector<IssmDouble>* df)=0;
                 virtual ElementVector* CreatePVector(void)=0;
                 virtual void   CreateJacobianMatrix(Matrix<IssmDouble>* Jff)=0;
-                virtual void   DeleteMaterials(void)=0;
                 virtual void   ElementSizes(IssmDouble* phx,IssmDouble* phy,IssmDouble* phz)=0;
                 virtual void   EnthalpyToThermal(IssmDouble* ptemperature,IssmDouble* pwaterfraction,IssmDouble enthalpy,IssmDouble pressure)=0;
                 virtual IssmDouble EnthalpyDiffusionParameter(IssmDouble enthalpy,IssmDouble pressure)=0;
                 virtual IssmDouble EnthalpyDiffusionParameterVolume(int numvertices,IssmDouble* enthalpy,IssmDouble* pressure)=0;
-                virtual void   FindParam(bool* pvalue,int paramenum)=0;
-                virtual void   FindParam(int* pvalue,int paramenum)=0;
-                virtual void   FindParam(IssmDouble* pvalue,int paramenum)=0;
-                virtual void   FindParam(int** pvalues,int* psize,int paramenum)=0;
+
                 virtual int    FiniteElement(void)=0;
                 virtual IssmDouble GetMaterialParameter(int enum_in)=0;