Changeset 4922

Timestamp:

08/02/10 11:32:51 (15 years ago)

Author:

Mathieu Morlighem

Message:

some cleaning in inputs

Location:

issm/trunk/src/c/objects/Inputs

Files:

• BeamVertexInput.cpp (modified) (1 diff)
• BeamVertexInput.h (modified) (1 diff)
• BoolInput.cpp (modified) (1 diff)
• BoolInput.h (modified) (1 diff)
• DoubleInput.cpp (modified) (1 diff)
• DoubleInput.h (modified) (1 diff)
• Input.h (modified) (1 diff)
• IntInput.cpp (modified) (1 diff)
• IntInput.h (modified) (1 diff)
• PentaVertexInput.cpp (modified) (2 diffs)
• PentaVertexInput.h (modified) (1 diff)
• TriaVertexInput.h (modified) (1 diff)

issm/trunk/src/c/objects/Inputs/BeamVertexInput.cpp

@@ -162 +162 @@
 
 /*Object functions*/
-/*FUNCTION BeamVertexInput::GetParameterValue(bool* pvalue) {{{1*/
-void BeamVertexInput::GetParameterValue(bool* pvalue){ISSMERROR(" not supported yet!");}
-/*}}}*/
-/*FUNCTION BeamVertexInput::GetParameterValue(int* pvalue){{{1*/
-void BeamVertexInput::GetParameterValue(int* pvalue){ISSMERROR(" not supported yet!");}
-/*}}}*/
-/*FUNCTION BeamVertexInput::GetParameterValue(double* pvalue){{{1*/
-void BeamVertexInput::GetParameterValue(double* pvalue){ISSMERROR(" not supported yet!");}
-/*}}}*/
-/*FUNCTION BeamVertexInput::GetParameterValue(double* pvalue,double* gauss){{{1*/
+/*FUNCTION BeamVertexInput::GetParameterValue{{{1*/
 void BeamVertexInput::GetParameterValue(double* pvalue,double* gauss){
-        *pvalue=gauss[0]*values[0]+gauss[1]*values[1];
-}
-/*}}}*/
-/*FUNCTION BeamVertexInput::GetParameterValue(double* pvalue,double* gauss,double defaultvalue){{{1*/
-void BeamVertexInput::GetParameterValue(double* pvalue,double* gauss,double defaultvalue){ISSMERROR(" not supported yet!");}
+
+        /*Call BeamRef function*/
+        BeamRef::GetParameterValue(pvalue,&values[0],*gauss);
+}
 /*}}}*/
 /*FUNCTION BeamVertexInput::GetParameterValues{{{1*/

issm/trunk/src/c/objects/Inputs/BeamVertexInput.h

@@ -45 +45 @@
                 /*}}}*/
                 /*numerics: {{{1*/
-                void GetParameterValue(bool* pvalue);
-                void GetParameterValue(int* pvalue);
-                void GetParameterValue(double* pvalue);
+                void GetParameterValue(bool* pvalue){ISSMERROR("not implemented yet");};
+                void GetParameterValue(int* pvalue){ISSMERROR("not implemented yet");};
+                void GetParameterValue(double* pvalue){ISSMERROR("not implemented yet");};
                 void GetParameterValue(double* pvalue,double* gauss);
-                void GetParameterValue(double* pvalue,double* gauss,double defaultvalue);
-                
+                void GetParameterValues(double* values,double* gauss_pointers, int numgauss);
+                void GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss);
                 void GetParameterAverage(double* pvalue);
-        
-                void GetParameterValues(double* values,double* gauss_pointers, int numgauss);
-        
-                void GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss);
                 void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");};
                 void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");};

issm/trunk/src/c/objects/Inputs/BoolInput.cpp

@@ -184 +184 @@
 void BoolInput::GetParameterValue(double* pvalue,double* gauss){ISSMERROR(" not supported yet!");}
 /*}}}*/
-/*FUNCTION BoolInput::GetParameterValue(double* pvalue,double* gauss,double defaultvalue){{{1*/
-void BoolInput::GetParameterValue(double* pvalue,double* gauss,double defaultvalue){ISSMERROR(" not supported yet!");}
-/*}}}*/
 /*FUNCTION BoolInput::GetParameterValues{{{1*/
 void BoolInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){ISSMERROR(" not supported yet!");}

issm/trunk/src/c/objects/Inputs/BoolInput.h

@@ -48 +48 @@
                 void GetParameterValue(double* pvalue);
                 void GetParameterValue(double* pvalue,double* gauss);
-                void GetParameterValue(double* pvalue,double* gauss,double defaultvalue);
-                
+                void GetParameterValues(double* values,double* gauss_pointers, int numgauss);
+                void GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss);
                 void GetParameterAverage(double* pvalue){ISSMERROR("not implemented yet");};
-                
-                void GetParameterValues(double* values,double* gauss_pointers, int numgauss);
-        
-                void GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss);
                 void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");};
                 void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");};

issm/trunk/src/c/objects/Inputs/DoubleInput.cpp

@@ -197 +197 @@
 void DoubleInput::GetParameterValue(double* pvalue,double* gauss){ISSMERROR(" not supported yet!");}
 /*}}}*/
-/*FUNCTION DoubleInput::GetParameterValue(double* pvalue,double* gauss,double defaultvalue){{{1*/
-void DoubleInput::GetParameterValue(double* pvalue,double* gauss,double defaultvalue){ISSMERROR(" not supported yet!");}
-/*}}}*/
 /*FUNCTION DoubleInput::GetParameterValues{{{1*/
 void DoubleInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){ISSMERROR(" not supported yet!");}

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

@@ -47 +47 @@
                 void GetParameterValue(double* pvalue);
                 void GetParameterValue(double* pvalue,double* gauss);
