Changeset 16560 for issm/trunk/src/c/classes/Inputs/PentaInput.h

Timestamp:

10/28/13 14:43:03 (11 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16554

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/classes/Inputs/PentaInput.h (modified) (4 diffs)

issm/trunk/src/c/classes/Inputs/PentaInput.h

@@ -35 +35 @@
                 int   InstanceEnum();
                 Input* SpawnTriaInput(int location);
+                Input* SpawnSegInput(int index1,int index2);
                 Input* PointwiseDivide(Input* inputB);
                 Input* PointwiseMin(Input* inputB);
                 Input* PointwiseMax(Input* inputB);
-                ElementResult* SpawnResult(int step, IssmDouble time);
+                int  GetResultInterpolation(void);
                 void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");};
                 void Configure(Parameters* parameters);
@@ -45 +46 @@
                 void GetInputValue(int* pvalue){_error_("not implemented yet");};
                 void GetInputValue(IssmDouble* pvalue){_error_("not implemented yet");};
+                void GetInputValue(IssmDouble* pvalue,GaussSeg* gauss){_error_("not implemented yet");};
                 void GetInputValue(IssmDouble* pvalue,GaussTria* gauss){_error_("not implemented yet");};
                 void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss);
@@ -51 +53 @@
                 void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");};
                 void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");};
+                void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussSeg* gauss){_error_("not implemented yet");};
                 void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");};
                 void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss);
@@ -68 +71 @@
                 void SquareMin(IssmDouble* psquaremin,Parameters* parameters);
                 void ConstrainMin(IssmDouble minimum);
+                void Set(IssmDouble setvalue){_error_("Set not implemented yet");};
                 void Scale(IssmDouble scale_factor);
-                void ArtificialNoise(IssmDouble min,IssmDouble max){_error_("not implemented yet");};
                 void AXPY(Input* xinput,IssmDouble scalar);
                 void Constrain(IssmDouble cm_min, IssmDouble cm_max);