Changeset 24335 for issm/trunk-jpl/src/c/classes/Elements/Tetra.h

Timestamp:

11/15/19 16:28:40 (5 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added Inputs2, TODO: still AMR, GEMB and DC do not work, and need to delete current Inputs

File:

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

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

@@ -31 +31 @@
                 /*Tetra constructors, destructors {{{*/
                 Tetra(){};
-                Tetra(int tet_id,int tet_sid,IoModel* iomodel,int nummodels);
+                Tetra(int tet_id,int tet_sid,int tet_lid,IoModel* iomodel,int nummodels);
                 ~Tetra();
                 /*}}}*/
@@ -49 +49 @@
                 void        ComputeDeviatoricStressTensor(){_error_("not implemented yet");};
                 void        ComputeEsaStrainAndVorticity(){_error_("not implemented yet!");};
-                void        Configure(Elements* elements,Loads* loads,Nodes* nodesin,Vertices* verticesin,Materials* materials,Parameters* parameters);
+                void        Configure(Elements* elements,Loads* loads,Nodes* nodesin,Vertices* verticesin,Materials* materials,Parameters* parameters,Inputs2* inputs2in);
                 void        ControlInputSetGradient(IssmDouble* gradient,int enum_type,int control_index,int offset,int N,int M){_error_("not implemented yet");};
                 void        ControlInputSetGradient(IssmDouble* gradient,int enum_type,int control_index){_error_("not implemented yet");};
@@ -62 +62 @@
                 IssmDouble  FloatingArea(bool scaled){_error_("not implemented yet");};
                 void        FSContactMigration(Vector<IssmDouble>* vertexgrounded,Vector<IssmDouble>* vertexfloating){_error_("not implemented yet");};
-                IssmDouble     GetArea3D(void){_error_("not implemented yet!");};
-                IssmDouble     GetAreaSpherical(void){_error_("not implemented yet!");};
+                IssmDouble  GetArea3D(void){_error_("not implemented yet!");};
+                IssmDouble  GetAreaSpherical(void){_error_("not implemented yet!");};
                 Element*    GetBasalElement(void){_error_("not implemented yet");};
                 int         GetElementType(void);
@@ -69 +69 @@
                 IssmDouble  GetGroundedPortion(IssmDouble* xyz_list){_error_("not implemented yet");};
                 void               GetIcefrontCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum){_error_("not implemented yet");};
+                Input2*     GetInput2(int enumtype);
+                Input2*     GetInput2(int enumtype,IssmDouble time);
                 void        GetInputValue(IssmDouble* pvalue,Node* node,int enumtype);
                 void               GetLevelCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum,IssmDouble level){_error_("not implemented yet");};
@@ -88 +90 @@
                 bool               IsIcefront(void);
                 bool        IsNodeOnShelfFromFlags(IssmDouble* flags){_error_("not implemented yet");};
-                bool        IsOnBase();
-                bool        IsOnSurface();
                 bool        IsZeroLevelset(int levelset_enum){_error_("not implemented");};
                 void        InputDepthAverageAtBase(int enum_type,int average_enum_type){_error_("not implemented yet");};
@@ -157 +157 @@
                 IssmDouble  TotalGroundedBmb(bool scaled){_error_("not implemented yet");};
                 IssmDouble  TotalSmb(bool scaled){_error_("not implemented yet");};
-                void        Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type,int finitelement);
+                void        Update(Inputs2* inputs2,int index, IoModel* iomodel,int analysis_counter,int analysis_type,int finitelement);
                 void        UpdateConstraintsExtrudeFromBase(){_error_("not implemented");};
                 void        UpdateConstraintsExtrudeFromTop(){_error_("not implemented");};
@@ -167 +167 @@
                 void        VerticalSegmentIndices(int** pindices,int* pnumseg){_error_("not implemented yet");};
                 void        VerticalSegmentIndicesBase(int** pindices,int* pnumseg){_error_("not implemented yet");};
-                void        ViscousHeating(IssmDouble* pphi,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input);
+                void        ViscousHeating(IssmDouble* pphi,IssmDouble* xyz_list,Gauss* gauss,Input2* vx_input,Input2* vy_input,Input2* vz_input);
 
 #ifdef _HAVE_GIAIVINS_