Changeset 22758 for issm/trunk/src/c/classes/Elements/Penta.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/Penta.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/Penta.h

@@ -36 +36 @@
                 /*Penta constructors and destructor: {{{*/
                 Penta(){};
-                Penta(int penta_id,int penta_sid,int i, IoModel* iomodel,int nummodels);
+                Penta(int penta_id,int penta_sid,IoModel* iomodel,int nummodels);
                 ~Penta();
                 /*}}}*/
@@ -49 +49 @@
                 void           AverageOntoPartition(Vector<IssmDouble>* partition_contributions,Vector<IssmDouble>* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part);
                 void           BasalNodeIndices(int* pnumindices,int** pindices,int finiteelement);
-                void           CalvingRateDev();
+                void           CalvingRateVonmises();
                 void           CalvingRateLevermann();
                 IssmDouble     CharacteristicLength(void){_error_("not implemented yet");};
@@ -58 +58 @@
                 void           ComputeStressTensor();
                 void           Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters);
+                void           ControlInputSetGradient(IssmDouble* gradient,int enum_type,int control_index,int offset,int N,int M);
                 void           ControlInputSetGradient(IssmDouble* gradient,int enum_type,int control_index);
                 void           ControlToVectors(Vector<IssmPDouble>* vector_control, Vector<IssmPDouble>* vector_gradient,int control_enum);
@@ -64 +65 @@
                 void           ElementSizes(IssmDouble* hx,IssmDouble* hy,IssmDouble* hz);
                 int            FiniteElement(void);
-                IssmDouble     FloatingArea(void);
+                IssmDouble     FloatingArea(bool scaled);
                 void           FSContactMigration(Vector<IssmDouble>* vertexgrounded,Vector<IssmDouble>* vertexfloating);
                 IssmDouble     GetArea3D(void){_error_("not implemented yet!");};
@@ -84 +85 @@
                 int            GetNumberOfVertices(void);
                 Penta*         GetLowerPenta(void);
-                void           GetSolutionFromInputsOneDof(Vector<IssmDouble>* solution,int enum_type);
-                Penta*         GetSurfacePenta(void);
-                Element*       GetUpperElement(void);
                 Penta*         GetUpperPenta(void);
                 void           GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data,bool onsid);
+                void           GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data,int offset,bool onsid);
                 void           GetVerticesCoordinatesBase(IssmDouble** pxyz_list);
                 void           GetVerticesCoordinatesTop(IssmDouble** pxyz_list);
-                IssmDouble     GroundedArea(void);
-                IssmDouble     IceMass(void);
-                IssmDouble     IceVolume(void);
-                IssmDouble     IceVolumeAboveFloatation(void);
-                void           InputControlUpdate(IssmDouble scalar,bool save_parameter);
+                IssmDouble     GroundedArea(bool scaled);
+                IssmDouble     IceVolume(bool scaled);
+                IssmDouble     IceVolumeAboveFloatation(bool scaled);
                 void           InputDepthAverageAtBase(int enum_type,int average_enum_type);
                 void             InputExtrude(int enum_type,int start);
-                void           InputScale(int enum_type,IssmDouble scale_factor);
                 void           InputUpdateFromIoModel(int index, IoModel* iomodel);
                 void           InputUpdateFromSolutionOneDof(IssmDouble* solutiong,int enum_type);
@@ -125 +121 @@
                 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);
+                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);
@@ -144 +141 @@
                 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);
                 int            PressureInterpolation();
@@ -151 +150 @@
                 void           ResetLevelsetFromSegmentlist(IssmDouble* segments,int numsegments);
                 void             SetClone(int* minranks);
+                void           SetControlInputsFromVector(IssmDouble* vector,int control_enum,int control_index,int offset, int N,int M);
                 void           SetControlInputsFromVector(IssmDouble* vector,int control_enum,int control_index);
                 void           SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Materials* materials,Parameters* parameters);
@@ -164 +164 @@
                 int            TensorInterpolation(){_error_("not implemented yet");};
                 IssmDouble     TimeAdapt();
-                IssmDouble     TotalFloatingBmb(void);
-                IssmDouble     TotalGroundedBmb(void);
-                IssmDouble     TotalSmb(void);
+                IssmDouble     TotalFloatingBmb(bool scaled);
+                IssmDouble     TotalGroundedBmb(bool scaled);
+                IssmDouble     TotalSmb(bool scaled);
                 void           Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type,int finitelement);
                 void           UpdateConstraintsExtrudeFromBase(void);
@@ -189 +189 @@
                 #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