Changeset 21729 for issm/trunk/src/c/classes/Elements/Element.h

Timestamp:

05/19/17 14:48:02 (8 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 21727

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/classes/Elements/Element.h (modified) (6 diffs)

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

@@ -95 +95 @@
                 void               GetInputValue(IssmDouble* pvalue,int enum_type);
                 void               GetInputValue(IssmDouble* pvalue,Gauss* gauss,int enum_type);
+                void               GetInputsInterpolations(Vector<IssmDouble>* interps);
                 IssmDouble         GetMaterialParameter(int enum_in);
                 void               GetNodesLidList(int* lidlist);
@@ -140 +141 @@
                 int                Sid();
                 void               SmbGemb();
+                void               StrainRateESA(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input);
                 void               StrainRateFS(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input);
                 void               StrainRateHO(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input);
@@ -174 +176 @@
                 virtual void       AddInput(int input_enum, IssmDouble* values, int interpolation_enum)=0;
                 virtual void       AverageOntoPartition(Vector<IssmDouble>* partition_contributions,Vector<IssmDouble>* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part)=0;
+                virtual void             BasalNodeIndices(int* pnumindices,int** pindices,int finiteelement){_error_("not implemented yet");};
                 virtual void       CalvingRateDev(void){_error_("not implemented yet");};
                 virtual void        CalvingRateLevermann(void)=0;
@@ -181 +184 @@
                 virtual void       ComputeSigmaNN(void)=0;
                 virtual void       ComputeStressTensor(void)=0;
+                virtual void       ComputeEsaStrainAndVorticity(void)=0;
                 virtual void       Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters)=0;
                 virtual void       ControlInputSetGradient(IssmDouble* gradient,int enum_type,int control_index)=0;
@@ -289 +293 @@
                 virtual int        VertexConnectivity(int vertexindex)=0;
                 virtual void       VerticalSegmentIndices(int** pindices,int* pnumseg)=0;
+                virtual void       VerticalSegmentIndicesBase(int** pindices,int* pnumseg)=0;
                 virtual void       ViscousHeating(IssmDouble* pphi,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input)=0;
                 virtual void       WriteLevelsetSegment(DataSet* segments){_error_("not implemented yet");};
                 virtual void       ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum)=0;
 
-                #ifdef _HAVE_GIA_
+                #ifdef _HAVE_GIAIVINS_
                 virtual void       GiaDeflection(Vector<IssmDouble>* wg,Vector<IssmDouble>* dwgdt,IssmDouble* x,IssmDouble* y)=0;
                 #endif
@@ -305 +310 @@
                 virtual IssmDouble    OceanAverage(IssmDouble* Sg)=0;
                 virtual IssmDouble    OceanArea(void)=0;
+                virtual void          SealevelriseMomentOfInertia(IssmDouble* dI_list,IssmDouble* Sg_old,IssmDouble eartharea)=0; 
                 virtual void          SealevelriseEustatic(Vector<IssmDouble>* pSgi,IssmDouble* peustatic,IssmDouble* latitude,IssmDouble* longitude,IssmDouble* radius,IssmDouble oceanarea,IssmDouble eartharea)=0;
                 virtual void          SealevelriseNonEustatic(Vector<IssmDouble>* pSgo,IssmDouble* Sg_old,IssmDouble* latitude,IssmDouble* longitude,IssmDouble* radius,IssmDouble eartharea)=0;