Changeset 22758 for issm/trunk/src/c/classes/Elements/Tetra.h

Timestamp:

05/10/18 10:24:27 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 22757

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/classes/Elements/Tetra.h (modified) (10 diffs)

issm/trunk/src/c

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod

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

@@ -32 +32 @@
                 /*Tetra constructors, destructors {{{*/
                 Tetra(){};
-                Tetra(int seg_id,int seg_sid,int i, IoModel* iomodel,int nummodels);
+                Tetra(int tet_id,int tet_sid,IoModel* iomodel,int nummodels);
                 ~Tetra();
                 /*}}}*/
@@ -52 +52 @@
                 void        ComputeEsaStrainAndVorticity(){_error_("not implemented yet!");};
                 void        Configure(Elements* elements,Loads* loads,Nodes* nodesin,Vertices* verticesin,Materials* materials,Parameters* parameters);
+                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");};
                 void        ControlToVectors(Vector<IssmPDouble>* vector_control, Vector<IssmPDouble>* vector_gradient,int control_enum){_error_("not implemented yet");};
@@ -61 +62 @@
                 void        FaceOnSurfaceIndices(int* pindex1,int* pindex2,int* pindex3);
                 int         FiniteElement(void);
-                IssmDouble  FloatingArea(void){_error_("not implemented yet");};
+                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!");};
@@ -78 +79 @@
                 int         GetNumberOfNodes(int enum_type){_error_("not implemented yet");};
                 int         GetNumberOfVertices(void);
-                void        GetSolutionFromInputsOneDof(Vector<IssmDouble>* solution,int enum_type){_error_("not implemented yet");};
-                Element*    GetUpperElement(void){_error_("not implemented yet");};
+                void        GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data,int offset,bool onsid){_error_("not implemented yet");};
                 void        GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data,bool onsid){_error_("not implemented yet");};
                 void        GetVerticesCoordinatesBase(IssmDouble** pxyz_list);
                 void        GetVerticesCoordinatesTop(IssmDouble** pxyz_list);
                 void        GradientIndexing(int* indexing,int control_index){_error_("not implemented yet");};
-                IssmDouble  GroundedArea(void){_error_("not implemented yet");};
+                IssmDouble  GroundedArea(bool scaled){_error_("not implemented yet");};
                 bool        HasFaceOnBase();
                 bool        HasFaceOnSurface();
-                IssmDouble  IceMass(void){_error_("not implemented yet");};
-                IssmDouble  IceVolume(void){_error_("not implemented yet");};
-                IssmDouble  IceVolumeAboveFloatation(void){_error_("not implemented yet");};
+                IssmDouble  IceVolume(bool scaled){_error_("not implemented yet");};
+                IssmDouble  IceVolumeAboveFloatation(bool scaled){_error_("not implemented yet");};
                 bool        IsFaceOnBoundary(void){_error_("not implemented yet");};
                 bool               IsIcefront(void);
@@ -96 +95 @@
                 bool        IsOnSurface();
                 bool        IsZeroLevelset(int levelset_enum){_error_("not implemented");};
-                void        InputControlUpdate(IssmDouble scalar,bool save_parameter){_error_("not implemented yet");};
                 void        InputDepthAverageAtBase(int enum_type,int average_enum_type){_error_("not implemented yet");};
                 void        InputExtrude(int enum_type,int start){_error_("not implemented"); /*For penta only*/};
-                void        InputScale(int enum_type,IssmDouble scale_factor){_error_("not implemented yet");};
                 void        InputUpdateFromIoModel(int index, IoModel* iomodel);
                 void        InputUpdateFromSolutionOneDof(IssmDouble* solution,int inputenum);
@@ -121 +118 @@
       Gauss*      NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order_horiz,int order_vert);
       Gauss*      NewGauss(int point1,IssmDouble fraction1,IssmDouble fraction2,bool mainlyfloating,int order){_error_("not implemented yet");};
+      Gauss*      NewGauss(int point1,IssmDouble fraction1,IssmDouble fraction2,int order){_error_("not implemented yet");};
                 Gauss*      NewGaussBase(int order);
                 Gauss*      NewGaussLine(int vertex1,int vertex2,int order){_error_("not implemented yet");};
@@ -140 +138 @@
                 int         NumberofNodesPressure(void);
                 int         NumberofNodesVelocity(void);
+                void                    PicoUpdateBoxid(int* pmax_boxid_basin){_error_("not implemented yet");};        
+                void                    PicoUpdateBox(int loopboxid){_error_("not implemented yet");};
                 void        PotentialUngrounding(Vector<IssmDouble>* potential_sheet_ungrounding){_error_("not implemented yet");};
                 int         PressureInterpolation(void);
@@ -145 +145 @@
                 void        ResetHooks();
                 void        ReduceMatrices(ElementMatrix* Ke,ElementVector* pe);
+                void        SetControlInputsFromVector(IssmDouble* vector,int control_enum,int control_index,int offset,int N, int M){_error_("not implemented yet");};
                 void        SetControlInputsFromVector(IssmDouble* vector,int control_enum,int control_index){_error_("not implemented yet");};
                 void        SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Materials* materials,Parameters* parameters);
@@ -158 +159 @@
                 int         TensorInterpolation(void);
                 IssmDouble  TimeAdapt(){_error_("not implemented yet");};
-                IssmDouble  TotalFloatingBmb(void){_error_("not implemented yet");};
-                IssmDouble  TotalGroundedBmb(void){_error_("not implemented yet");};
-                IssmDouble  TotalSmb(void){_error_("not implemented yet");};
+                IssmDouble  TotalFloatingBmb(bool scaled){_error_("not implemented yet");};
+                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        UpdateConstraintsExtrudeFromBase(){_error_("not implemented");};
@@ -178 +179 @@
 #endif
 #ifdef _HAVE_ESA_
-                void    EsaGeodetic2D(Vector<IssmDouble>* pUp,Vector<IssmDouble>* pNorth,Vector<IssmDouble>* pEast,IssmDouble* xx,IssmDouble* yy){_error_("not implemented yet!");};
+                void    EsaGeodetic2D(Vector<IssmDouble>* pUp,Vector<IssmDouble>* pNorth,Vector<IssmDouble>* pEast,Vector<IssmDouble>* pX,Vector<IssmDouble>* pY,IssmDouble* xx,IssmDouble* yy){_error_("not implemented yet!");};
                 void    EsaGeodetic3D(Vector<IssmDouble>* pUp,Vector<IssmDouble>* pNorth,Vector<IssmDouble>* pEast,IssmDouble* latitude,IssmDouble* longitude,IssmDouble* radius,IssmDouble* xx,IssmDouble* yy,IssmDouble* zz,IssmDouble eartharea){_error_("not implemented yet!");};
 #endif

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod