Changeset 13055 for issm/trunk-jpl/src/c/classes/objects/Inputs/ControlInput.h

Timestamp:

08/15/12 18:02:10 (13 years ago)

Author:

glperez

Message:

BUG: Reverted back. Chaco module not compiling...

File:

• issm/trunk-jpl/src/c/classes/objects/Inputs/ControlInput.h (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/objects/Inputs/ControlInput.h

@@ -41 +41 @@
                 int    InstanceEnum();
                 Input* SpawnTriaInput(int* indices);
-                Input* PointwiseDivide(Input* inputB){_error_("not implemented yet");};
-                Input* PointwiseMin(Input* inputB){_error_("not implemented yet");};
-                Input* PointwiseMax(Input* inputB){_error_("not implemented yet");};
+                Input* PointwiseDivide(Input* inputB){_error2_("not implemented yet");};
+                Input* PointwiseMin(Input* inputB){_error2_("not implemented yet");};
+                Input* PointwiseMax(Input* inputB){_error2_("not implemented yet");};
                 ElementResult* SpawnResult(int step, IssmDouble time);
-                void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");};
+                void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error2_("not supported yet");};
                 void Configure(Parameters* parameters);
                 /*}}}*/
@@ -55 +55 @@
                 void GetInputValue(IssmDouble* pvalue,GaussTria* gauss);
                 void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss);
-                void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error_("not implemented yet");};
-                void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error_("not implemented yet");};
-                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 GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error2_("not implemented yet");};
+                void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error2_("not implemented yet");};
+                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, IssmDouble* xyz_list, GaussTria* gauss);
                 void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss);
                 void GetInputAverage(IssmDouble* pvalue);
-                void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");};
-                void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");};
-                void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
-                void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
-                void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
-                void GetVxStrainRate3dPattyn(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
-                void GetVyStrainRate3dPattyn(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
-                void ChangeEnum(int newenumtype){_error_("not implemented yet");};
-                void SquareMin(IssmDouble* psquaremin, bool process_units,Parameters* parameters){_error_("not implemented yet");};
-                void ConstrainMin(IssmDouble minimum){_error_("not implemented yet");};
-                void Scale(IssmDouble scale_factor){_error_("not implemented yet");};
-                void ArtificialNoise(IssmDouble min,IssmDouble max){_error_("not implemented yet");};
-                void AXPY(Input* xinput,IssmDouble scalar){_error_("not implemented yet");};
+                void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");};
+                void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");};
+                void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
+                void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
+                void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
+                void GetVxStrainRate3dPattyn(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
+                void GetVyStrainRate3dPattyn(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
+                void ChangeEnum(int newenumtype){_error2_("not implemented yet");};
+                void SquareMin(IssmDouble* psquaremin, bool process_units,Parameters* parameters){_error2_("not implemented yet");};
+                void ConstrainMin(IssmDouble minimum){_error2_("not implemented yet");};
+                void Scale(IssmDouble scale_factor){_error2_("not implemented yet");};
+                void ArtificialNoise(IssmDouble min,IssmDouble max){_error2_("not implemented yet");};
+                void AXPY(Input* xinput,IssmDouble scalar){_error2_("not implemented yet");};
                 void Constrain(void);
                 void Constrain(IssmDouble min,IssmDouble max);
-                IssmDouble InfinityNorm(void){_error_("not implemented yet");};
-                IssmDouble Max(void){_error_("not implemented yet");};
-                IssmDouble MaxAbs(void){_error_("not implemented yet");};
-                IssmDouble Min(void){_error_("not implemented yet");};
-                IssmDouble MinAbs(void){_error_("not implemented yet");};
+                IssmDouble InfinityNorm(void){_error2_("not implemented yet");};
+                IssmDouble Max(void){_error2_("not implemented yet");};
+                IssmDouble MaxAbs(void){_error2_("not implemented yet");};
+                IssmDouble Min(void){_error2_("not implemented yet");};
+                IssmDouble MinAbs(void){_error2_("not implemented yet");};
                 void Extrude(void);
                 void VerticallyIntegrate(Input* thickness_input);
                 void GetVectorFromInputs(Vector* vector,int* doflist,const char* data);
                 void GetVectorFromInputs(Vector* vector,int* doflist);
-                void GetValuesPtr(IssmDouble** pvalues,int* pnum_values){_error_("not implemented yet");};
+                void GetValuesPtr(IssmDouble** pvalues,int* pnum_values){_error2_("not implemented yet");};
                 ElementResult* SpawnGradient(int step, IssmDouble time);
                 void GetGradient(Vector* gradient_vec,int* doflist);