Index: /issm/trunk/src/c/objects/Inputs/BeamVertexInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/BeamVertexInput.cpp (revision 4921) +++ /issm/trunk/src/c/objects/Inputs/BeamVertexInput.cpp (revision 4922) @@ -162,20 +162,10 @@ /*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*/ Index: /issm/trunk/src/c/objects/Inputs/BeamVertexInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/BeamVertexInput.h (revision 4921) +++ /issm/trunk/src/c/objects/Inputs/BeamVertexInput.h (revision 4922) @@ -45,15 +45,11 @@ /*}}}*/ /*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");}; Index: /issm/trunk/src/c/objects/Inputs/BoolInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/BoolInput.cpp (revision 4921) +++ /issm/trunk/src/c/objects/Inputs/BoolInput.cpp (revision 4922) @@ -184,7 +184,4 @@ 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!");} Index: /issm/trunk/src/c/objects/Inputs/BoolInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/BoolInput.h (revision 4921) +++ /issm/trunk/src/c/objects/Inputs/BoolInput.h (revision 4922) @@ -48,11 +48,7 @@ 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");}; Index: /issm/trunk/src/c/objects/Inputs/DoubleInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/DoubleInput.cpp (revision 4921) +++ /issm/trunk/src/c/objects/Inputs/DoubleInput.cpp (revision 4922) @@ -197,7 +197,4 @@ 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!");} Index: /issm/trunk/src/c/objects/Inputs/DoubleInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/DoubleInput.h (revision 4921) +++ /issm/trunk/src/c/objects/Inputs/DoubleInput.h (revision 4922) @@ -47,11 +47,7 @@ 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");}; Index: /issm/trunk/src/c/objects/Inputs/Input.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/Input.h (revision 4921) +++ /issm/trunk/src/c/objects/Inputs/Input.h (revision 4922) @@ -25,11 +25,7 @@ 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; Index: /issm/trunk/src/c/objects/Inputs/IntInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/IntInput.cpp (revision 4921) +++ /issm/trunk/src/c/objects/Inputs/IntInput.cpp (revision 4922) @@ -184,7 +184,4 @@ 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!");} Index: /issm/trunk/src/c/objects/Inputs/IntInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/IntInput.h (revision 4921) +++ /issm/trunk/src/c/objects/Inputs/IntInput.h (revision 4922) @@ -48,11 +48,7 @@ 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");}; Index: /issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp (revision 4921) +++ /issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp (revision 4922) @@ -201,14 +201,5 @@ /*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,7 +208,4 @@ } -/*}}}*/ -/*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*/ Index: /issm/trunk/src/c/objects/Inputs/PentaVertexInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/PentaVertexInput.h (revision 4921) +++ /issm/trunk/src/c/objects/Inputs/PentaVertexInput.h (revision 4922) @@ -44,15 +44,11 @@ /*}}}*/ /*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");}; Index: /issm/trunk/src/c/objects/Inputs/TriaVertexInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/TriaVertexInput.h (revision 4921) +++ /issm/trunk/src/c/objects/Inputs/TriaVertexInput.h (revision 4922) @@ -47,12 +47,8 @@ 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);