Index: ../trunk-jpl/src/c/classes/Inputs/SegInput.h =================================================================== --- ../trunk-jpl/src/c/classes/Inputs/SegInput.h (revision 22518) +++ ../trunk-jpl/src/c/classes/Inputs/SegInput.h (revision 22519) @@ -61,7 +61,6 @@ void GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime){_error_("not implemented yet");}; void GetVectorFromInputs(Vector* vector,int* doflist){_error_("not implemented yet");}; int GetInputInterpolationType(){_error_("not implemented yet!");}; - IssmDouble InfinityNorm(void){_error_("not implemented yet");}; IssmDouble Max(void); IssmDouble MaxAbs(void){_error_("not implemented yet");}; IssmDouble Min(void); Index: ../trunk-jpl/src/c/classes/Inputs/TetraInput.h =================================================================== --- ../trunk-jpl/src/c/classes/Inputs/TetraInput.h (revision 22518) +++ ../trunk-jpl/src/c/classes/Inputs/TetraInput.h (revision 22519) @@ -61,7 +61,6 @@ void GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime); void GetVectorFromInputs(Vector* vector,int* doflist); int GetInputInterpolationType(){_error_("not implemented yet!");}; - IssmDouble InfinityNorm(void); IssmDouble Max(void); IssmDouble MaxAbs(void); IssmDouble Min(void); Index: ../trunk-jpl/src/c/classes/Inputs/Input.h =================================================================== --- ../trunk-jpl/src/c/classes/Inputs/Input.h (revision 22518) +++ ../trunk-jpl/src/c/classes/Inputs/Input.h (revision 22519) @@ -43,7 +43,6 @@ virtual void AXPY(Input* xinput,IssmDouble scalar)=0; virtual void Extrude(int start)=0; virtual void GetVectorFromInputs(Vector* vector,int* doflist)=0; - virtual IssmDouble InfinityNorm(void)=0; virtual IssmDouble Max(void)=0; virtual IssmDouble MaxAbs(void)=0; virtual IssmDouble Min(void)=0; Index: ../trunk-jpl/src/c/classes/Inputs/ControlInput.h =================================================================== --- ../trunk-jpl/src/c/classes/Inputs/ControlInput.h (revision 22518) +++ ../trunk-jpl/src/c/classes/Inputs/ControlInput.h (revision 22519) @@ -66,7 +66,6 @@ int GetResultNumberOfNodes(void); void GetVectorFromInputs(Vector* vector,int* doflist,const char* data); void GetVectorFromInputs(Vector* vector,int* doflist); - IssmDouble InfinityNorm(void){_error_("not implemented yet");}; IssmDouble Max(void){_error_("not implemented yet");}; IssmDouble MaxAbs(void){_error_("not implemented yet");}; IssmDouble Min(void); Index: ../trunk-jpl/src/c/classes/Inputs/DatasetInput.h =================================================================== --- ../trunk-jpl/src/c/classes/Inputs/DatasetInput.h (revision 22518) +++ ../trunk-jpl/src/c/classes/Inputs/DatasetInput.h (revision 22519) @@ -62,7 +62,6 @@ int GetResultInterpolation(void){_error_("not implemented yet");}; int GetResultNumberOfNodes(void){_error_("not implemented yet");}; void GetVectorFromInputs(Vector* vector,int* doflist){_error_("not implemented yet");}; - 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");}; Index: ../trunk-jpl/src/c/classes/Inputs/IntInput.h =================================================================== --- ../trunk-jpl/src/c/classes/Inputs/IntInput.h (revision 22518) +++ ../trunk-jpl/src/c/classes/Inputs/IntInput.h (revision 22519) @@ -60,7 +60,6 @@ void GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime){_error_("not implemented yet");}; int GetInputInterpolationType(){_error_("not implemented yet!");}; void GetVectorFromInputs(Vector* vector,int* doflist); - IssmDouble InfinityNorm(void){_error_("InfinityNorm not implemented for integers");}; IssmDouble Max(void){_error_("Max not implemented for integers");}; IssmDouble MaxAbs(void){_error_("Max not implemented for integers");}; IssmDouble Min(void){_error_("Min not implemented for integers");}; Index: ../trunk-jpl/src/c/classes/Inputs/TriaInput.cpp =================================================================== --- ../trunk-jpl/src/c/classes/Inputs/TriaInput.cpp (revision 22518) +++ ../trunk-jpl/src/c/classes/Inputs/TriaInput.cpp (revision 22519) @@ -275,16 +275,6 @@ const int numvertices=3; vector->SetValues(numvertices,doflist,this->values,INS_VAL); } /*}}}*/ -IssmDouble TriaInput::InfinityNorm(void){/*{{{*/ - - /*Output*/ - IssmDouble norm=0.; - int numnodes=this->NumberofNodes(this->interpolation_type); - - for(int i=0;inorm) norm=fabs(values[i]); - return norm; -} -/*}}}*/ IssmDouble TriaInput::Max(void){/*{{{*/ int numnodes=this->NumberofNodes(this->interpolation_type); Index: ../trunk-jpl/src/c/classes/Inputs/BoolInput.h =================================================================== --- ../trunk-jpl/src/c/classes/Inputs/BoolInput.h (revision 22518) +++ ../trunk-jpl/src/c/classes/Inputs/BoolInput.h (revision 22519) @@ -56,7 +56,6 @@ void GetInputValue(IssmDouble* pvalue,Gauss* gauss ,int index){_error_("not implemented yet");}; void GetVectorFromInputs(Vector* vector,int* doflist); int GetInputInterpolationType(){_error_("not implemented yet!");}; - IssmDouble InfinityNorm(void){_error_("InfinityNorm not implemented for booleans");}; IssmDouble Max(void){_error_("Max not implemented for booleans");}; IssmDouble MaxAbs(void){_error_("Max not implemented for booleans");}; IssmDouble Min(void){_error_("Min not implemented for booleans");}; Index: ../trunk-jpl/src/c/classes/Inputs/Inputs.cpp =================================================================== --- ../trunk-jpl/src/c/classes/Inputs/Inputs.cpp (revision 22518) +++ ../trunk-jpl/src/c/classes/Inputs/Inputs.cpp (revision 22519) @@ -253,26 +253,6 @@ } /*}}}*/ -IssmDouble Inputs::InfinityNorm(int enumtype){/*{{{*/ - - /*Output*/ - IssmDouble norm; - - /*Get input*/ - Input* input=xDynamicCast(this->GetInput(enumtype)); - - /*Apply ContrainMin: */ - if (input){ - norm=input->InfinityNorm(); - } - else{ - norm=0; - } - - /*Return output*/ - return norm; -} -/*}}}*/ IssmDouble Inputs::Max(int enumtype){/*{{{*/ /*Output*/ Index: ../trunk-jpl/src/c/classes/Inputs/TriaInput.h =================================================================== --- ../trunk-jpl/src/c/classes/Inputs/TriaInput.h (revision 22518) +++ ../trunk-jpl/src/c/classes/Inputs/TriaInput.h (revision 22519) @@ -61,7 +61,6 @@ void GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime); int GetInputInterpolationType(){return interpolation_type;}; void GetVectorFromInputs(Vector* vector,int* doflist); - IssmDouble InfinityNorm(void); IssmDouble Max(void); IssmDouble MaxAbs(void); IssmDouble Min(void); Index: ../trunk-jpl/src/c/classes/Inputs/TransientInput.cpp =================================================================== --- ../trunk-jpl/src/c/classes/Inputs/TransientInput.cpp (revision 22518) +++ ../trunk-jpl/src/c/classes/Inputs/TransientInput.cpp (revision 22519) @@ -527,25 +527,6 @@ delete input; } /*}}}*/ -IssmDouble TransientInput::InfinityNorm(void){/*{{{*/ - - IssmDouble time; - IssmDouble infnorm; - - /*First, recover current time from parameters: */ - parameters->FindParam(&time,TimeEnum); - - /*Retrieve interpolated values for this time step: */ - Input* input=GetTimeInput(time); - - /*Call input function*/ - infnorm=input->InfinityNorm(); - - /*Clean-up and return*/ - delete input; - return infnorm; -} -/*}}}*/ IssmDouble TransientInput::Max(void){/*{{{*/ IssmDouble time; Index: ../trunk-jpl/src/c/classes/Inputs/Inputs.h =================================================================== --- ../trunk-jpl/src/c/classes/Inputs/Inputs.h (revision 22518) +++ ../trunk-jpl/src/c/classes/Inputs/Inputs.h (revision 22519) @@ -32,7 +32,6 @@ void GetInputValue(bool* pvalue,int enum_type); void GetInputValue(int* pvalue,int enum_type); void GetInputValue(IssmDouble* pvalue,int enum_type); - IssmDouble InfinityNorm(int enumtype); IssmDouble Max(int enumtype); IssmDouble MaxAbs(int enumtype); IssmDouble Min(int enumtype); Index: ../trunk-jpl/src/c/classes/Inputs/PentaInput.cpp =================================================================== --- ../trunk-jpl/src/c/classes/Inputs/PentaInput.cpp (revision 22518) +++ ../trunk-jpl/src/c/classes/Inputs/PentaInput.cpp (revision 22519) @@ -274,16 +274,6 @@ const int numvertices=6; vector->SetValues(numvertices,doflist,this->values,INS_VAL); } /*}}}*/ -IssmDouble PentaInput::InfinityNorm(void){/*{{{*/ - - /*Output*/ - IssmDouble norm=0.; - int numnodes=this->NumberofNodes(this->interpolation_type); - - for(int i=0;inorm) norm=fabs(values[i]); - return norm; -} -/*}}}*/ IssmDouble PentaInput::Max(void){/*{{{*/ int numnodes=this->NumberofNodes(this->interpolation_type); Index: ../trunk-jpl/src/c/classes/Inputs/TransientInput.h =================================================================== --- ../trunk-jpl/src/c/classes/Inputs/TransientInput.h (revision 22518) +++ ../trunk-jpl/src/c/classes/Inputs/TransientInput.h (revision 22519) @@ -70,7 +70,6 @@ int GetTimeInputOffset(IssmDouble time); void GetTimeValues(IssmDouble* values,IssmDouble time){_error_("not implemented yet");}; void GetVectorFromInputs(Vector* vector,int* doflist); - IssmDouble InfinityNorm(void); IssmDouble Max(void); IssmDouble MaxAbs(void); IssmDouble Min(void); Index: ../trunk-jpl/src/c/classes/Inputs/PentaInput.h =================================================================== --- ../trunk-jpl/src/c/classes/Inputs/PentaInput.h (revision 22518) +++ ../trunk-jpl/src/c/classes/Inputs/PentaInput.h (revision 22519) @@ -58,7 +58,6 @@ void GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime){_error_("not implemented yet");}; void GetVectorFromInputs(Vector* vector,int* doflist); int GetInputInterpolationType(){_error_("not implemented yet!");}; - IssmDouble InfinityNorm(void); IssmDouble Max(void); IssmDouble MaxAbs(void); IssmDouble Min(void); Index: ../trunk-jpl/src/c/classes/Inputs/DoubleArrayInput.h =================================================================== --- ../trunk-jpl/src/c/classes/Inputs/DoubleArrayInput.h (revision 22518) +++ ../trunk-jpl/src/c/classes/Inputs/DoubleArrayInput.h (revision 22519) @@ -58,7 +58,6 @@ void GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime){_error_("not implemented yet");}; void GetVectorFromInputs(Vector* vector,int* doflist){_error_("not implemented yet");}; int GetInputInterpolationType(){_error_("not implemented yet!");}; - 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");}; Index: ../trunk-jpl/src/c/classes/Inputs/TetraInput.cpp =================================================================== --- ../trunk-jpl/src/c/classes/Inputs/TetraInput.cpp (revision 22518) +++ ../trunk-jpl/src/c/classes/Inputs/TetraInput.cpp (revision 22519) @@ -241,16 +241,6 @@ const int numvertices=4; vector->SetValues(numvertices,doflist,this->values,INS_VAL); } /*}}}*/ -IssmDouble TetraInput::InfinityNorm(void){/*{{{*/ - - /*Output*/ - IssmDouble norm=0.; - int numnodes=this->NumberofNodes(this->interpolation_type); - - for(int i=0;inorm) norm=fabs(values[i]); - return norm; -} -/*}}}*/ IssmDouble TetraInput::MinAbs(void){/*{{{*/ const int numnodes=this->NumberofNodes(this->interpolation_type); Index: ../trunk-jpl/src/c/classes/Inputs/DoubleInput.h =================================================================== --- ../trunk-jpl/src/c/classes/Inputs/DoubleInput.h (revision 22518) +++ ../trunk-jpl/src/c/classes/Inputs/DoubleInput.h (revision 22519) @@ -59,7 +59,6 @@ void GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime){_error_("not implemented yet");}; int GetInputInterpolationType(){return P0Enum; }; void GetVectorFromInputs(Vector* vector,int* doflist); - IssmDouble InfinityNorm(void){_error_("not implemented yet");}; IssmDouble Max(void); IssmDouble MaxAbs(void); IssmDouble Min(void);