Changeset 12530 for issm/trunk-jpl/src/c/objects/Inputs/DoubleInput.h

Timestamp:

06/25/12 12:18:07 (13 years ago)

Author:

utke

Message:

in the first round the assumption was made that the inputs remain passive but in the second round after discussion with M. Morlighem all inputs were consistently made active with the exception of the xyz_list arguments

File:

• issm/trunk-jpl/src/c/objects/Inputs/DoubleInput.h (modified) (3 diffs)

issm/trunk-jpl/src/c/objects/Inputs/DoubleInput.h

@@ -18 +18 @@
         public:
                 int    enum_type;
-                IssmPDouble value;
+                IssmDouble value;
 
                 /*DoubleInput constructors, destructors: {{{*/
@@ -39 +39 @@
                 Input* PointwiseMin(Input* inputB);
                 Input* PointwiseMax(Input* inputB);
-                ElementResult* SpawnResult(int step, IssmPDouble time);
-                void AddTimeValues(IssmPDouble* values,int step,IssmPDouble time){_error2_("not supported yet");};
+                ElementResult* SpawnResult(int step, IssmDouble time);
+                void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error2_("not supported yet");};
                 void Configure(Parameters* parameters);
                 /*}}}*/
@@ -46 +46 @@
                 void GetInputValue(bool* pvalue);
                 void GetInputValue(int* pvalue);
-                void GetInputValue(IssmPDouble* pvalue);
-                void GetInputValue(IssmPDouble* pvalue,GaussTria* gauss);
-                void GetInputValue(IssmPDouble* pvalue,GaussTria* gauss,IssmPDouble time){_error2_("not implemented yet");};
-                void GetInputValue(IssmPDouble* pvalue,GaussPenta* gauss);
-                void GetInputValue(IssmPDouble* pvalue,GaussTria* gauss ,int index){_error2_("not implemented yet");};
-                void GetInputValue(IssmPDouble* pvalue,GaussPenta* gauss ,int index){_error2_("not implemented yet");};
-                void GetInputDerivativeValue(IssmPDouble* derivativevalues, IssmPDouble* xyz_list, GaussTria* gauss);
-                void GetInputDerivativeValue(IssmPDouble* derivativevalues, IssmPDouble* xyz_list, GaussPenta* gauss);
-                void GetInputAverage(IssmPDouble* pvalue);
-                void GetVxStrainRate2d(IssmPDouble* epsilonvx,IssmPDouble* xyz_list, GaussTria* gauss);
-                void GetVyStrainRate2d(IssmPDouble* epsilonvy,IssmPDouble* xyz_list, GaussTria* gauss);
-                void GetVxStrainRate3d(IssmPDouble* epsilonvx,IssmPDouble* xyz_list, GaussPenta* gauss);
-                void GetVyStrainRate3d(IssmPDouble* epsilonvy,IssmPDouble* xyz_list, GaussPenta* gauss);
-                void GetVzStrainRate3d(IssmPDouble* epsilonvz,IssmPDouble* xyz_list, GaussPenta* gauss);
-                void GetVxStrainRate3dPattyn(IssmPDouble* epsilonvx,IssmPDouble* xyz_list, GaussPenta* gauss);
-                void GetVyStrainRate3dPattyn(IssmPDouble* epsilonvy,IssmPDouble* xyz_list, GaussPenta* gauss);
+                void GetInputValue(IssmDouble* pvalue);
+                void GetInputValue(IssmDouble* pvalue,GaussTria* gauss);
+                void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error2_("not implemented yet");};
+                void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss);
+                void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error2_("not implemented yet");};
+                void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error2_("not implemented yet");};
+                void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmPDouble* xyz_list, GaussTria* gauss);
+                void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmPDouble* xyz_list, GaussPenta* gauss);
+                void GetInputAverage(IssmDouble* pvalue);
+                void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmPDouble* xyz_list, GaussTria* gauss);
+                void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmPDouble* xyz_list, GaussTria* gauss);
+                void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmPDouble* xyz_list, GaussPenta* gauss);
+                void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmPDouble* xyz_list, GaussPenta* gauss);
+                void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmPDouble* xyz_list, GaussPenta* gauss);
+                void GetVxStrainRate3dPattyn(IssmDouble* epsilonvx,IssmPDouble* xyz_list, GaussPenta* gauss);
+                void GetVyStrainRate3dPattyn(IssmDouble* epsilonvy,IssmPDouble* xyz_list, GaussPenta* gauss);
                 void ChangeEnum(int newenumtype);
-                void SquareMin(IssmPDouble* psquaremin, bool process_units,Parameters* parameters);
-                void ConstrainMin(IssmPDouble minimum);
-                void Scale(IssmPDouble scale_factor);
-                void ArtificialNoise(IssmPDouble min,IssmPDouble max){_error2_("not implemented yet");};
-                void AXPY(Input* xinput,IssmPDouble scalar);
-                void Constrain(IssmPDouble cm_min, IssmPDouble cm_max);
-                IssmPDouble InfinityNorm(void){_error2_("not implemented yet");};
-                IssmPDouble Max(void);
-                IssmPDouble MaxAbs(void);
-                IssmPDouble Min(void);
-                IssmPDouble MinAbs(void);
+                void SquareMin(IssmDouble* psquaremin, bool process_units,Parameters* parameters);
+                void ConstrainMin(IssmDouble minimum);
+                void Scale(IssmDouble scale_factor);
+                void ArtificialNoise(IssmDouble min,IssmDouble max){_error2_("not implemented yet");};
+                void AXPY(Input* xinput,IssmDouble scalar);
+                void Constrain(IssmDouble cm_min, IssmDouble cm_max);
+                IssmDouble InfinityNorm(void){_error2_("not implemented yet");};
+                IssmDouble Max(void);
+                IssmDouble MaxAbs(void);
+                IssmDouble Min(void);
+                IssmDouble MinAbs(void);
                 void Extrude(void){_error2_("not supported yet");};
                 void VerticallyIntegrate(Input* thickness_input);
                 void GetVectorFromInputs(Vector* vector,int* doflist);
-                void GetValuesPtr(IssmPDouble** pvalues,int* pnum_values);
+                void GetValuesPtr(IssmDouble** pvalues,int* pnum_values);
                 /*}}}*/