-                void GetParameterValue(double* pvalue,double* gauss,double defaultvalue);
-                
+                void GetParameterValues(double* values,double* gauss_pointers, int numgauss);
+                void GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss);
                 void GetParameterAverage(double* pvalue);
-                
-                void GetParameterValues(double* values,double* gauss_pointers, int numgauss);
-        
-                void GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss);
                 void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");};
                 void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");};

issm/trunk/src/c/objects/Inputs/Input.h

@@ -25 +25 @@
                 virtual void GetParameterValue(double* pvalue)=0;
                 virtual void GetParameterValue(double* pvalue,double* gauss)=0;
-                virtual void GetParameterValue(double* pvalue,double* gauss,double defaultvalue)=0;
-
+                virtual void GetParameterValues(double* values,double* gauss_pointers, int numgauss)=0;
+                virtual void GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss)=0;
                 virtual void GetParameterAverage(double* pvalue)=0;
-                
-                virtual void GetParameterValues(double* values,double* gauss_pointers, int numgauss)=0;
-        
-                virtual void GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss)=0;
                 virtual void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, double* gauss)=0;
                 virtual void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, double* gauss)=0;

issm/trunk/src/c/objects/Inputs/IntInput.cpp

@@ -184 +184 @@
 void IntInput::GetParameterValue(double* pvalue,double* gauss){ISSMERROR(" not supported yet!");}
 /*}}}*/
-/*FUNCTION IntInput::GetParameterValue(double* pvalue,double* gauss,double defaultvalue){{{1*/
-void IntInput::GetParameterValue(double* pvalue,double* gauss,double defaultvalue){ISSMERROR(" not supported yet!");}
-/*}}}*/
 /*FUNCTION IntInput::GetParameterValues{{{1*/
 void IntInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){ISSMERROR(" not supported yet!");}

issm/trunk/src/c/objects/Inputs/IntInput.h

@@ -48 +48 @@
                 void GetParameterValue(double* pvalue);
                 void GetParameterValue(double* pvalue,double* gauss);
-                void GetParameterValue(double* pvalue,double* gauss,double defaultvalue);
-                
+                void GetParameterValues(double* values,double* gauss_pointers, int numgauss);
+                void GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss);
                 void GetParameterAverage(double* pvalue){ISSMERROR("not implemented yet");};
-                
-                void GetParameterValues(double* values,double* gauss_pointers, int numgauss);
-        
-                void GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss);
                 void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");};
                 void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");};

issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp

@@ -201 +201 @@
 
 /*Object functions*/
-/*FUNCTION PentaVertexInput::GetParameterValue(bool* pvalue) {{{1*/
-void PentaVertexInput::GetParameterValue(bool* pvalue){ISSMERROR(" not supported yet!");}
-/*}}}*/
-/*FUNCTION PentaVertexInput::GetParameterValue(int* pvalue){{{1*/
-void PentaVertexInput::GetParameterValue(int* pvalue){ISSMERROR(" not supported yet!");}
-/*}}}*/
-/*FUNCTION PentaVertexInput::GetParameterValue(double* pvalue){{{1*/
-void PentaVertexInput::GetParameterValue(double* pvalue){ISSMERROR(" not supported yet!");}
-/*}}}*/
-/*FUNCTION PentaVertexInput::GetParameterValue(double* pvalue,double* gauss){{{1*/
+/*FUNCTION PentaVertexInput::GetParameterValue{{{1*/
 void PentaVertexInput::GetParameterValue(double* pvalue,double* gauss){
 
@@ -217 +208 @@
 
 }
-/*}}}*/
-/*FUNCTION PentaVertexInput::GetParameterValue(double* pvalue,double* gauss,double defaultvalue){{{1*/
-void PentaVertexInput::GetParameterValue(double* pvalue,double* gauss,double defaultvalue){ISSMERROR(" not supported yet!");}
 /*}}}*/
 /*FUNCTION PentaVertexInput::GetParameterValues{{{1*/

issm/trunk/src/c/objects/Inputs/PentaVertexInput.h

@@ -44 +44 @@
                 /*}}}*/
                 /*numerics: {{{1*/
-                void GetParameterValue(bool* pvalue);
-                void GetParameterValue(int* pvalue);
-                void GetParameterValue(double* pvalue);
+                void GetParameterValue(bool* pvalue){ISSMERROR("not implemented yet");};
+                void GetParameterValue(int* pvalue){ISSMERROR("not implemented yet");};
+                void GetParameterValue(double* pvalue){ISSMERROR("not implemented yet");};
                 void GetParameterValue(double* pvalue,double* gauss);
-                void GetParameterValue(double* pvalue,double* gauss,double defaultvalue);
-                
+                void GetParameterValues(double* values,double* gauss_pointers, int numgauss);
+                void GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss);
                 void GetParameterAverage(double* pvalue);
-                
-                void GetParameterValues(double* values,double* gauss_pointers, int numgauss);
-        
-                void GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss);
                 void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");};
                 void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");};

issm/trunk/src/c/objects/Inputs/TriaVertexInput.h

@@ -47 +47 @@
                 void GetParameterValue(int* pvalue){ISSMERROR("not implemented yet");}
                 void GetParameterValue(double* pvalue){ISSMERROR("not implemented yet");}
-                
                 void GetParameterValue(double* pvalue,double* gauss);
-                void GetParameterValue(double* pvalue,double* gauss,double defaultvalue){ISSMERROR("not implemented yet");}
                 void GetParameterValues(double* values,double* gauss_pointers, int numgauss);
-                
+                void GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss);
                 void GetParameterAverage(double* pvalue);
-        
-                void GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss);
                 void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, double* gauss);
                 void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, double* gauss);