Index: /issm/trunk-jpl/src/c/Makefile.am =================================================================== --- /issm/trunk-jpl/src/c/Makefile.am (revision 15081) +++ /issm/trunk-jpl/src/c/Makefile.am (revision 15082) @@ -322,6 +322,4 @@ ./modules/InputToResultx/InputToResultx.cpp\ ./modules/InputToResultx/InputToResultx.h\ - ./modules/InputConvergencex/InputConvergencex.cpp\ - ./modules/InputConvergencex/InputConvergencex.h\ ./analyses/ProcessArguments.cpp\ ./analyses/ResetBoundaryConditions.cpp\ Index: /issm/trunk-jpl/src/c/classes/Elements/Element.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.h (revision 15081) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.h (revision 15082) @@ -77,5 +77,4 @@ virtual void GetVectorFromResults(Vector* vector,int id,int enum_in,int interp)=0; virtual void InputArtificialNoise(int enum_type,IssmDouble min,IssmDouble max)=0; - virtual bool InputConvergence(IssmDouble* eps, int* enums,int num_enums,int* criterionenums,IssmDouble* criterionvalues,int num_criterionenums)=0; virtual void AverageOntoPartition(Vector* partition_contributions,Vector* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part)=0; virtual int* GetHorizontalNeighboorSids(void)=0; Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 15081) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 15082) @@ -1377,36 +1377,4 @@ /*ArtificialNoise: */ input->ArtificialNoise(min,max); -} -/*}}}*/ -/*FUNCTION Penta::InputConvergence{{{*/ -bool Penta::InputConvergence(IssmDouble* eps, int* enums,int num_enums,int* criterionenums,IssmDouble* criterionvalues,int num_criterionenums){ - - int i; - bool converged=true; - Input** new_inputs=NULL; - Input** old_inputs=NULL; - - new_inputs=xNew(num_enums/2); //half the enums are for the new inputs - old_inputs=xNew(num_enums/2); //half the enums are for the old inputs - - for(i=0;iinputs->GetInput(enums[2*i+0]); - old_inputs[i]=(Input*)this->inputs->GetInput(enums[2*i+1]); - if(!new_inputs[i])_error_("could not find input with enum " << EnumToStringx(enums[2*i+0])); - if(!old_inputs[i])_error_("could not find input with enum " << EnumToStringx(enums[2*i+0])); - } - - /*ok, we've got the inputs (new and old), now loop throught the number of criterions and fill the eps array:*/ - for(i=0;icriterionvalues[i]) converged=false; - } - - /*clean up*/ - xDelete(new_inputs); - xDelete(old_inputs); - - /*Return output*/ - return converged; } /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Penta.h (revision 15081) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.h (revision 15082) @@ -99,5 +99,4 @@ int Sid(); void InputArtificialNoise(int enum_type,IssmDouble min, IssmDouble max); - bool InputConvergence(IssmDouble* eps, int* enums,int num_enums,int* criterionenums,IssmDouble* criterionvalues,int num_criterionenums); void InputCreate(IssmDouble scalar,int name,int code); void InputCreate(IssmDouble* vector, int index,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code); Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 15081) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 15082) @@ -1588,34 +1588,4 @@ /*ArtificialNoise: */ input->ArtificialNoise(min,max); -} -/*}}}*/ -/*FUNCTION Tria::InputConvergence{{{*/ -bool Tria::InputConvergence(IssmDouble* eps, int* enums,int num_enums,int* criterionenums,IssmDouble* criterionvalues,int num_criterionenums){ - - bool converged=true; - int i; - Input** new_inputs=NULL; - Input** old_inputs=NULL; - - new_inputs=xNew(num_enums/2); //half the enums are for the new inputs - old_inputs=xNew(num_enums/2); //half the enums are for the old inputs - - for(i=0;iinputs->GetInput(enums[2*i+0]); - old_inputs[i]=(Input*)this->inputs->GetInput(enums[2*i+1]); - if(!new_inputs[i])_error_("could not find input with enum " << EnumToStringx(enums[2*i+0])); - if(!old_inputs[i])_error_("could not find input with enum " << EnumToStringx(enums[2*i+0])); - } - - /*ok, we've got the inputs (new and old), now loop throught the number of criterions and fill the eps array:*/ - for(i=0;icriterionvalues[i]) converged=false; - } - - /*clean up and return*/ - xDelete(new_inputs); - xDelete(old_inputs); - return converged; } /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.h (revision 15081) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.h (revision 15082) @@ -97,5 +97,4 @@ void GetVectorFromResults(Vector* vector,int offset,int enum_in,int interp); void InputArtificialNoise(int enum_type,IssmDouble min, IssmDouble max); - bool InputConvergence(IssmDouble* eps, int* enums,int num_enums,int* criterionenums,IssmDouble* criterionvalues,int num_criterionenums); void InputCreate(IssmDouble scalar,int name,int code); void InputCreate(IssmDouble* vector, int index,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code); Index: /issm/trunk-jpl/src/c/classes/Inputs/BoolInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/BoolInput.cpp (revision 15081) +++ /issm/trunk-jpl/src/c/classes/Inputs/BoolInput.cpp (revision 15082) @@ -169,11 +169,4 @@ } /*}}}*/ -/*FUNCTION BoolInput::GetValuesPtr{{{*/ -void BoolInput::GetValuesPtr(IssmDouble** pvalues,int* pnum_values){ - - _error_("not supported yet!"); - -} -/*}}}*/ /*FUNCTION BoolInput::Configure{{{*/ void BoolInput::Configure(Parameters* parameters){ Index: /issm/trunk-jpl/src/c/classes/Inputs/BoolInput.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/BoolInput.h (revision 15081) +++ /issm/trunk-jpl/src/c/classes/Inputs/BoolInput.h (revision 15082) @@ -79,5 +79,4 @@ void VerticallyIntegrate(Input* thickness_input){_error_("not supported yet");}; void GetVectorFromInputs(Vector* vector,int* doflist); - void GetValuesPtr(IssmDouble** pvalues,int* pnum_values); /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/Inputs/ControlInput.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/ControlInput.h (revision 15081) +++ /issm/trunk-jpl/src/c/classes/Inputs/ControlInput.h (revision 15082) @@ -86,5 +86,4 @@ 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");}; ElementResult* SpawnGradient(int step, IssmDouble time); void GetGradient(Vector* gradient_vec,int* doflist); Index: /issm/trunk-jpl/src/c/classes/Inputs/DatasetInput.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/DatasetInput.h (revision 15081) +++ /issm/trunk-jpl/src/c/classes/Inputs/DatasetInput.h (revision 15082) @@ -79,5 +79,4 @@ void VerticallyIntegrate(Input* thickness_input){_error_("not implemented yet");}; void GetVectorFromInputs(Vector* vector,int* doflist){_error_("not implemented yet");}; - void GetValuesPtr(IssmDouble** pvalues,int* pnum_values){_error_("not implemented yet");}; ElementResult* SpawnGradient(int step, IssmDouble time){_error_("not implemented yet");}; void GetGradient(Vector* gradient_vec,int* doflist){_error_("not implemented yet");}; Index: /issm/trunk-jpl/src/c/classes/Inputs/DoubleInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/DoubleInput.cpp (revision 15081) +++ /issm/trunk-jpl/src/c/classes/Inputs/DoubleInput.cpp (revision 15082) @@ -246,11 +246,4 @@ } /*}}}*/ -/*FUNCTION DoubleInput::GetValuesPtr{{{*/ -void DoubleInput::GetValuesPtr(IssmDouble** pvalues,int* pnum_values){ - - _error_("not supported yet!"); - -} -/*}}}*/ /*FUNCTION DoubleInput::GetInputAverage{{{*/ void DoubleInput::GetInputAverage(IssmDouble* pvalue){ Index: /issm/trunk-jpl/src/c/classes/Inputs/DoubleInput.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/DoubleInput.h (revision 15081) +++ /issm/trunk-jpl/src/c/classes/Inputs/DoubleInput.h (revision 15082) @@ -78,5 +78,4 @@ void VerticallyIntegrate(Input* thickness_input); void GetVectorFromInputs(Vector* vector,int* doflist); - void GetValuesPtr(IssmDouble** pvalues,int* pnum_values); /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/Inputs/Input.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/Input.h (revision 15081) +++ /issm/trunk-jpl/src/c/classes/Inputs/Input.h (revision 15082) @@ -63,5 +63,4 @@ virtual void Extrude()=0; virtual void GetVectorFromInputs(Vector* vector,int* doflist)=0; - virtual void GetValuesPtr(IssmDouble** pvalues,int* pnum_values)=0; virtual Input* SpawnTriaInput(int* indices)=0; Index: /issm/trunk-jpl/src/c/classes/Inputs/Inputs.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/Inputs.cpp (revision 15081) +++ /issm/trunk-jpl/src/c/classes/Inputs/Inputs.cpp (revision 15082) @@ -425,55 +425,2 @@ } /*}}}*/ - -/*Methods relating to inputs: */ -void IsInputConverged(IssmDouble* peps, Input** new_inputs,Input** old_inputs,int num_inputs,int criterion_enum){ /*{{{*/ - - /*figure out convergence at the input level. - We are given a list of inputs, new and old, and a criterion, and using the - inputs, we return the value of the criterion test, which will be used at the - solution level to determine convergence. - */ - - int i,j; - - /*output: */ - IssmDouble eps; - - /*intermediary: */ - IssmDouble *newvalues = NULL; - IssmDouble *oldvalues = NULL; - int num_values; - IssmDouble ndu = 0; - IssmDouble nu = 0; - - if(criterion_enum==RelativeEnum){ - - /*conpute ndu/du (where u could be velocity, pressure, temperature, etc ...): */ - for(i=0;iObjectEnum()==old_inputs[i]->ObjectEnum()); - - /*Get pointers*/ - new_inputs[i]->GetValuesPtr(&newvalues,&num_values); - old_inputs[i]->GetValuesPtr(&oldvalues,&num_values); - for(j=0;j(nu))eps=ndu/nu; - else eps=0; - } - else _error_("convergence criterion " << EnumToStringx(criterion_enum) << " not supported yet!"); - - /*Assign output pointers:*/ - *peps=eps; -} -/*}}}*/ Index: /issm/trunk-jpl/src/c/classes/Inputs/Inputs.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/Inputs.h (revision 15081) +++ /issm/trunk-jpl/src/c/classes/Inputs/Inputs.h (revision 15082) @@ -43,6 +43,3 @@ }; -/*Methods relating to inputs: */ -void IsInputConverged(IssmDouble* peps, Input** new_inputs,Input** old_inputs,int num_inputs,int criterion_enum); - #endif //ifndef _INPUTS_H_ Index: /issm/trunk-jpl/src/c/classes/Inputs/IntInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/IntInput.cpp (revision 15081) +++ /issm/trunk-jpl/src/c/classes/Inputs/IntInput.cpp (revision 15082) @@ -175,11 +175,4 @@ } /*}}}*/ -/*FUNCTION IntInput::GetValuesPtr{{{*/ -void IntInput::GetValuesPtr(IssmDouble** pvalues,int* pnum_values){ - - _error_("not supported yet!"); - -} -/*}}}*/ /*FUNCTION IntInput::Configure{{{*/ void IntInput::Configure(Parameters* parameters){ Index: /issm/trunk-jpl/src/c/classes/Inputs/IntInput.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/IntInput.h (revision 15081) +++ /issm/trunk-jpl/src/c/classes/Inputs/IntInput.h (revision 15082) @@ -80,5 +80,4 @@ void VerticallyIntegrate(Input* thickness_input){_error_("not supported yet");}; void GetVectorFromInputs(Vector* vector,int* doflist); - void GetValuesPtr(IssmDouble** pvalues,int* pnum_values); /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/Inputs/PentaP1Input.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/PentaP1Input.cpp (revision 15081) +++ /issm/trunk-jpl/src/c/classes/Inputs/PentaP1Input.cpp (revision 15082) @@ -477,25 +477,22 @@ void PentaP1Input::VerticallyIntegrate(Input* thickness_input){ - /*Intermediaries*/ - int i; - const int numnodes = 6; - int num_thickness_values; - IssmDouble *thickness_values = NULL; + IssmDouble thickness; /*Check that input provided is a thickness*/ if (thickness_input->InstanceEnum()!=ThicknessEnum) _error_("Input provided is not a Thickness (enum_type is " << EnumToStringx(thickness_input->InstanceEnum()) << ")"); - /*Get Thickness value pointer*/ - thickness_input->GetValuesPtr(&thickness_values,&num_thickness_values); - /*vertically integrate depending on type:*/ switch(thickness_input->ObjectEnum()){ - case PentaP1InputEnum: - for(i=0;i<3;i++){ - this->values[i]=0.5*(this->values[i]+this->values[i+3]) * thickness_values[i]; - this->values[i+3]=this->values[i]; + case PentaP1InputEnum:{ + GaussPenta *gauss=new GaussPenta(); + for(int iv=0;iv<3;iv++){ + gauss->GaussVertex(iv); + thickness_input->GetInputValue(&thickness,gauss); + this->values[iv]=0.5*(this->values[iv]+this->values[iv+3]) * thickness; + this->values[iv+3]=this->values[iv]; } - return; + delete gauss; + return; } default: @@ -600,12 +597,4 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::GetValuesPtr{{{*/ -void PentaP1Input::GetValuesPtr(IssmDouble** pvalues,int* pnum_values){ - - *pvalues=this->values; - *pnum_values=6; - -} -/*}}}*/ /*FUNCTION PentaP1Input::Configure{{{*/ void PentaP1Input::Configure(Parameters* parameters){ Index: /issm/trunk-jpl/src/c/classes/Inputs/PentaP1Input.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/PentaP1Input.h (revision 15081) +++ /issm/trunk-jpl/src/c/classes/Inputs/PentaP1Input.h (revision 15082) @@ -82,5 +82,4 @@ void VerticallyIntegrate(Input* thickness_input); void GetVectorFromInputs(Vector* vector,int* doflist); - void GetValuesPtr(IssmDouble** pvalues,int* pnum_values); /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/Inputs/TransientInput.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/TransientInput.h (revision 15081) +++ /issm/trunk-jpl/src/c/classes/Inputs/TransientInput.h (revision 15082) @@ -83,5 +83,4 @@ void VerticallyIntegrate(Input* thickness_forcing){_error_("not supported yet");}; void GetVectorFromInputs(Vector* vector,int* doflist); - void GetValuesPtr(IssmDouble** pvalues,int* pnum_values){_error_("not supported yet");}; void GetTimeValues(IssmDouble* values,IssmDouble time){_error_("not implemented yet");}; Input* GetTimeInput(IssmDouble time); Index: /issm/trunk-jpl/src/c/classes/Inputs/TriaP1Input.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/TriaP1Input.cpp (revision 15081) +++ /issm/trunk-jpl/src/c/classes/Inputs/TriaP1Input.cpp (revision 15082) @@ -375,12 +375,4 @@ } /*}}}*/ -/*FUNCTION TriaP1Input::GetValuesPtr{{{*/ -void TriaP1Input::GetValuesPtr(IssmDouble** pvalues,int* pnum_values){ - - *pvalues=this->values; - if(pnum_values)*pnum_values=3; - -} -/*}}}*/ /*FUNCTION TriaP1Input::PointwiseMin{{{*/ Input* TriaP1Input::PointwiseMin(Input* inputB){ Index: /issm/trunk-jpl/src/c/classes/Inputs/TriaP1Input.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/TriaP1Input.h (revision 15081) +++ /issm/trunk-jpl/src/c/classes/Inputs/TriaP1Input.h (revision 15082) @@ -81,5 +81,4 @@ void VerticallyIntegrate(Input* thickness_input){_error_("not supported yet");}; void GetVectorFromInputs(Vector* vector,int* doflist); - void GetValuesPtr(IssmDouble** pvalues,int* pnum_values); /*}}}*/ Index: /issm/trunk-jpl/src/c/modules/CMakeLists.txt =================================================================== --- /issm/trunk-jpl/src/c/modules/CMakeLists.txt (revision 15081) +++ /issm/trunk-jpl/src/c/modules/CMakeLists.txt (revision 15082) @@ -29,5 +29,4 @@ add_subdirectory(InputArtificialNoisex) add_subdirectory(InputControlUpdatex) -add_subdirectory(InputConvergencex) add_subdirectory(InputDuplicatex) add_subdirectory(InputScalex) Index: /issm/trunk-jpl/src/c/modules/modules.h =================================================================== --- /issm/trunk-jpl/src/c/modules/modules.h (revision 15081) +++ /issm/trunk-jpl/src/c/modules/modules.h (revision 15082) @@ -35,5 +35,4 @@ #include "./HoleFillerx/HoleFillerx.h" #include "./InputControlUpdatex/InputControlUpdatex.h" -#include "./InputConvergencex/InputConvergencex.h" #include "./InputDuplicatex/InputDuplicatex.h" #include "./InputScalex/InputScalex.h" Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 15081) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 15082) @@ -529,6 +529,5 @@ TotalSmbEnum, /*}}}*/ - /*Convergence{{{*/ - RelativeEnum, + /*Relaxation{{{*/ AbsoluteEnum, IncrementalEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 15081) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 15082) @@ -516,5 +516,4 @@ case IceVolumeEnum : return "IceVolume"; case TotalSmbEnum : return "TotalSmb"; - case RelativeEnum : return "Relative"; case AbsoluteEnum : return "Absolute"; case IncrementalEnum : return "Incremental"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 15081) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 15082) @@ -528,5 +528,4 @@ else if (strcmp(name,"IceVolume")==0) return IceVolumeEnum; else if (strcmp(name,"TotalSmb")==0) return TotalSmbEnum; - else if (strcmp(name,"Relative")==0) return RelativeEnum; else if (strcmp(name,"Absolute")==0) return AbsoluteEnum; else if (strcmp(name,"Incremental")==0) return IncrementalEnum; Index: /issm/trunk-jpl/src/c/shared/Numerics/CMakeLists.txt =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/CMakeLists.txt (revision 15081) +++ /issm/trunk-jpl/src/c/shared/Numerics/CMakeLists.txt (revision 15082) @@ -9,5 +9,4 @@ $ENV{ISSM_DIR}/src/c/shared/Numerics/extrema.cpp $ENV{ISSM_DIR}/src/c/shared/Numerics/GaussPoints.cpp - $ENV{ISSM_DIR}/src/c/shared/Numerics/IsInputConverged.cpp $ENV{ISSM_DIR}/src/c/shared/Numerics/isnan.cpp $ENV{ISSM_DIR}/src/c/shared/Numerics/OptionsFromAnalysis.cpp