Index: /issm/trunk/src/c/DataSet/DataSet.cpp =================================================================== --- /issm/trunk/src/c/DataSet/DataSet.cpp (revision 4078) +++ /issm/trunk/src/c/DataSet/DataSet.cpp (revision 4079) @@ -1050,31 +1050,4 @@ } /*}}}*/ -/*FUNCTION DataSet::UpdateInputsFromConstant{{{1*/ -void DataSet::UpdateInputsFromConstant(double constant, int name){ - - vector::iterator object; - for ( object=objects.begin() ; object < objects.end(); object++ ){ - (*object)->UpdateInputsFromConstant(constant,name); - } -} -/*}}}*/ -/*FUNCTION DataSet::UpdateInputsFromConstant{{{1*/ -void DataSet::UpdateInputsFromConstant(int constant, int name){ - - vector::iterator object; - for ( object=objects.begin() ; object < objects.end(); object++ ){ - (*object)->UpdateInputsFromConstant(constant,name); - } -} -/*}}}*/ -/*FUNCTION DataSet::UpdateInputsFromConstant{{{1*/ -void DataSet::UpdateInputsFromConstant(bool constant, int name){ - - vector::iterator object; - for ( object=objects.begin() ; object < objects.end(); object++ ){ - (*object)->UpdateInputsFromConstant(constant,name); - } -} -/*}}}*/ /*FUNCTION DataSet::UpdateInputsFromVector{{{1*/ void DataSet::UpdateInputsFromVector(double* vec, int name, int type){ Index: /issm/trunk/src/c/DataSet/DataSet.h =================================================================== --- /issm/trunk/src/c/DataSet/DataSet.h (revision 4078) +++ /issm/trunk/src/c/DataSet/DataSet.h (revision 4079) @@ -68,7 +68,4 @@ void SetSorting(int* in_sorted_ids,int* in_id_offsets); void Sort(); - void UpdateInputsFromConstant(double constant, int name); - void UpdateInputsFromConstant(int constant, int name); - void UpdateInputsFromConstant(bool constant, int name); void UpdateInputsFromVector(double* vector,int name, int type); void UpdateInputsFromVector(int* vector,int name, int type); Index: /issm/trunk/src/c/Makefile.am =================================================================== --- /issm/trunk/src/c/Makefile.am (revision 4078) +++ /issm/trunk/src/c/Makefile.am (revision 4079) @@ -426,6 +426,6 @@ ./modules/SplitSolutionVectorx/SplitSolutionVectorx.h\ ./modules/SplitSolutionVectorx/SplitSolutionVectorx.cpp\ - ./modules/UpdateInputsFromConstantx/UpdateInputsFromConstantx.h\ - ./modules/UpdateInputsFromConstantx/UpdateInputsFromConstantx.cpp\ + ./modules/InputUpdateFromConstantx/InputUpdateFromConstantx.h\ + ./modules/InputUpdateFromConstantx/InputUpdateFromConstantx.cpp\ ./modules/UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.h\ ./modules/UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.cpp\ @@ -947,6 +947,6 @@ ./modules/SplitSolutionVectorx/SplitSolutionVectorx.h\ ./modules/SplitSolutionVectorx/SplitSolutionVectorx.cpp\ - ./modules/UpdateInputsFromConstantx/UpdateInputsFromConstantx.h\ - ./modules/UpdateInputsFromConstantx/UpdateInputsFromConstantx.cpp\ + ./modules/InputUpdateFromConstantx/InputUpdateFromConstantx.h\ + ./modules/InputUpdateFromConstantx/InputUpdateFromConstantx.cpp\ ./modules/UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.h\ ./modules/UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.cpp\ Index: /issm/trunk/src/c/modules/InputUpdateFromConstantx/InputUpdateFromConstantx.cpp =================================================================== --- /issm/trunk/src/c/modules/InputUpdateFromConstantx/InputUpdateFromConstantx.cpp (revision 4078) +++ /issm/trunk/src/c/modules/InputUpdateFromConstantx/InputUpdateFromConstantx.cpp (revision 4079) @@ -1,7 +1,7 @@ -/*!\file UpdateInputsFromConstantx +/*!\file InputUpdateFromConstantx * \brief: update datasets using parameter inputs */ -#include "./UpdateInputsFromConstantx.h" +#include "./InputUpdateFromConstantx.h" #include "../../shared/shared.h" #include "../../include/include.h" @@ -9,5 +9,7 @@ #include "../../EnumDefinitions/EnumDefinitions.h" -void UpdateInputsFromConstantx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,bool constant, int name){ +void InputUpdateFromConstantx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,bool constant, int name){ + + int i; /*First, get elements and loads configured: */ @@ -17,9 +19,18 @@ parameters->Configure(elements,loads, nodes,vertices, materials,parameters); - /*Elements drive the update: */ - elements->UpdateInputsFromConstant(constant,name); - loads->UpdateInputsFromConstant(constant,name); + /*Elements and loads drive the update: */ + for(i=0;elements->Size();i++){ + Element* element=(Element*)elements->GetObjectByOffset(i); + element->InputUpdateFromConstant(constant,name); + } + + for(i=0;loads->Size();i++){ + Load* load=(Load*)loads->GetObjectByOffset(i); + load->InputUpdateFromConstant(constant,name); + } } -void UpdateInputsFromConstantx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,int constant, int name){ +void InputUpdateFromConstantx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,int constant, int name){ + + int i; /*First, get elements and loads configured: */ @@ -29,9 +40,18 @@ parameters->Configure(elements,loads, nodes,vertices, materials,parameters); - /*Elements drive the update: */ - elements->UpdateInputsFromConstant(constant,name); - loads->UpdateInputsFromConstant(constant,name); + /*Elements and loads drive the update: */ + for(i=0;elements->Size();i++){ + Element* element=(Element*)elements->GetObjectByOffset(i); + element->InputUpdateFromConstant(constant,name); + } + + for(i=0;loads->Size();i++){ + Load* load=(Load*)loads->GetObjectByOffset(i); + load->InputUpdateFromConstant(constant,name); + } } -void UpdateInputsFromConstantx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,double constant, int name){ +void InputUpdateFromConstantx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,double constant, int name){ + + int i; /*First, get elements and loads configured: */ @@ -41,6 +61,13 @@ parameters->Configure(elements,loads, nodes,vertices, materials,parameters); - /*Elements drive the update: */ - elements->UpdateInputsFromConstant(constant,name); - loads->UpdateInputsFromConstant(constant,name); + /*Elements and loads drive the update: */ + for(i=0;elements->Size();i++){ + Element* element=(Element*)elements->GetObjectByOffset(i); + element->InputUpdateFromConstant(constant,name); + } + + for(i=0;loads->Size();i++){ + Load* load=(Load*)loads->GetObjectByOffset(i); + load->InputUpdateFromConstant(constant,name); + } } Index: /issm/trunk/src/c/modules/InputUpdateFromConstantx/InputUpdateFromConstantx.h =================================================================== --- /issm/trunk/src/c/modules/InputUpdateFromConstantx/InputUpdateFromConstantx.h (revision 4078) +++ /issm/trunk/src/c/modules/InputUpdateFromConstantx/InputUpdateFromConstantx.h (revision 4079) @@ -1,3 +1,3 @@ -/*!\file: UpdateInputsFromConstantx.h +/*!\file: InputUpdateFromConstantx.h * \brief header file for updating datasets from inputs */ @@ -10,7 +10,7 @@ /* local prototypes: */ -void UpdateInputsFromConstantx( DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials, Parameters* parameters, bool constant, int name); -void UpdateInputsFromConstantx( DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials, Parameters* parameters, int constant, int name); -void UpdateInputsFromConstantx( DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials, Parameters* parameters, double constant, int name); +void InputUpdateFromConstantx( DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials, Parameters* parameters, bool constant, int name); +void InputUpdateFromConstantx( DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials, Parameters* parameters, int constant, int name); +void InputUpdateFromConstantx( DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials, Parameters* parameters, double constant, int name); #endif /* _UPDATEINPUTSFROMCONSTANTXX_H */ Index: /issm/trunk/src/c/modules/modules.h =================================================================== --- /issm/trunk/src/c/modules/modules.h (revision 4078) +++ /issm/trunk/src/c/modules/modules.h (revision 4079) @@ -28,5 +28,5 @@ #include "./ConfigureObjectsx/ConfigureObjectsx.h" #include "./SystemMatricesx/SystemMatricesx.h" -#include "./UpdateInputsFromConstantx/UpdateInputsFromConstantx.h" +#include "./InputUpdateFromConstantx/InputUpdateFromConstantx.h" #include "./UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.h" #include "./UpdateInputsFromDakotax/UpdateInputsFromDakotax.h" Index: /issm/trunk/src/c/objects/Constraints/Rgb.h =================================================================== --- /issm/trunk/src/c/objects/Constraints/Rgb.h (revision 4078) +++ /issm/trunk/src/c/objects/Constraints/Rgb.h (revision 4079) @@ -38,7 +38,7 @@ void UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");} void UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} Index: /issm/trunk/src/c/objects/Constraints/Spc.h =================================================================== --- /issm/trunk/src/c/objects/Constraints/Spc.h (revision 4078) +++ /issm/trunk/src/c/objects/Constraints/Spc.h (revision 4079) @@ -42,7 +42,7 @@ void UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");} void UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} bool InAnalysis(int analysis_type); Index: /issm/trunk/src/c/objects/DofVec.h =================================================================== --- /issm/trunk/src/c/objects/DofVec.h (revision 4078) +++ /issm/trunk/src/c/objects/DofVec.h (revision 4079) @@ -50,7 +50,7 @@ void UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");} void UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} Object* copy(); Index: /issm/trunk/src/c/objects/ElementResults/BeamVertexElementResult.h =================================================================== --- /issm/trunk/src/c/objects/ElementResults/BeamVertexElementResult.h (revision 4078) +++ /issm/trunk/src/c/objects/ElementResults/BeamVertexElementResult.h (revision 4079) @@ -41,7 +41,7 @@ void UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");} void UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} Index: /issm/trunk/src/c/objects/ElementResults/DoubleElementResult.h =================================================================== --- /issm/trunk/src/c/objects/ElementResults/DoubleElementResult.h (revision 4078) +++ /issm/trunk/src/c/objects/ElementResults/DoubleElementResult.h (revision 4079) @@ -43,7 +43,7 @@ void UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");} void UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} Index: /issm/trunk/src/c/objects/ElementResults/PentaVertexElementResult.h =================================================================== --- /issm/trunk/src/c/objects/ElementResults/PentaVertexElementResult.h (revision 4078) +++ /issm/trunk/src/c/objects/ElementResults/PentaVertexElementResult.h (revision 4079) @@ -42,7 +42,7 @@ void UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");} void UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} Index: /issm/trunk/src/c/objects/ElementResults/SingVertexElementResult.h =================================================================== --- /issm/trunk/src/c/objects/ElementResults/SingVertexElementResult.h (revision 4078) +++ /issm/trunk/src/c/objects/ElementResults/SingVertexElementResult.h (revision 4079) @@ -41,7 +41,7 @@ void UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");} void UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} Index: /issm/trunk/src/c/objects/ElementResults/TriaVertexElementResult.h =================================================================== --- /issm/trunk/src/c/objects/ElementResults/TriaVertexElementResult.h (revision 4078) +++ /issm/trunk/src/c/objects/ElementResults/TriaVertexElementResult.h (revision 4079) @@ -41,7 +41,7 @@ void UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");} void UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} Index: /issm/trunk/src/c/objects/Elements/Beam.h =================================================================== --- /issm/trunk/src/c/objects/Elements/Beam.h (revision 4078) +++ /issm/trunk/src/c/objects/Elements/Beam.h (revision 4079) @@ -58,7 +58,7 @@ void UpdateInputsFromVector(int* vector, int name, int type); void UpdateInputsFromVector(bool* vector, int name, int type); - void UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} void UpdateInputsFromSolution(double* solution); void InputDepthAverageAtBase(int enum_type,int average_enum_type){ISSMERROR("not implemented yet");}; Index: /issm/trunk/src/c/objects/Elements/Penta.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 4078) +++ /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 4079) @@ -4842,16 +4842,16 @@ } /*}}}*/ -/*FUNCTION Penta::UpdateInputsFromConstant(int value, int name);{{{1*/ -void Penta::UpdateInputsFromConstant(int constant, int name){ +/*FUNCTION Penta::InputUpdateFromConstant(int value, int name);{{{1*/ +void Penta::InputUpdateFromConstant(int constant, int name){ /*Nothing updated for now*/ } /*}}}*/ -/*FUNCTION Penta::UpdateInputsFromConstant(bool value, int name);{{{1*/ -void Penta::UpdateInputsFromConstant(bool constant, int name){ +/*FUNCTION Penta::InputUpdateFromConstant(bool value, int name);{{{1*/ +void Penta::InputUpdateFromConstant(bool constant, int name){ /*Nothing updated for now*/ } /*}}}*/ -/*FUNCTION Penta::UpdateInputsFromConstant(double value, int name);{{{1*/ -void Penta::UpdateInputsFromConstant(double constant, int name){ +/*FUNCTION Penta::InputUpdateFromConstant(double value, int name);{{{1*/ +void Penta::InputUpdateFromConstant(double constant, int name){ /*Nothing updated for now*/ } Index: /issm/trunk/src/c/objects/Elements/Penta.h =================================================================== --- /issm/trunk/src/c/objects/Elements/Penta.h (revision 4078) +++ /issm/trunk/src/c/objects/Elements/Penta.h (revision 4079) @@ -183,7 +183,7 @@ void UpdateInputsFromVector(int* vector, int name, int type); void UpdateInputsFromVector(bool* vector, int name, int type); - void UpdateInputsFromConstant(double constant, int name); - void UpdateInputsFromConstant(int constant, int name); - void UpdateInputsFromConstant(bool constant, int name); + void InputUpdateFromConstant(double constant, int name); + void InputUpdateFromConstant(int constant, int name); + void InputUpdateFromConstant(bool constant, int name); Index: /issm/trunk/src/c/objects/Elements/Sing.h =================================================================== --- /issm/trunk/src/c/objects/Elements/Sing.h (revision 4078) +++ /issm/trunk/src/c/objects/Elements/Sing.h (revision 4079) @@ -58,7 +58,7 @@ void UpdateInputsFromVector(int* vector, int name, int type); void UpdateInputsFromVector(bool* vector, int name, int type); - void UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} void UpdateInputsFromSolution(double* solutiong); void InputDepthAverageAtBase(int enum_type,int average_enum_type){ISSMERROR("not implemented yet");}; Index: /issm/trunk/src/c/objects/Elements/Tria.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 4078) +++ /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 4079) @@ -5001,16 +5001,16 @@ } /*}}}*/ -/*FUNCTION Tria::UpdateInputsFromConstant(int value, int name);{{{1*/ -void Tria::UpdateInputsFromConstant(int constant, int name){ +/*FUNCTION Tria::InputUpdateFromConstant(int value, int name);{{{1*/ +void Tria::InputUpdateFromConstant(int constant, int name){ /*Nothing updated for now*/ } /*}}}*/ -/*FUNCTION Tria::UpdateInputsFromConstant(double value, int name);{{{1*/ -void Tria::UpdateInputsFromConstant(double constant, int name){ +/*FUNCTION Tria::InputUpdateFromConstant(double value, int name);{{{1*/ +void Tria::InputUpdateFromConstant(double constant, int name){ /*Nothing updated for now*/ } /*}}}*/ -/*FUNCTION Tria::UpdateInputsFromConstant(bool value, int name);{{{1*/ -void Tria::UpdateInputsFromConstant(bool constant, int name){ +/*FUNCTION Tria::InputUpdateFromConstant(bool value, int name);{{{1*/ +void Tria::InputUpdateFromConstant(bool constant, int name){ /*Nothing updated for now*/ } Index: /issm/trunk/src/c/objects/Elements/Tria.h =================================================================== --- /issm/trunk/src/c/objects/Elements/Tria.h (revision 4078) +++ /issm/trunk/src/c/objects/Elements/Tria.h (revision 4079) @@ -161,7 +161,7 @@ void UpdateInputsFromVector(int* vector, int name, int type); void UpdateInputsFromVector(bool* vector, int name, int type); - void UpdateInputsFromConstant(double constant, int name); - void UpdateInputsFromConstant(int constant, int name); - void UpdateInputsFromConstant(bool constant, int name); + void InputUpdateFromConstant(double constant, int name); + void InputUpdateFromConstant(int constant, int name); + void InputUpdateFromConstant(bool constant, int name); /*}}}*/ Index: /issm/trunk/src/c/objects/ExternalResults/BoolExternalResult.h =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/BoolExternalResult.h (revision 4078) +++ /issm/trunk/src/c/objects/ExternalResults/BoolExternalResult.h (revision 4079) @@ -58,7 +58,7 @@ void UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");} void UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} /*}}}*/ Index: /issm/trunk/src/c/objects/ExternalResults/DoubleExternalResult.h =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/DoubleExternalResult.h (revision 4078) +++ /issm/trunk/src/c/objects/ExternalResults/DoubleExternalResult.h (revision 4079) @@ -58,7 +58,7 @@ void UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");} void UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} /*}}}*/ Index: /issm/trunk/src/c/objects/ExternalResults/DoubleVecExternalResult.h =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/DoubleVecExternalResult.h (revision 4078) +++ /issm/trunk/src/c/objects/ExternalResults/DoubleVecExternalResult.h (revision 4079) @@ -57,7 +57,7 @@ void UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");} void UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} /*}}}*/ Index: /issm/trunk/src/c/objects/ExternalResults/IntExternalResult.h =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/IntExternalResult.h (revision 4078) +++ /issm/trunk/src/c/objects/ExternalResults/IntExternalResult.h (revision 4079) @@ -58,7 +58,7 @@ void UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");} void UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} /*}}}*/ Index: /issm/trunk/src/c/objects/ExternalResults/PetscVecExternalResult.h =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/PetscVecExternalResult.h (revision 4078) +++ /issm/trunk/src/c/objects/ExternalResults/PetscVecExternalResult.h (revision 4079) @@ -56,7 +56,7 @@ void UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");} void UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} /*}}}*/ Index: /issm/trunk/src/c/objects/ExternalResults/StringExternalResult.h =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/StringExternalResult.h (revision 4078) +++ /issm/trunk/src/c/objects/ExternalResults/StringExternalResult.h (revision 4079) @@ -57,7 +57,7 @@ void UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");} void UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} /*}}}*/ Index: /issm/trunk/src/c/objects/Inputs/BeamVertexInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/BeamVertexInput.h (revision 4078) +++ /issm/trunk/src/c/objects/Inputs/BeamVertexInput.h (revision 4079) @@ -39,7 +39,7 @@ void UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");} void UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} Index: /issm/trunk/src/c/objects/Inputs/BoolInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/BoolInput.h (revision 4078) +++ /issm/trunk/src/c/objects/Inputs/BoolInput.h (revision 4079) @@ -39,7 +39,7 @@ void UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");} void UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} Index: /issm/trunk/src/c/objects/Inputs/DoubleInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/DoubleInput.h (revision 4078) +++ /issm/trunk/src/c/objects/Inputs/DoubleInput.h (revision 4079) @@ -41,7 +41,7 @@ void UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");} void UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} Index: /issm/trunk/src/c/objects/Inputs/IntInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/IntInput.h (revision 4078) +++ /issm/trunk/src/c/objects/Inputs/IntInput.h (revision 4079) @@ -39,7 +39,7 @@ void UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");} void UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} Index: /issm/trunk/src/c/objects/Inputs/PentaVertexInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/PentaVertexInput.h (revision 4078) +++ /issm/trunk/src/c/objects/Inputs/PentaVertexInput.h (revision 4079) @@ -38,7 +38,7 @@ void UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");} void UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} Index: /issm/trunk/src/c/objects/Inputs/SingVertexInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/SingVertexInput.h (revision 4078) +++ /issm/trunk/src/c/objects/Inputs/SingVertexInput.h (revision 4079) @@ -38,7 +38,7 @@ void UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");} void UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} Index: /issm/trunk/src/c/objects/Inputs/TriaVertexInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/TriaVertexInput.h (revision 4078) +++ /issm/trunk/src/c/objects/Inputs/TriaVertexInput.h (revision 4079) @@ -39,7 +39,7 @@ void UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");} void UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} Index: /issm/trunk/src/c/objects/Loads/Icefront.cpp =================================================================== --- /issm/trunk/src/c/objects/Loads/Icefront.cpp (revision 4078) +++ /issm/trunk/src/c/objects/Loads/Icefront.cpp (revision 4079) @@ -1361,16 +1361,16 @@ } /*}}}*/ -/*FUNCTION Icefront::UpdateInputsFromConstant(double constant, int name) {{{1*/ -void Icefront::UpdateInputsFromConstant(double constant, int name){ +/*FUNCTION Icefront::InputUpdateFromConstant(double constant, int name) {{{1*/ +void Icefront::InputUpdateFromConstant(double constant, int name){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Icefront::UpdateInputsFromConstant(int constant, int name) {{{1*/ -void Icefront::UpdateInputsFromConstant(int constant, int name){ +/*FUNCTION Icefront::InputUpdateFromConstant(int constant, int name) {{{1*/ +void Icefront::InputUpdateFromConstant(int constant, int name){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Icefront::UpdateInputsFromConstant(bool constant, int name) {{{1*/ -void Icefront::UpdateInputsFromConstant(bool constant, int name){ +/*FUNCTION Icefront::InputUpdateFromConstant(bool constant, int name) {{{1*/ +void Icefront::InputUpdateFromConstant(bool constant, int name){ /*Nothing updated yet*/ } Index: /issm/trunk/src/c/objects/Loads/Icefront.h =================================================================== --- /issm/trunk/src/c/objects/Loads/Icefront.h (revision 4078) +++ /issm/trunk/src/c/objects/Loads/Icefront.h (revision 4079) @@ -52,7 +52,7 @@ void UpdateInputsFromVector(int* vector, int name, int type); void UpdateInputsFromVector(bool* vector, int name, int type); - void UpdateInputsFromConstant(double constant, int name); - void UpdateInputsFromConstant(int constant, int name); - void UpdateInputsFromConstant(bool constant, int name); + void InputUpdateFromConstant(double constant, int name); + void InputUpdateFromConstant(int constant, int name); + void InputUpdateFromConstant(bool constant, int name); void UpdateInputsFromSolution(double* solution); bool InAnalysis(int analysis_type); Index: /issm/trunk/src/c/objects/Loads/Numericalflux.h =================================================================== --- /issm/trunk/src/c/objects/Loads/Numericalflux.h (revision 4078) +++ /issm/trunk/src/c/objects/Loads/Numericalflux.h (revision 4079) @@ -47,7 +47,7 @@ void UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");} void UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} bool InAnalysis(int analysis_type); Index: /issm/trunk/src/c/objects/Loads/Pengrid.cpp =================================================================== --- /issm/trunk/src/c/objects/Loads/Pengrid.cpp (revision 4078) +++ /issm/trunk/src/c/objects/Loads/Pengrid.cpp (revision 4079) @@ -748,6 +748,6 @@ } /*}}}*/ -/*FUNCTION Pengrid::UpdateInputsFromConstant(double constant, int name) {{{1*/ -void Pengrid::UpdateInputsFromConstant(double constant, int name){ +/*FUNCTION Pengrid::InputUpdateFromConstant(double constant, int name) {{{1*/ +void Pengrid::InputUpdateFromConstant(double constant, int name){ switch(name){ @@ -759,11 +759,11 @@ } /*}}}*/ -/*FUNCTION Pengrid::UpdateInputsFromConstant(int constant, int name) {{{1*/ -void Pengrid::UpdateInputsFromConstant(int constant, int name){ +/*FUNCTION Pengrid::InputUpdateFromConstant(int constant, int name) {{{1*/ +void Pengrid::InputUpdateFromConstant(int constant, int name){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Pengrid::UpdateInputsFromConstant(bool constant, int name) {{{1*/ -void Pengrid::UpdateInputsFromConstant(bool constant, int name){ +/*FUNCTION Pengrid::InputUpdateFromConstant(bool constant, int name) {{{1*/ +void Pengrid::InputUpdateFromConstant(bool constant, int name){ switch(name){ Index: /issm/trunk/src/c/objects/Loads/Pengrid.h =================================================================== --- /issm/trunk/src/c/objects/Loads/Pengrid.h (revision 4078) +++ /issm/trunk/src/c/objects/Loads/Pengrid.h (revision 4079) @@ -53,7 +53,7 @@ void UpdateInputsFromVector(int* vector, int name, int type); void UpdateInputsFromVector(bool* vector, int name, int type); - void UpdateInputsFromConstant(double constant, int name); - void UpdateInputsFromConstant(int constant, int name); - void UpdateInputsFromConstant(bool constant, int name); + void InputUpdateFromConstant(double constant, int name); + void InputUpdateFromConstant(int constant, int name); + void InputUpdateFromConstant(bool constant, int name); void UpdateInputsFromSolution(double* solution); bool InAnalysis(int analysis_type); Index: /issm/trunk/src/c/objects/Loads/Penpair.h =================================================================== --- /issm/trunk/src/c/objects/Loads/Penpair.h (revision 4078) +++ /issm/trunk/src/c/objects/Loads/Penpair.h (revision 4079) @@ -44,7 +44,7 @@ void UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");} void UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} bool InAnalysis(int analysis_type); Index: /issm/trunk/src/c/objects/Loads/Riftfront.h =================================================================== --- /issm/trunk/src/c/objects/Loads/Riftfront.h (revision 4078) +++ /issm/trunk/src/c/objects/Loads/Riftfront.h (revision 4079) @@ -62,7 +62,7 @@ void UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");} void UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} bool InAnalysis(int analysis_type); Index: /issm/trunk/src/c/objects/Materials/Matice.cpp =================================================================== --- /issm/trunk/src/c/objects/Materials/Matice.cpp (revision 4078) +++ /issm/trunk/src/c/objects/Materials/Matice.cpp (revision 4079) @@ -443,16 +443,16 @@ } /*}}}*/ -/*FUNCTION Matice::UpdateInputsFromConstant(double constant, int name) {{{1*/ -void Matice::UpdateInputsFromConstant(double constant, int name){ - /*Nothing updated yet*/ -} -/*}}}*/ -/*FUNCTION Matice::UpdateInputsFromConstant(int constant, int name) {{{1*/ -void Matice::UpdateInputsFromConstant(int constant, int name){ - /*Nothing updated yet*/ -} -/*}}}*/ -/*FUNCTION Matice::UpdateInputsFromConstant(bool constant, int name) {{{1*/ -void Matice::UpdateInputsFromConstant(bool constant, int name){ +/*FUNCTION Matice::InputUpdateFromConstant(double constant, int name) {{{1*/ +void Matice::InputUpdateFromConstant(double constant, int name){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION Matice::InputUpdateFromConstant(int constant, int name) {{{1*/ +void Matice::InputUpdateFromConstant(int constant, int name){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION Matice::InputUpdateFromConstant(bool constant, int name) {{{1*/ +void Matice::InputUpdateFromConstant(bool constant, int name){ /*Nothing updated yet*/ } Index: /issm/trunk/src/c/objects/Materials/Matice.h =================================================================== --- /issm/trunk/src/c/objects/Materials/Matice.h (revision 4078) +++ /issm/trunk/src/c/objects/Materials/Matice.h (revision 4079) @@ -47,7 +47,7 @@ void UpdateInputsFromVector(int* vector, int name, int type); void UpdateInputsFromVector(bool* vector, int name, int type); - void UpdateInputsFromConstant(double constant, int name); - void UpdateInputsFromConstant(int constant, int name); - void UpdateInputsFromConstant(bool constant, int name); + void InputUpdateFromConstant(double constant, int name); + void InputUpdateFromConstant(int constant, int name); + void InputUpdateFromConstant(bool constant, int name); void UpdateInputsFromSolution(double* solution); Index: /issm/trunk/src/c/objects/Materials/Matpar.cpp =================================================================== --- /issm/trunk/src/c/objects/Materials/Matpar.cpp (revision 4078) +++ /issm/trunk/src/c/objects/Materials/Matpar.cpp (revision 4079) @@ -294,16 +294,16 @@ } /*}}}*/ -/*FUNCTION Matpar::UpdateInputsFromConstant(double constant, int name) {{{1*/ -void Matpar::UpdateInputsFromConstant(double constant, int name){ - /*Nothing updated yet*/ -} -/*}}}*/ -/*FUNCTION Matpar::UpdateInputsFromConstant(int constant, int name) {{{1*/ -void Matpar::UpdateInputsFromConstant(int constant, int name){ - /*Nothing updated yet*/ -} -/*}}}*/ -/*FUNCTION Matpar::UpdateInputsFromConstant(bool constant, int name) {{{1*/ -void Matpar::UpdateInputsFromConstant(bool constant, int name){ +/*FUNCTION Matpar::InputUpdateFromConstant(double constant, int name) {{{1*/ +void Matpar::InputUpdateFromConstant(double constant, int name){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION Matpar::InputUpdateFromConstant(int constant, int name) {{{1*/ +void Matpar::InputUpdateFromConstant(int constant, int name){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION Matpar::InputUpdateFromConstant(bool constant, int name) {{{1*/ +void Matpar::InputUpdateFromConstant(bool constant, int name){ /*Nothing updated yet*/ } Index: /issm/trunk/src/c/objects/Materials/Matpar.h =================================================================== --- /issm/trunk/src/c/objects/Materials/Matpar.h (revision 4078) +++ /issm/trunk/src/c/objects/Materials/Matpar.h (revision 4079) @@ -59,7 +59,7 @@ void UpdateInputsFromVector(int* vector, int name, int type); void UpdateInputsFromVector(bool* vector, int name, int type); - void UpdateInputsFromConstant(double constant, int name); - void UpdateInputsFromConstant(int constant, int name); - void UpdateInputsFromConstant(bool constant, int name); + void InputUpdateFromConstant(double constant, int name); + void InputUpdateFromConstant(int constant, int name); + void InputUpdateFromConstant(bool constant, int name); void UpdateInputsFromSolution(double* solution); Index: /issm/trunk/src/c/objects/Node.cpp =================================================================== --- /issm/trunk/src/c/objects/Node.cpp (revision 4078) +++ /issm/trunk/src/c/objects/Node.cpp (revision 4079) @@ -855,18 +855,18 @@ } /*}}}*/ -/*FUNCTION Node::UpdateInputsFromConstant(double constant, int name){{{2*/ -void Node::UpdateInputsFromConstant(double constant, int name){ +/*FUNCTION Node::InputUpdateFromConstant(double constant, int name){{{2*/ +void Node::InputUpdateFromConstant(double constant, int name){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Node::UpdateInputsFromConstant(int constant, int name){{{2*/ -void Node::UpdateInputsFromConstant(int constant, int name){ +/*FUNCTION Node::InputUpdateFromConstant(int constant, int name){{{2*/ +void Node::InputUpdateFromConstant(int constant, int name){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Node::UpdateInputsFromConstant(bool constant, int name){{{2*/ -void Node::UpdateInputsFromConstant(bool constant, int name){ +/*FUNCTION Node::InputUpdateFromConstant(bool constant, int name){{{2*/ +void Node::InputUpdateFromConstant(bool constant, int name){ /*Nothing updated yet*/ Index: /issm/trunk/src/c/objects/Node.h =================================================================== --- /issm/trunk/src/c/objects/Node.h (revision 4078) +++ /issm/trunk/src/c/objects/Node.h (revision 4079) @@ -56,7 +56,7 @@ void UpdateInputsFromVector(int* vector, int name, int type); void UpdateInputsFromVector(bool* vector, int name, int type); - void UpdateInputsFromConstant(double constant, int name); - void UpdateInputsFromConstant(int constant, int name); - void UpdateInputsFromConstant(bool constant, int name); + void InputUpdateFromConstant(double constant, int name); + void InputUpdateFromConstant(int constant, int name); + void InputUpdateFromConstant(bool constant, int name); void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} bool InAnalysis(int analysis_type); Index: /issm/trunk/src/c/objects/Object.h =================================================================== --- /issm/trunk/src/c/objects/Object.h (revision 4078) +++ /issm/trunk/src/c/objects/Object.h (revision 4079) @@ -28,7 +28,7 @@ virtual void UpdateInputsFromVector(int* vector, int name, int type)=0; virtual void UpdateInputsFromVector(bool* vector, int name, int type)=0; - virtual void UpdateInputsFromConstant(double constant, int name)=0; - virtual void UpdateInputsFromConstant(int constant, int name)=0; - virtual void UpdateInputsFromConstant(bool constant, int name)=0; + virtual void InputUpdateFromConstant(double constant, int name)=0; + virtual void InputUpdateFromConstant(int constant, int name)=0; + virtual void InputUpdateFromConstant(bool constant, int name)=0; virtual void UpdateInputsFromSolution(double* solution)=0; Index: /issm/trunk/src/c/objects/Params/BoolParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/BoolParam.cpp (revision 4078) +++ /issm/trunk/src/c/objects/Params/BoolParam.cpp (revision 4079) @@ -159,16 +159,16 @@ } /*}}}*/ -/*FUNCTION BoolParam::UpdateInputsFromConstant(double constant, int name) {{{1*/ -void BoolParam::UpdateInputsFromConstant(double constant, int name){ +/*FUNCTION BoolParam::InputUpdateFromConstant(double constant, int name) {{{1*/ +void BoolParam::InputUpdateFromConstant(double constant, int name){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION BoolParam::UpdateInputsFromConstant(int constant, int name) {{{1*/ -void BoolParam::UpdateInputsFromConstant(int constant, int name){ +/*FUNCTION BoolParam::InputUpdateFromConstant(int constant, int name) {{{1*/ +void BoolParam::InputUpdateFromConstant(int constant, int name){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION BoolParam::UpdateInputsFromConstant(bool constant, int name) {{{1*/ -void BoolParam::UpdateInputsFromConstant(bool constant, int name){ +/*FUNCTION BoolParam::InputUpdateFromConstant(bool constant, int name) {{{1*/ +void BoolParam::InputUpdateFromConstant(bool constant, int name){ /*Nothing updated yet*/ } Index: /issm/trunk/src/c/objects/Params/BoolParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/BoolParam.h (revision 4078) +++ /issm/trunk/src/c/objects/Params/BoolParam.h (revision 4079) @@ -53,7 +53,7 @@ void UpdateInputsFromVector(int* vector, int name, int type); void UpdateInputsFromVector(bool* vector, int name, int type); - void UpdateInputsFromConstant(double constant, int name); - void UpdateInputsFromConstant(int constant, int name); - void UpdateInputsFromConstant(bool constant, int name); + void InputUpdateFromConstant(double constant, int name); + void InputUpdateFromConstant(int constant, int name); + void InputUpdateFromConstant(bool constant, int name); void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} Index: /issm/trunk/src/c/objects/Params/DoubleMatParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleMatParam.cpp (revision 4078) +++ /issm/trunk/src/c/objects/Params/DoubleMatParam.cpp (revision 4079) @@ -215,16 +215,16 @@ } /*}}}*/ -/*FUNCTION DoubleMatParam::UpdateInputsFromConstant(double constant, int name) {{{1*/ -void DoubleMatParam::UpdateInputsFromConstant(double constant, int name){ - /*Nothing updated yet*/ -} -/*}}}*/ -/*FUNCTION DoubleMatParam::UpdateInputsFromConstant(int constant, int name) {{{1*/ -void DoubleMatParam::UpdateInputsFromConstant(int constant, int name){ - /*Nothing updated yet*/ -} -/*}}}*/ -/*FUNCTION DoubleMatParam::UpdateInputsFromConstant(bool constant, int name) {{{1*/ -void DoubleMatParam::UpdateInputsFromConstant(bool constant, int name){ +/*FUNCTION DoubleMatParam::InputUpdateFromConstant(double constant, int name) {{{1*/ +void DoubleMatParam::InputUpdateFromConstant(double constant, int name){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION DoubleMatParam::InputUpdateFromConstant(int constant, int name) {{{1*/ +void DoubleMatParam::InputUpdateFromConstant(int constant, int name){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION DoubleMatParam::InputUpdateFromConstant(bool constant, int name) {{{1*/ +void DoubleMatParam::InputUpdateFromConstant(bool constant, int name){ /*Nothing updated yet*/ } Index: /issm/trunk/src/c/objects/Params/DoubleMatParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleMatParam.h (revision 4078) +++ /issm/trunk/src/c/objects/Params/DoubleMatParam.h (revision 4079) @@ -56,7 +56,7 @@ void UpdateInputsFromVector(int* vector, int name, int type); void UpdateInputsFromVector(bool* vector, int name, int type); - void UpdateInputsFromConstant(double constant, int name); - void UpdateInputsFromConstant(int constant, int name); - void UpdateInputsFromConstant(bool constant, int name); + void InputUpdateFromConstant(double constant, int name); + void InputUpdateFromConstant(int constant, int name); + void InputUpdateFromConstant(bool constant, int name); void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} Index: /issm/trunk/src/c/objects/Params/DoubleParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleParam.cpp (revision 4078) +++ /issm/trunk/src/c/objects/Params/DoubleParam.cpp (revision 4079) @@ -181,16 +181,16 @@ } /*}}}*/ -/*FUNCTION DoubleParam::UpdateInputsFromConstant(double constant, int name) {{{1*/ -void DoubleParam::UpdateInputsFromConstant(double constant, int name){ +/*FUNCTION DoubleParam::InputUpdateFromConstant(double constant, int name) {{{1*/ +void DoubleParam::InputUpdateFromConstant(double constant, int name){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION DoubleParam::UpdateInputsFromConstant(int constant, int name) {{{1*/ -void DoubleParam::UpdateInputsFromConstant(int constant, int name){ +/*FUNCTION DoubleParam::InputUpdateFromConstant(int constant, int name) {{{1*/ +void DoubleParam::InputUpdateFromConstant(int constant, int name){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION DoubleParam::UpdateInputsFromConstant(bool constant, int name) {{{1*/ -void DoubleParam::UpdateInputsFromConstant(bool constant, int name){ +/*FUNCTION DoubleParam::InputUpdateFromConstant(bool constant, int name) {{{1*/ +void DoubleParam::InputUpdateFromConstant(bool constant, int name){ /*Nothing updated yet*/ } Index: /issm/trunk/src/c/objects/Params/DoubleParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleParam.h (revision 4078) +++ /issm/trunk/src/c/objects/Params/DoubleParam.h (revision 4079) @@ -54,7 +54,7 @@ void UpdateInputsFromVector(int* vector, int name, int type); void UpdateInputsFromVector(bool* vector, int name, int type); - void UpdateInputsFromConstant(double constant, int name); - void UpdateInputsFromConstant(int constant, int name); - void UpdateInputsFromConstant(bool constant, int name); + void InputUpdateFromConstant(double constant, int name); + void InputUpdateFromConstant(int constant, int name); + void InputUpdateFromConstant(bool constant, int name); void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} Index: /issm/trunk/src/c/objects/Params/DoubleVecParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleVecParam.cpp (revision 4078) +++ /issm/trunk/src/c/objects/Params/DoubleVecParam.cpp (revision 4079) @@ -225,16 +225,16 @@ } /*}}}*/ -/*FUNCTION DoubleVecParam::UpdateInputsFromConstant(double constant, int name) {{{1*/ -void DoubleVecParam::UpdateInputsFromConstant(double constant, int name){ - /*Nothing updated yet*/ -} -/*}}}*/ -/*FUNCTION DoubleVecParam::UpdateInputsFromConstant(int constant, int name) {{{1*/ -void DoubleVecParam::UpdateInputsFromConstant(int constant, int name){ - /*Nothing updated yet*/ -} -/*}}}*/ -/*FUNCTION DoubleVecParam::UpdateInputsFromConstant(bool constant, int name) {{{1*/ -void DoubleVecParam::UpdateInputsFromConstant(bool constant, int name){ +/*FUNCTION DoubleVecParam::InputUpdateFromConstant(double constant, int name) {{{1*/ +void DoubleVecParam::InputUpdateFromConstant(double constant, int name){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION DoubleVecParam::InputUpdateFromConstant(int constant, int name) {{{1*/ +void DoubleVecParam::InputUpdateFromConstant(int constant, int name){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION DoubleVecParam::InputUpdateFromConstant(bool constant, int name) {{{1*/ +void DoubleVecParam::InputUpdateFromConstant(bool constant, int name){ /*Nothing updated yet*/ } Index: /issm/trunk/src/c/objects/Params/DoubleVecParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleVecParam.h (revision 4078) +++ /issm/trunk/src/c/objects/Params/DoubleVecParam.h (revision 4079) @@ -54,7 +54,7 @@ void UpdateInputsFromVector(int* vector, int name, int type); void UpdateInputsFromVector(bool* vector, int name, int type); - void UpdateInputsFromConstant(double constant, int name); - void UpdateInputsFromConstant(int constant, int name); - void UpdateInputsFromConstant(bool constant, int name); + void InputUpdateFromConstant(double constant, int name); + void InputUpdateFromConstant(int constant, int name); + void InputUpdateFromConstant(bool constant, int name); void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} Index: /issm/trunk/src/c/objects/Params/IntParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/IntParam.cpp (revision 4078) +++ /issm/trunk/src/c/objects/Params/IntParam.cpp (revision 4079) @@ -160,16 +160,16 @@ } /*}}}*/ -/*FUNCTION IntParam::UpdateInputsFromConstant(double constant, int name) {{{1*/ -void IntParam::UpdateInputsFromConstant(double constant, int name){ +/*FUNCTION IntParam::InputUpdateFromConstant(double constant, int name) {{{1*/ +void IntParam::InputUpdateFromConstant(double constant, int name){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION IntParam::UpdateInputsFromConstant(int constant, int name) {{{1*/ -void IntParam::UpdateInputsFromConstant(int constant, int name){ +/*FUNCTION IntParam::InputUpdateFromConstant(int constant, int name) {{{1*/ +void IntParam::InputUpdateFromConstant(int constant, int name){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION IntParam::UpdateInputsFromConstant(bool constant, int name) {{{1*/ -void IntParam::UpdateInputsFromConstant(bool constant, int name){ +/*FUNCTION IntParam::InputUpdateFromConstant(bool constant, int name) {{{1*/ +void IntParam::InputUpdateFromConstant(bool constant, int name){ /*Nothing updated yet*/ } Index: /issm/trunk/src/c/objects/Params/IntParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/IntParam.h (revision 4078) +++ /issm/trunk/src/c/objects/Params/IntParam.h (revision 4079) @@ -54,7 +54,7 @@ void UpdateInputsFromVector(int* vector, int name, int type); void UpdateInputsFromVector(bool* vector, int name, int type); - void UpdateInputsFromConstant(double constant, int name); - void UpdateInputsFromConstant(int constant, int name); - void UpdateInputsFromConstant(bool constant, int name); + void InputUpdateFromConstant(double constant, int name); + void InputUpdateFromConstant(int constant, int name); + void InputUpdateFromConstant(bool constant, int name); void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} Index: /issm/trunk/src/c/objects/Params/PetscMatParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/PetscMatParam.cpp (revision 4078) +++ /issm/trunk/src/c/objects/Params/PetscMatParam.cpp (revision 4079) @@ -242,16 +242,16 @@ } /*}}}*/ -/*FUNCTION PetscMatParam::UpdateInputsFromConstant(double constant, int name) {{{1*/ -void PetscMatParam::UpdateInputsFromConstant(double constant, int name){ - /*Nothing updated yet*/ -} -/*}}}*/ -/*FUNCTION PetscMatParam::UpdateInputsFromConstant(int constant, int name) {{{1*/ -void PetscMatParam::UpdateInputsFromConstant(int constant, int name){ - /*Nothing updated yet*/ -} -/*}}}*/ -/*FUNCTION PetscMatParam::UpdateInputsFromConstant(bool constant, int name) {{{1*/ -void PetscMatParam::UpdateInputsFromConstant(bool constant, int name){ +/*FUNCTION PetscMatParam::InputUpdateFromConstant(double constant, int name) {{{1*/ +void PetscMatParam::InputUpdateFromConstant(double constant, int name){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION PetscMatParam::InputUpdateFromConstant(int constant, int name) {{{1*/ +void PetscMatParam::InputUpdateFromConstant(int constant, int name){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION PetscMatParam::InputUpdateFromConstant(bool constant, int name) {{{1*/ +void PetscMatParam::InputUpdateFromConstant(bool constant, int name){ /*Nothing updated yet*/ } Index: /issm/trunk/src/c/objects/Params/PetscMatParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/PetscMatParam.h (revision 4078) +++ /issm/trunk/src/c/objects/Params/PetscMatParam.h (revision 4079) @@ -54,7 +54,7 @@ void UpdateInputsFromVector(int* vector, int name, int type); void UpdateInputsFromVector(bool* vector, int name, int type); - void UpdateInputsFromConstant(double constant, int name); - void UpdateInputsFromConstant(int constant, int name); - void UpdateInputsFromConstant(bool constant, int name); + void InputUpdateFromConstant(double constant, int name); + void InputUpdateFromConstant(int constant, int name); + void InputUpdateFromConstant(bool constant, int name); void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} Index: /issm/trunk/src/c/objects/Params/PetscVecParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/PetscVecParam.cpp (revision 4078) +++ /issm/trunk/src/c/objects/Params/PetscVecParam.cpp (revision 4079) @@ -236,16 +236,16 @@ } /*}}}*/ -/*FUNCTION PetscVecParam::UpdateInputsFromConstant(double constant, int name) {{{1*/ -void PetscVecParam::UpdateInputsFromConstant(double constant, int name){ - /*Nothing updated yet*/ -} -/*}}}*/ -/*FUNCTION PetscVecParam::UpdateInputsFromConstant(int constant, int name) {{{1*/ -void PetscVecParam::UpdateInputsFromConstant(int constant, int name){ - /*Nothing updated yet*/ -} -/*}}}*/ -/*FUNCTION PetscVecParam::UpdateInputsFromConstant(bool constant, int name) {{{1*/ -void PetscVecParam::UpdateInputsFromConstant(bool constant, int name){ +/*FUNCTION PetscVecParam::InputUpdateFromConstant(double constant, int name) {{{1*/ +void PetscVecParam::InputUpdateFromConstant(double constant, int name){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION PetscVecParam::InputUpdateFromConstant(int constant, int name) {{{1*/ +void PetscVecParam::InputUpdateFromConstant(int constant, int name){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION PetscVecParam::InputUpdateFromConstant(bool constant, int name) {{{1*/ +void PetscVecParam::InputUpdateFromConstant(bool constant, int name){ /*Nothing updated yet*/ } Index: /issm/trunk/src/c/objects/Params/PetscVecParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/PetscVecParam.h (revision 4078) +++ /issm/trunk/src/c/objects/Params/PetscVecParam.h (revision 4079) @@ -54,7 +54,7 @@ void UpdateInputsFromVector(int* vector, int name, int type); void UpdateInputsFromVector(bool* vector, int name, int type); - void UpdateInputsFromConstant(double constant, int name); - void UpdateInputsFromConstant(int constant, int name); - void UpdateInputsFromConstant(bool constant, int name); + void InputUpdateFromConstant(double constant, int name); + void InputUpdateFromConstant(int constant, int name); + void InputUpdateFromConstant(bool constant, int name); void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} Index: /issm/trunk/src/c/objects/Params/StringArrayParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/StringArrayParam.cpp (revision 4078) +++ /issm/trunk/src/c/objects/Params/StringArrayParam.cpp (revision 4079) @@ -265,16 +265,16 @@ } /*}}}*/ -/*FUNCTION StringArrayParam::UpdateInputsFromConstant(double constant, int name) {{{1*/ -void StringArrayParam::UpdateInputsFromConstant(double constant, int name){ - /*Nothing updated yet*/ -} -/*}}}*/ -/*FUNCTION StringArrayParam::UpdateInputsFromConstant(int constant, int name) {{{1*/ -void StringArrayParam::UpdateInputsFromConstant(int constant, int name){ - /*Nothing updated yet*/ -} -/*}}}*/ -/*FUNCTION StringArrayParam::UpdateInputsFromConstant(bool constant, int name) {{{1*/ -void StringArrayParam::UpdateInputsFromConstant(bool constant, int name){ +/*FUNCTION StringArrayParam::InputUpdateFromConstant(double constant, int name) {{{1*/ +void StringArrayParam::InputUpdateFromConstant(double constant, int name){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION StringArrayParam::InputUpdateFromConstant(int constant, int name) {{{1*/ +void StringArrayParam::InputUpdateFromConstant(int constant, int name){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION StringArrayParam::InputUpdateFromConstant(bool constant, int name) {{{1*/ +void StringArrayParam::InputUpdateFromConstant(bool constant, int name){ /*Nothing updated yet*/ } Index: /issm/trunk/src/c/objects/Params/StringArrayParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/StringArrayParam.h (revision 4078) +++ /issm/trunk/src/c/objects/Params/StringArrayParam.h (revision 4079) @@ -56,7 +56,7 @@ void UpdateInputsFromVector(int* vector, int name, int type); void UpdateInputsFromVector(bool* vector, int name, int type); - void UpdateInputsFromConstant(double constant, int name); - void UpdateInputsFromConstant(int constant, int name); - void UpdateInputsFromConstant(bool constant, int name); + void InputUpdateFromConstant(double constant, int name); + void InputUpdateFromConstant(int constant, int name); + void InputUpdateFromConstant(bool constant, int name); void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} Index: /issm/trunk/src/c/objects/Params/StringParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/StringParam.cpp (revision 4078) +++ /issm/trunk/src/c/objects/Params/StringParam.cpp (revision 4079) @@ -191,16 +191,16 @@ } /*}}}*/ -/*FUNCTION StringParam::UpdateInputsFromConstant(double constant, int name) {{{1*/ -void StringParam::UpdateInputsFromConstant(double constant, int name){ - /*Nothing updated yet*/ -} -/*}}}*/ -/*FUNCTION StringParam::UpdateInputsFromConstant(int constant, int name) {{{1*/ -void StringParam::UpdateInputsFromConstant(int constant, int name){ - /*Nothing updated yet*/ -} -/*}}}*/ -/*FUNCTION StringParam::UpdateInputsFromConstant(bool constant, int name) {{{1*/ -void StringParam::UpdateInputsFromConstant(bool constant, int name){ +/*FUNCTION StringParam::InputUpdateFromConstant(double constant, int name) {{{1*/ +void StringParam::InputUpdateFromConstant(double constant, int name){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION StringParam::InputUpdateFromConstant(int constant, int name) {{{1*/ +void StringParam::InputUpdateFromConstant(int constant, int name){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION StringParam::InputUpdateFromConstant(bool constant, int name) {{{1*/ +void StringParam::InputUpdateFromConstant(bool constant, int name){ /*Nothing updated yet*/ } Index: /issm/trunk/src/c/objects/Params/StringParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/StringParam.h (revision 4078) +++ /issm/trunk/src/c/objects/Params/StringParam.h (revision 4079) @@ -54,7 +54,7 @@ void UpdateInputsFromVector(int* vector, int name, int type); void UpdateInputsFromVector(bool* vector, int name, int type); - void UpdateInputsFromConstant(double constant, int name); - void UpdateInputsFromConstant(int constant, int name); - void UpdateInputsFromConstant(bool constant, int name); + void InputUpdateFromConstant(double constant, int name); + void InputUpdateFromConstant(int constant, int name); + void InputUpdateFromConstant(bool constant, int name); void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} Index: /issm/trunk/src/c/objects/SolPar.h =================================================================== --- /issm/trunk/src/c/objects/SolPar.h (revision 4078) +++ /issm/trunk/src/c/objects/SolPar.h (revision 4079) @@ -42,7 +42,7 @@ void UpdateInputsFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");} void UpdateInputsFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");} + void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} Index: /issm/trunk/src/c/objects/Vertex.cpp =================================================================== --- /issm/trunk/src/c/objects/Vertex.cpp (revision 4078) +++ /issm/trunk/src/c/objects/Vertex.cpp (revision 4079) @@ -198,16 +198,16 @@ } /*}}}*/ -/*FUNCTION Vertex::UpdateInputsFromConstant(double constant, int name) {{{2*/ -void Vertex::UpdateInputsFromConstant(double constant, int name){ - /*Nothing updated yet*/ -} -/*}}}*/ -/*FUNCTION Vertex::UpdateInputsFromConstant(int constant, int name) {{{2*/ -void Vertex::UpdateInputsFromConstant(int constant, int name){ - /*Nothing updated yet*/ -} -/*}}}*/ -/*FUNCTION Vertex::UpdateInputsFromConstant(bool constant, int name) {{{2*/ -void Vertex::UpdateInputsFromConstant(bool constant, int name){ +/*FUNCTION Vertex::InputUpdateFromConstant(double constant, int name) {{{2*/ +void Vertex::InputUpdateFromConstant(double constant, int name){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION Vertex::InputUpdateFromConstant(int constant, int name) {{{2*/ +void Vertex::InputUpdateFromConstant(int constant, int name){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION Vertex::InputUpdateFromConstant(bool constant, int name) {{{2*/ +void Vertex::InputUpdateFromConstant(bool constant, int name){ /*Nothing updated yet*/ } Index: /issm/trunk/src/c/objects/Vertex.h =================================================================== --- /issm/trunk/src/c/objects/Vertex.h (revision 4078) +++ /issm/trunk/src/c/objects/Vertex.h (revision 4079) @@ -53,7 +53,7 @@ void UpdateInputsFromVector(int* vector, int name, int type); void UpdateInputsFromVector(bool* vector, int name, int type); - void UpdateInputsFromConstant(double constant, int name); - void UpdateInputsFromConstant(int constant, int name); - void UpdateInputsFromConstant(bool constant, int name); + void InputUpdateFromConstant(double constant, int name); + void InputUpdateFromConstant(int constant, int name); + void InputUpdateFromConstant(bool constant, int name); void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} Index: /issm/trunk/src/c/solutions/control_core.cpp =================================================================== --- /issm/trunk/src/c/solutions/control_core.cpp (revision 4078) +++ /issm/trunk/src/c/solutions/control_core.cpp (revision 4079) @@ -70,5 +70,5 @@ _printf_("\n%s%i%s%i\n"," control method step ",n+1,"/",nsteps); - UpdateInputsFromConstantx(femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,fit[n],FitEnum); + InputUpdateFromConstantx(femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,fit[n],FitEnum); /*In case we are running a steady state control method, compute new temperature field using new parameter * distribution: */ Index: /issm/trunk/src/c/solutions/objectivefunctionC.cpp =================================================================== --- /issm/trunk/src/c/solutions/objectivefunctionC.cpp (revision 4078) +++ /issm/trunk/src/c/solutions/objectivefunctionC.cpp (revision 4079) @@ -67,5 +67,5 @@ /*Compute misfit for this velocity field.*/ - UpdateInputsFromConstantx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,fit[n],FitEnum); + InputUpdateFromConstantx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,fit[n],FitEnum); CostFunctionx( &J, femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials, femmodel->parameters); Index: /issm/trunk/src/c/solvers/solver_diagnostic_nonlinear.cpp =================================================================== --- /issm/trunk/src/c/solvers/solver_diagnostic_nonlinear.cpp (revision 4078) +++ /issm/trunk/src/c/solvers/solver_diagnostic_nonlinear.cpp (revision 4079) @@ -115,5 +115,5 @@ /*add converged to inputs: */ - UpdateInputsFromConstantx( fem->elements,fem->nodes, fem->vertices, fem->loads, fem->materials, fem->parameters,converged,ConvergedEnum); + InputUpdateFromConstantx( fem->elements,fem->nodes, fem->vertices, fem->loads, fem->materials, fem->parameters,converged,ConvergedEnum); //rift convergence Index: /issm/trunk/src/c/solvers/solver_thermal_nonlinear.cpp =================================================================== --- /issm/trunk/src/c/solvers/solver_thermal_nonlinear.cpp (revision 4078) +++ /issm/trunk/src/c/solvers/solver_thermal_nonlinear.cpp (revision 4079) @@ -56,5 +56,5 @@ if(count==1) reset_penalties=1; else reset_penalties=0; - UpdateInputsFromConstantx( fem->elements,fem->nodes, fem->vertices, fem->loads, fem->materials, fem->parameters,reset_penalties,ResetPenaltiesEnum); + InputUpdateFromConstantx( fem->elements,fem->nodes, fem->vertices, fem->loads, fem->materials, fem->parameters,reset_penalties,ResetPenaltiesEnum); //*Generate system matrices