Index: /issm/trunk/src/c/Makefile.am =================================================================== --- /issm/trunk/src/c/Makefile.am (revision 4084) +++ /issm/trunk/src/c/Makefile.am (revision 4085) @@ -430,6 +430,6 @@ ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.h\ ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp\ - ./modules/UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.h\ - ./modules/UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.cpp\ + ./modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.h\ + ./modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.cpp\ ./modules/GetSolutionFromInputsx/GetSolutionFromInputsx.h\ ./modules/GetSolutionFromInputsx/GetSolutionFromInputsx.cpp\ @@ -953,6 +953,6 @@ ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.h\ ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp\ - ./modules/UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.h\ - ./modules/UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.cpp\ + ./modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.h\ + ./modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.cpp\ ./modules/GetSolutionFromInputsx/GetSolutionFromInputsx.h\ ./modules/GetSolutionFromInputsx/GetSolutionFromInputsx.cpp\ Index: /issm/trunk/src/c/modules/modules.h =================================================================== --- /issm/trunk/src/c/modules/modules.h (revision 4084) +++ /issm/trunk/src/c/modules/modules.h (revision 4085) @@ -29,5 +29,5 @@ #include "./SystemMatricesx/SystemMatricesx.h" #include "./InputUpdateFromConstantx/InputUpdateFromConstantx.h" -#include "./UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.h" +#include "./InputUpdateFromSolutionx/InputUpdateFromSolutionx.h" #include "./InputUpdateFromDakotax/InputUpdateFromDakotax.h" #include "./UpdateInputsFromVectorx/UpdateInputsFromVectorx.h" Index: /issm/trunk/src/c/objects/Constraints/Rgb.h =================================================================== --- /issm/trunk/src/c/objects/Constraints/Rgb.h (revision 4084) +++ /issm/trunk/src/c/objects/Constraints/Rgb.h (revision 4085) @@ -41,5 +41,5 @@ 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!");} + void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} Index: /issm/trunk/src/c/objects/Constraints/Spc.h =================================================================== --- /issm/trunk/src/c/objects/Constraints/Spc.h (revision 4084) +++ /issm/trunk/src/c/objects/Constraints/Spc.h (revision 4085) @@ -45,5 +45,5 @@ 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!");} + void InputUpdateFromSolution(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 4084) +++ /issm/trunk/src/c/objects/DofVec.h (revision 4085) @@ -53,5 +53,5 @@ 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!");} + void InputUpdateFromSolution(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 4084) +++ /issm/trunk/src/c/objects/ElementResults/BeamVertexElementResult.h (revision 4085) @@ -44,5 +44,5 @@ 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!");} + void InputUpdateFromSolution(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 4084) +++ /issm/trunk/src/c/objects/ElementResults/DoubleElementResult.h (revision 4085) @@ -46,5 +46,5 @@ 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!");} + void InputUpdateFromSolution(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 4084) +++ /issm/trunk/src/c/objects/ElementResults/PentaVertexElementResult.h (revision 4085) @@ -45,5 +45,5 @@ 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!");} + void InputUpdateFromSolution(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 4084) +++ /issm/trunk/src/c/objects/ElementResults/SingVertexElementResult.h (revision 4085) @@ -44,5 +44,5 @@ 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!");} + void InputUpdateFromSolution(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 4084) +++ /issm/trunk/src/c/objects/ElementResults/TriaVertexElementResult.h (revision 4085) @@ -44,5 +44,5 @@ 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!");} + void InputUpdateFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} /*}}}*/ Index: /issm/trunk/src/c/objects/Elements/Beam.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Beam.cpp (revision 4084) +++ /issm/trunk/src/c/objects/Elements/Beam.cpp (revision 4085) @@ -137,6 +137,6 @@ } /*}}}*/ -/*FUNCTION Beam::UpdateInputsFromSolution {{{1*/ -void Beam::UpdateInputsFromSolution(double* solution){ +/*FUNCTION Beam::InputUpdateFromSolution {{{1*/ +void Beam::InputUpdateFromSolution(double* solution){ ISSMERROR(" not supported yet!"); } Index: /issm/trunk/src/c/objects/Elements/Beam.h =================================================================== --- /issm/trunk/src/c/objects/Elements/Beam.h (revision 4084) +++ /issm/trunk/src/c/objects/Elements/Beam.h (revision 4085) @@ -61,5 +61,5 @@ 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 InputUpdateFromSolution(double* solution); void InputDepthAverageAtBase(int enum_type,int average_enum_type){ISSMERROR("not implemented yet");}; void InputToResult(int enum_type,int step,double time); Index: /issm/trunk/src/c/objects/Elements/Penta.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 4084) +++ /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 4085) @@ -631,6 +631,6 @@ } /*}}}*/ -/*FUNCTION Penta::UpdateInputsFromSolution {{{1*/ -void Penta::UpdateInputsFromSolution(double* solution){ +/*FUNCTION Penta::InputUpdateFromSolution {{{1*/ +void Penta::InputUpdateFromSolution(double* solution){ int analysis_type,sub_analysis_type; @@ -640,8 +640,8 @@ parameters->FindParam(&sub_analysis_type,AnalysisTypeEnum); - /*Just branch to the correct UpdateInputsFromSolution generator, according to the type of analysis we are carrying out: */ + /*Just branch to the correct InputUpdateFromSolution generator, according to the type of analysis we are carrying out: */ if (analysis_type==ControlAnalysisEnum){ - UpdateInputsFromSolutionDiagnosticHoriz( solution); + InputUpdateFromSolutionDiagnosticHoriz( solution); } else if (analysis_type==DiagnosticAnalysisEnum){ @@ -649,9 +649,9 @@ if (sub_analysis_type==HorizAnalysisEnum){ - UpdateInputsFromSolutionDiagnosticHoriz( solution); + InputUpdateFromSolutionDiagnosticHoriz( solution); } else if (sub_analysis_type==StokesAnalysisEnum){ - UpdateInputsFromSolutionDiagnosticStokes( solution); + InputUpdateFromSolutionDiagnosticStokes( solution); } else ISSMERROR("%s%i%s\n","sub_analysis: ",sub_analysis_type," not supported yet"); @@ -660,25 +660,25 @@ else if (analysis_type==SlopeAnalysisEnum){ - UpdateInputsFromSolutionSlopeCompute( solution); + InputUpdateFromSolutionSlopeCompute( solution); } else if (analysis_type==PrognosticAnalysisEnum){ - UpdateInputsFromSolutionPrognostic( solution); + InputUpdateFromSolutionPrognostic( solution); } else if (analysis_type==Prognostic2AnalysisEnum){ - UpdateInputsFromSolutionPrognostic2(solution); + InputUpdateFromSolutionPrognostic2(solution); } else if (analysis_type==BalancedthicknessAnalysisEnum){ - UpdateInputsFromSolutionBalancedthickness( solution); + InputUpdateFromSolutionBalancedthickness( solution); } else if (analysis_type==Balancedthickness2AnalysisEnum){ - UpdateInputsFromSolutionBalancedthickness2( solution); + InputUpdateFromSolutionBalancedthickness2( solution); } else if (analysis_type==BalancedvelocitiesAnalysisEnum){ - UpdateInputsFromSolutionBalancedvelocities( solution); + InputUpdateFromSolutionBalancedvelocities( solution); } else{ @@ -688,6 +688,6 @@ } /*Object functions*/ -/*FUNCTION Penta::UpdateInputsFromSolutionDiagnosticHoriz {{{1*/ -void Penta::UpdateInputsFromSolutionDiagnosticHoriz(double* solution){ +/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticHoriz {{{1*/ +void Penta::InputUpdateFromSolutionDiagnosticHoriz(double* solution){ @@ -749,6 +749,6 @@ /*}}}*/ -/*FUNCTION Penta::UpdateInputsFromSolutionDiagnosticStokes {{{1*/ -void Penta::UpdateInputsFromSolutionDiagnosticStokes(double* solution){ +/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticStokes {{{1*/ +void Penta::InputUpdateFromSolutionDiagnosticStokes(double* solution){ @@ -806,31 +806,31 @@ /*}}}*/ -/*FUNCTION Penta::UpdateInputsFromSolutionSlopeCompute {{{1*/ -void Penta::UpdateInputsFromSolutionSlopeCompute(double* solution){ +/*FUNCTION Penta::InputUpdateFromSolutionSlopeCompute {{{1*/ +void Penta::InputUpdateFromSolutionSlopeCompute(double* solution){ ISSMERROR(" not supported yet!"); } /*}}}*/ -/*FUNCTION Penta::UpdateInputsFromSolutionPrognostic {{{1*/ -void Penta::UpdateInputsFromSolutionPrognostic(double* solution){ +/*FUNCTION Penta::InputUpdateFromSolutionPrognostic {{{1*/ +void Penta::InputUpdateFromSolutionPrognostic(double* solution){ ISSMERROR(" not supported yet!"); } /*}}}*/ -/*FUNCTION Penta::UpdateInputsFromSolutionPrognostic2 {{{1*/ -void Penta::UpdateInputsFromSolutionPrognostic2(double* solution){ +/*FUNCTION Penta::InputUpdateFromSolutionPrognostic2 {{{1*/ +void Penta::InputUpdateFromSolutionPrognostic2(double* solution){ ISSMERROR(" not supported yet!"); } /*}}}*/ -/*FUNCTION Penta::UpdateInputsFromSolutionBalancedthickness {{{1*/ -void Penta::UpdateInputsFromSolutionBalancedthickness(double* solution){ +/*FUNCTION Penta::InputUpdateFromSolutionBalancedthickness {{{1*/ +void Penta::InputUpdateFromSolutionBalancedthickness(double* solution){ ISSMERROR(" not supported yet!"); } /*}}}*/ -/*FUNCTION Penta::UpdateInputsFromSolutionBalancedthickness2 {{{1*/ -void Penta::UpdateInputsFromSolutionBalancedthickness2(double* solution){ +/*FUNCTION Penta::InputUpdateFromSolutionBalancedthickness2 {{{1*/ +void Penta::InputUpdateFromSolutionBalancedthickness2(double* solution){ ISSMERROR(" not supported yet!"); } /*}}}*/ -/*FUNCTION Penta::UpdateInputsFromSolutionBalancedvelocities {{{1*/ -void Penta::UpdateInputsFromSolutionBalancedvelocities(double* solution){ +/*FUNCTION Penta::InputUpdateFromSolutionBalancedvelocities {{{1*/ +void Penta::InputUpdateFromSolutionBalancedvelocities(double* solution){ ISSMERROR(" not supported yet!"); } @@ -846,5 +846,5 @@ - /*Just branch to the correct UpdateInputsFromSolution generator, according to the type of analysis we are carrying out: */ + /*Just branch to the correct InputUpdateFromSolution generator, according to the type of analysis we are carrying out: */ if (analysis_type==DiagnosticAnalysisEnum){ if (sub_analysis_type==HorizAnalysisEnum){ Index: /issm/trunk/src/c/objects/Elements/Penta.h =================================================================== --- /issm/trunk/src/c/objects/Elements/Penta.h (revision 4084) +++ /issm/trunk/src/c/objects/Elements/Penta.h (revision 4085) @@ -171,13 +171,13 @@ /*updates: */ void UpdateFromDakota(void* inputs); - void UpdateInputsFromSolution(double* solutiong); - void UpdateInputsFromSolutionDiagnosticHoriz( double* solutiong); - void UpdateInputsFromSolutionDiagnosticStokes( double* solutiong); - void UpdateInputsFromSolutionSlopeCompute( double* solutiong); - void UpdateInputsFromSolutionPrognostic( double* solutiong); - void UpdateInputsFromSolutionPrognostic2(double* solutiong); - void UpdateInputsFromSolutionBalancedthickness( double* solutiong); - void UpdateInputsFromSolutionBalancedthickness2( double* solutiong); - void UpdateInputsFromSolutionBalancedvelocities( double* solutiong); + void InputUpdateFromSolution(double* solutiong); + void InputUpdateFromSolutionDiagnosticHoriz( double* solutiong); + void InputUpdateFromSolutionDiagnosticStokes( double* solutiong); + void InputUpdateFromSolutionSlopeCompute( double* solutiong); + void InputUpdateFromSolutionPrognostic( double* solutiong); + void InputUpdateFromSolutionPrognostic2(double* solutiong); + void InputUpdateFromSolutionBalancedthickness( double* solutiong); + void InputUpdateFromSolutionBalancedthickness2( double* solutiong); + void InputUpdateFromSolutionBalancedvelocities( double* solutiong); void UpdateInputsFromVector(double* vector, int name, int type); void UpdateInputsFromVector(int* vector, int name, int type); Index: /issm/trunk/src/c/objects/Elements/Sing.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Sing.cpp (revision 4084) +++ /issm/trunk/src/c/objects/Elements/Sing.cpp (revision 4085) @@ -127,6 +127,6 @@ } /*}}}*/ -/*FUNCTION Sing::UpdateInputsFromSolution {{{1*/ -void Sing::UpdateInputsFromSolution(double* solution){ +/*FUNCTION Sing::InputUpdateFromSolution {{{1*/ +void Sing::InputUpdateFromSolution(double* solution){ ISSMERROR(" not supported yet!"); } Index: /issm/trunk/src/c/objects/Elements/Sing.h =================================================================== --- /issm/trunk/src/c/objects/Elements/Sing.h (revision 4084) +++ /issm/trunk/src/c/objects/Elements/Sing.h (revision 4085) @@ -61,5 +61,5 @@ 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 InputUpdateFromSolution(double* solutiong); void InputDepthAverageAtBase(int enum_type,int average_enum_type){ISSMERROR("not implemented yet");}; void InputToResult(int enum_type,int step,double time); Index: /issm/trunk/src/c/objects/Elements/Tria.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 4084) +++ /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 4085) @@ -550,6 +550,6 @@ } /*}}}*/ -/*FUNCTION Tria::UpdateInputsFromSolution {{{1*/ -void Tria::UpdateInputsFromSolution(double* solution){ +/*FUNCTION Tria::InputUpdateFromSolution {{{1*/ +void Tria::InputUpdateFromSolution(double* solution){ int analysis_type,sub_analysis_type; @@ -559,31 +559,31 @@ parameters->FindParam(&sub_analysis_type,AnalysisTypeEnum); - /*Just branch to the correct UpdateInputsFromSolution generator, according to the type of analysis we are carrying out: */ + /*Just branch to the correct InputUpdateFromSolution generator, according to the type of analysis we are carrying out: */ if (analysis_type==ControlAnalysisEnum){ - UpdateInputsFromSolutionDiagnosticHoriz( solution); + InputUpdateFromSolutionDiagnosticHoriz( solution); } else if (analysis_type==DiagnosticAnalysisEnum){ if (sub_analysis_type==HorizAnalysisEnum){ - UpdateInputsFromSolutionDiagnosticHoriz( solution); + InputUpdateFromSolutionDiagnosticHoriz( solution); } else ISSMERROR("%s%i%s\n","sub_analysis: ",sub_analysis_type," not supported yet"); } else if (analysis_type==SlopeAnalysisEnum){ - UpdateInputsFromSolutionSlopeCompute( solution); + InputUpdateFromSolutionSlopeCompute( solution); } else if (analysis_type==PrognosticAnalysisEnum){ - UpdateInputsFromSolutionPrognostic( solution); + InputUpdateFromSolutionPrognostic( solution); } else if (analysis_type==Prognostic2AnalysisEnum){ - UpdateInputsFromSolutionPrognostic2(solution); + InputUpdateFromSolutionPrognostic2(solution); } else if (analysis_type==BalancedthicknessAnalysisEnum){ - UpdateInputsFromSolutionBalancedthickness( solution); + InputUpdateFromSolutionBalancedthickness( solution); } else if (analysis_type==Balancedthickness2AnalysisEnum){ - UpdateInputsFromSolutionBalancedthickness2( solution); + InputUpdateFromSolutionBalancedthickness2( solution); } else if (analysis_type==BalancedvelocitiesAnalysisEnum){ - UpdateInputsFromSolutionBalancedvelocities( solution); + InputUpdateFromSolutionBalancedvelocities( solution); } else{ @@ -592,6 +592,6 @@ } /*}}}*/ -/*FUNCTION Tria::UpdateInputsFromSolutionDiagnosticHoriz {{{1*/ -void Tria::UpdateInputsFromSolutionDiagnosticHoriz(double* solution){ +/*FUNCTION Tria::InputUpdateFromSolutionDiagnosticHoriz {{{1*/ +void Tria::InputUpdateFromSolutionDiagnosticHoriz(double* solution){ int i; @@ -652,11 +652,11 @@ /*}}}*/ -/*FUNCTION Tria::UpdateInputsFromSolutionSlopeCompute {{{1*/ -void Tria::UpdateInputsFromSolutionSlopeCompute(double* solution){ +/*FUNCTION Tria::InputUpdateFromSolutionSlopeCompute {{{1*/ +void Tria::InputUpdateFromSolutionSlopeCompute(double* solution){ ISSMERROR(" not supported yet!"); } /*}}}*/ -/*FUNCTION Tria::UpdateInputsFromSolutionPrognostic {{{1*/ -void Tria::UpdateInputsFromSolutionPrognostic(double* solution){ +/*FUNCTION Tria::InputUpdateFromSolutionPrognostic {{{1*/ +void Tria::InputUpdateFromSolutionPrognostic(double* solution){ int i; @@ -684,11 +684,11 @@ } /*}}}*/ -/*FUNCTION Tria::UpdateInputsFromSolutionPrognostic2 {{{1*/ -void Tria::UpdateInputsFromSolutionPrognostic2(double* solution){ +/*FUNCTION Tria::InputUpdateFromSolutionPrognostic2 {{{1*/ +void Tria::InputUpdateFromSolutionPrognostic2(double* solution){ ISSMERROR(" not supported yet!"); } /*}}}*/ -/*FUNCTION Tria::UpdateInputsFromSolutionBalancedthickness {{{1*/ -void Tria::UpdateInputsFromSolutionBalancedthickness(double* solution){ +/*FUNCTION Tria::InputUpdateFromSolutionBalancedthickness {{{1*/ +void Tria::InputUpdateFromSolutionBalancedthickness(double* solution){ int i; @@ -716,11 +716,11 @@ } /*}}}*/ -/*FUNCTION Tria::UpdateInputsFromSolutionBalancedthickness2 {{{1*/ -void Tria::UpdateInputsFromSolutionBalancedthickness2(double* solution){ +/*FUNCTION Tria::InputUpdateFromSolutionBalancedthickness2 {{{1*/ +void Tria::InputUpdateFromSolutionBalancedthickness2(double* solution){ ISSMERROR(" not supported yet!"); } /*}}}*/ -/*FUNCTION Tria::UpdateInputsFromSolutionBalancedvelocities {{{1*/ -void Tria::UpdateInputsFromSolutionBalancedvelocities(double* solution){ +/*FUNCTION Tria::InputUpdateFromSolutionBalancedvelocities {{{1*/ +void Tria::InputUpdateFromSolutionBalancedvelocities(double* solution){ ISSMERROR(" not supported yet!"); } @@ -735,5 +735,5 @@ parameters->FindParam(&sub_analysis_type,AnalysisTypeEnum); - /*Just branch to the correct UpdateInputsFromSolution generator, according to the type of analysis we are carrying out: */ + /*Just branch to the correct InputUpdateFromSolution generator, according to the type of analysis we are carrying out: */ if (analysis_type==DiagnosticAnalysisEnum){ if (sub_analysis_type==HorizAnalysisEnum){ Index: /issm/trunk/src/c/objects/Elements/Tria.h =================================================================== --- /issm/trunk/src/c/objects/Elements/Tria.h (revision 4084) +++ /issm/trunk/src/c/objects/Elements/Tria.h (revision 4085) @@ -150,12 +150,12 @@ /*FUNCTION updates{{{1*/ void UpdateFromDakota(void* inputs); - void UpdateInputsFromSolution(double* solutiong); - void UpdateInputsFromSolutionDiagnosticHoriz( double* solution); - void UpdateInputsFromSolutionSlopeCompute( double* solution); - void UpdateInputsFromSolutionPrognostic( double* solution); - void UpdateInputsFromSolutionPrognostic2(double* solution); - void UpdateInputsFromSolutionBalancedthickness( double* solution); - void UpdateInputsFromSolutionBalancedthickness2( double* solution); - void UpdateInputsFromSolutionBalancedvelocities( double* solution); + void InputUpdateFromSolution(double* solutiong); + void InputUpdateFromSolutionDiagnosticHoriz( double* solution); + void InputUpdateFromSolutionSlopeCompute( double* solution); + void InputUpdateFromSolutionPrognostic( double* solution); + void InputUpdateFromSolutionPrognostic2(double* solution); + void InputUpdateFromSolutionBalancedthickness( double* solution); + void InputUpdateFromSolutionBalancedthickness2( double* solution); + void InputUpdateFromSolutionBalancedvelocities( double* solution); void UpdateInputsFromVector(double* vector, int name, int type); void UpdateInputsFromVector(int* vector, int name, int type); Index: /issm/trunk/src/c/objects/ExternalResults/BoolExternalResult.h =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/BoolExternalResult.h (revision 4084) +++ /issm/trunk/src/c/objects/ExternalResults/BoolExternalResult.h (revision 4085) @@ -61,5 +61,5 @@ 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!");} + void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} /*}}}*/ /*ExternalResult methods: {{{1*/ Index: /issm/trunk/src/c/objects/ExternalResults/DoubleExternalResult.h =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/DoubleExternalResult.h (revision 4084) +++ /issm/trunk/src/c/objects/ExternalResults/DoubleExternalResult.h (revision 4085) @@ -61,5 +61,5 @@ 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!");} + void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} /*}}}*/ /*ExternalResult methods: {{{1*/ Index: /issm/trunk/src/c/objects/ExternalResults/DoubleVecExternalResult.h =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/DoubleVecExternalResult.h (revision 4084) +++ /issm/trunk/src/c/objects/ExternalResults/DoubleVecExternalResult.h (revision 4085) @@ -60,5 +60,5 @@ 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!");} + void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} /*}}}*/ /*ExternalResult methods: {{{1*/ Index: /issm/trunk/src/c/objects/ExternalResults/IntExternalResult.h =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/IntExternalResult.h (revision 4084) +++ /issm/trunk/src/c/objects/ExternalResults/IntExternalResult.h (revision 4085) @@ -61,5 +61,5 @@ 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!");} + void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} /*}}}*/ /*ExternalResult methods: {{{1*/ Index: /issm/trunk/src/c/objects/ExternalResults/PetscVecExternalResult.h =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/PetscVecExternalResult.h (revision 4084) +++ /issm/trunk/src/c/objects/ExternalResults/PetscVecExternalResult.h (revision 4085) @@ -59,5 +59,5 @@ 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!");} + void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} /*}}}*/ /*ExternalResult methods: {{{1*/ Index: /issm/trunk/src/c/objects/ExternalResults/StringExternalResult.h =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/StringExternalResult.h (revision 4084) +++ /issm/trunk/src/c/objects/ExternalResults/StringExternalResult.h (revision 4085) @@ -60,5 +60,5 @@ 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!");} + void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} /*}}}*/ /*ExternalResult methods: {{{1*/ Index: /issm/trunk/src/c/objects/Inputs/BeamVertexInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/BeamVertexInput.h (revision 4084) +++ /issm/trunk/src/c/objects/Inputs/BeamVertexInput.h (revision 4085) @@ -43,5 +43,5 @@ void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} + void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} Input* SpawnSingInput(int index); Index: /issm/trunk/src/c/objects/Inputs/BoolInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/BoolInput.h (revision 4084) +++ /issm/trunk/src/c/objects/Inputs/BoolInput.h (revision 4085) @@ -43,5 +43,5 @@ void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} + void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} Input* SpawnSingInput(int index); Index: /issm/trunk/src/c/objects/Inputs/DoubleInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/DoubleInput.h (revision 4084) +++ /issm/trunk/src/c/objects/Inputs/DoubleInput.h (revision 4085) @@ -44,5 +44,5 @@ 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!");} + void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} Input* SpawnSingInput(int index); Index: /issm/trunk/src/c/objects/Inputs/IntInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/IntInput.h (revision 4084) +++ /issm/trunk/src/c/objects/Inputs/IntInput.h (revision 4085) @@ -43,5 +43,5 @@ void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} + void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} Input* SpawnSingInput(int index); Index: /issm/trunk/src/c/objects/Inputs/PentaVertexInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/PentaVertexInput.h (revision 4084) +++ /issm/trunk/src/c/objects/Inputs/PentaVertexInput.h (revision 4085) @@ -42,5 +42,5 @@ void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} + void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} Input* SpawnSingInput(int index); Index: /issm/trunk/src/c/objects/Inputs/SingVertexInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/SingVertexInput.h (revision 4084) +++ /issm/trunk/src/c/objects/Inputs/SingVertexInput.h (revision 4085) @@ -42,5 +42,5 @@ void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} + void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} Input* SpawnSingInput(int index); Index: /issm/trunk/src/c/objects/Inputs/TriaVertexInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/TriaVertexInput.h (revision 4084) +++ /issm/trunk/src/c/objects/Inputs/TriaVertexInput.h (revision 4085) @@ -42,5 +42,5 @@ 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!");} + void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} Input* SpawnSingInput(int index); Index: /issm/trunk/src/c/objects/Loads/Icefront.cpp =================================================================== --- /issm/trunk/src/c/objects/Loads/Icefront.cpp (revision 4084) +++ /issm/trunk/src/c/objects/Loads/Icefront.cpp (revision 4085) @@ -1376,6 +1376,6 @@ } /*}}}*/ -/*FUNCTION Icefront::UpdateInputsFromSolution(double* solution) {{{1*/ -void Icefront::UpdateInputsFromSolution(double* solution){ +/*FUNCTION Icefront::InputUpdateFromSolution(double* solution) {{{1*/ +void Icefront::InputUpdateFromSolution(double* solution){ /*Nothing updated yet*/ } Index: /issm/trunk/src/c/objects/Loads/Icefront.h =================================================================== --- /issm/trunk/src/c/objects/Loads/Icefront.h (revision 4084) +++ /issm/trunk/src/c/objects/Loads/Icefront.h (revision 4085) @@ -55,5 +55,5 @@ void InputUpdateFromConstant(int constant, int name); void InputUpdateFromConstant(bool constant, int name); - void UpdateInputsFromSolution(double* solution); + void InputUpdateFromSolution(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 4084) +++ /issm/trunk/src/c/objects/Loads/Numericalflux.h (revision 4085) @@ -50,5 +50,5 @@ 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!");} + void InputUpdateFromSolution(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 4084) +++ /issm/trunk/src/c/objects/Loads/Pengrid.cpp (revision 4085) @@ -776,6 +776,6 @@ } /*}}}*/ -/*FUNCTION Pengrid::UpdateInputsFromSolution(double* solution) {{{1*/ -void Pengrid::UpdateInputsFromSolution(double* solution){ +/*FUNCTION Pengrid::InputUpdateFromSolution(double* solution) {{{1*/ +void Pengrid::InputUpdateFromSolution(double* solution){ /*Nothing updated yet*/ } Index: /issm/trunk/src/c/objects/Loads/Pengrid.h =================================================================== --- /issm/trunk/src/c/objects/Loads/Pengrid.h (revision 4084) +++ /issm/trunk/src/c/objects/Loads/Pengrid.h (revision 4085) @@ -56,5 +56,5 @@ void InputUpdateFromConstant(int constant, int name); void InputUpdateFromConstant(bool constant, int name); - void UpdateInputsFromSolution(double* solution); + void InputUpdateFromSolution(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 4084) +++ /issm/trunk/src/c/objects/Loads/Penpair.h (revision 4085) @@ -47,5 +47,5 @@ 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!");} + void InputUpdateFromSolution(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 4084) +++ /issm/trunk/src/c/objects/Loads/Riftfront.h (revision 4085) @@ -65,5 +65,5 @@ 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!");} + void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} bool InAnalysis(int analysis_type); Index: /issm/trunk/src/c/objects/Materials/Material.h =================================================================== --- /issm/trunk/src/c/objects/Materials/Material.h (revision 4084) +++ /issm/trunk/src/c/objects/Materials/Material.h (revision 4085) @@ -29,5 +29,5 @@ virtual void UpdateInputsFromVector(int* vector, int name, int type)=0; virtual void UpdateInputsFromVector(bool* vector, int name, int type)=0; - virtual void UpdateInputsFromSolution(double* solution)=0; + virtual void InputUpdateFromSolution(double* solution)=0; }; Index: /issm/trunk/src/c/objects/Materials/Matice.cpp =================================================================== --- /issm/trunk/src/c/objects/Materials/Matice.cpp (revision 4084) +++ /issm/trunk/src/c/objects/Materials/Matice.cpp (revision 4085) @@ -458,7 +458,7 @@ } /*}}}*/ -/*FUNCTION Matice::UpdateInputsFromSolution(double* solution) {{{1*/ -void Matice::UpdateInputsFromSolution(double* solution){ - /*Nothing updated yet*/ -} -/*}}}*/ +/*FUNCTION Matice::InputUpdateFromSolution(double* solution) {{{1*/ +void Matice::InputUpdateFromSolution(double* solution){ + /*Nothing updated yet*/ +} +/*}}}*/ Index: /issm/trunk/src/c/objects/Materials/Matice.h =================================================================== --- /issm/trunk/src/c/objects/Materials/Matice.h (revision 4084) +++ /issm/trunk/src/c/objects/Materials/Matice.h (revision 4085) @@ -50,5 +50,5 @@ void InputUpdateFromConstant(int constant, int name); void InputUpdateFromConstant(bool constant, int name); - void UpdateInputsFromSolution(double* solution); + void InputUpdateFromSolution(double* solution); }; Index: /issm/trunk/src/c/objects/Materials/Matpar.cpp =================================================================== --- /issm/trunk/src/c/objects/Materials/Matpar.cpp (revision 4084) +++ /issm/trunk/src/c/objects/Materials/Matpar.cpp (revision 4085) @@ -309,7 +309,7 @@ } /*}}}*/ -/*FUNCTION Matpar::UpdateInputsFromSolution(double* solution) {{{1*/ -void Matpar::UpdateInputsFromSolution(double* solution){ - /*Nothing updated yet*/ -} -/*}}}*/ +/*FUNCTION Matpar::InputUpdateFromSolution(double* solution) {{{1*/ +void Matpar::InputUpdateFromSolution(double* solution){ + /*Nothing updated yet*/ +} +/*}}}*/ Index: /issm/trunk/src/c/objects/Materials/Matpar.h =================================================================== --- /issm/trunk/src/c/objects/Materials/Matpar.h (revision 4084) +++ /issm/trunk/src/c/objects/Materials/Matpar.h (revision 4085) @@ -62,5 +62,5 @@ void InputUpdateFromConstant(int constant, int name); void InputUpdateFromConstant(bool constant, int name); - void UpdateInputsFromSolution(double* solution); + void InputUpdateFromSolution(double* solution); Index: /issm/trunk/src/c/objects/Node.h =================================================================== --- /issm/trunk/src/c/objects/Node.h (revision 4084) +++ /issm/trunk/src/c/objects/Node.h (revision 4085) @@ -59,5 +59,5 @@ void InputUpdateFromConstant(int constant, int name); void InputUpdateFromConstant(bool constant, int name); - void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} + void InputUpdateFromSolution(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 4084) +++ /issm/trunk/src/c/objects/Object.h (revision 4085) @@ -31,5 +31,5 @@ virtual void InputUpdateFromConstant(int constant, int name)=0; virtual void InputUpdateFromConstant(bool constant, int name)=0; - virtual void UpdateInputsFromSolution(double* solution)=0; + virtual void InputUpdateFromSolution(double* solution)=0; }; Index: /issm/trunk/src/c/objects/Params/BoolParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/BoolParam.h (revision 4084) +++ /issm/trunk/src/c/objects/Params/BoolParam.h (revision 4085) @@ -56,5 +56,5 @@ void InputUpdateFromConstant(int constant, int name); void InputUpdateFromConstant(bool constant, int name); - void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} + void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} /*}}}*/ Index: /issm/trunk/src/c/objects/Params/DoubleMatParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleMatParam.h (revision 4084) +++ /issm/trunk/src/c/objects/Params/DoubleMatParam.h (revision 4085) @@ -60,5 +60,5 @@ void InputUpdateFromConstant(bool constant, int name); - void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} + void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} /*}}}*/ Index: /issm/trunk/src/c/objects/Params/DoubleParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleParam.h (revision 4084) +++ /issm/trunk/src/c/objects/Params/DoubleParam.h (revision 4085) @@ -58,5 +58,5 @@ void InputUpdateFromConstant(bool constant, int name); - void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} + void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} /*}}}*/ Index: /issm/trunk/src/c/objects/Params/DoubleVecParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleVecParam.h (revision 4084) +++ /issm/trunk/src/c/objects/Params/DoubleVecParam.h (revision 4085) @@ -58,5 +58,5 @@ void InputUpdateFromConstant(bool constant, int name); - void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} + void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} /*}}}*/ /*Param methods: {{{1*/ Index: /issm/trunk/src/c/objects/Params/IntParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/IntParam.h (revision 4084) +++ /issm/trunk/src/c/objects/Params/IntParam.h (revision 4085) @@ -57,5 +57,5 @@ void InputUpdateFromConstant(int constant, int name); void InputUpdateFromConstant(bool constant, int name); - void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} + void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} /*}}}*/ Index: /issm/trunk/src/c/objects/Params/PetscMatParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/PetscMatParam.h (revision 4084) +++ /issm/trunk/src/c/objects/Params/PetscMatParam.h (revision 4085) @@ -57,5 +57,5 @@ void InputUpdateFromConstant(int constant, int name); void InputUpdateFromConstant(bool constant, int name); - void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} + void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} /*}}}*/ Index: /issm/trunk/src/c/objects/Params/PetscVecParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/PetscVecParam.h (revision 4084) +++ /issm/trunk/src/c/objects/Params/PetscVecParam.h (revision 4085) @@ -57,5 +57,5 @@ void InputUpdateFromConstant(int constant, int name); void InputUpdateFromConstant(bool constant, int name); - void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} + void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} /*}}}*/ Index: /issm/trunk/src/c/objects/Params/StringArrayParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/StringArrayParam.h (revision 4084) +++ /issm/trunk/src/c/objects/Params/StringArrayParam.h (revision 4085) @@ -59,5 +59,5 @@ void InputUpdateFromConstant(int constant, int name); void InputUpdateFromConstant(bool constant, int name); - void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} + void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} /*}}}*/ Index: /issm/trunk/src/c/objects/Params/StringParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/StringParam.h (revision 4084) +++ /issm/trunk/src/c/objects/Params/StringParam.h (revision 4085) @@ -57,5 +57,5 @@ void InputUpdateFromConstant(int constant, int name); void InputUpdateFromConstant(bool constant, int name); - void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} + void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} /*}}}*/ Index: /issm/trunk/src/c/objects/SolPar.h =================================================================== --- /issm/trunk/src/c/objects/SolPar.h (revision 4084) +++ /issm/trunk/src/c/objects/SolPar.h (revision 4085) @@ -46,5 +46,5 @@ void InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} + void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} /*functionality: */ Index: /issm/trunk/src/c/objects/Vertex.h =================================================================== --- /issm/trunk/src/c/objects/Vertex.h (revision 4084) +++ /issm/trunk/src/c/objects/Vertex.h (revision 4085) @@ -57,5 +57,5 @@ void InputUpdateFromConstant(bool constant, int name); - void UpdateInputsFromSolution(double* solution){ISSMERROR("Not implemented yet!");} + void InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");} Index: /issm/trunk/src/c/solutions/adjoint_core.cpp =================================================================== --- /issm/trunk/src/c/solutions/adjoint_core.cpp (revision 4084) +++ /issm/trunk/src/c/solutions/adjoint_core.cpp (revision 4085) @@ -70,5 +70,5 @@ else femmodel->SetCurrentAnalysisAlias(DiagnosticHorizAnalysisEnum,AdjointAnalysisEnum); - UpdateInputsFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,adjoint_g); + InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,adjoint_g); /*Free ressources:*/ Index: /issm/trunk/src/c/solvers/solver_diagnostic_nonlinear.cpp =================================================================== --- /issm/trunk/src/c/solvers/solver_diagnostic_nonlinear.cpp (revision 4084) +++ /issm/trunk/src/c/solvers/solver_diagnostic_nonlinear.cpp (revision 4085) @@ -102,5 +102,5 @@ //Update inputs using new solution: - UpdateInputsFromSolutionx( fem->elements,fem->nodes, fem->vertices, fem->loads, fem->materials, fem->parameters,ug); + InputUpdateFromSolutionx( fem->elements,fem->nodes, fem->vertices, fem->loads, fem->materials, fem->parameters,ug); //Deal with penalty loads Index: /issm/trunk/src/c/solvers/solver_linear.cpp =================================================================== --- /issm/trunk/src/c/solvers/solver_linear.cpp (revision 4084) +++ /issm/trunk/src/c/solvers/solver_linear.cpp (revision 4085) @@ -56,5 +56,5 @@ //Update inputs using new solution: - UpdateInputsFromSolutionx( fem->elements,fem->nodes, fem->vertices, fem->loads, fem->materials, fem->parameters,ug); + InputUpdateFromSolutionx( fem->elements,fem->nodes, fem->vertices, fem->loads, fem->materials, fem->parameters,ug); /*free ressources: */ Index: /issm/trunk/src/c/solvers/solver_thermal_nonlinear.cpp =================================================================== --- /issm/trunk/src/c/solvers/solver_thermal_nonlinear.cpp (revision 4084) +++ /issm/trunk/src/c/solvers/solver_thermal_nonlinear.cpp (revision 4085) @@ -112,5 +112,5 @@ //Update inputs using new solution: UpdateInputsFromVectorx( fem->elements,fem->nodes, fem->vertices, fem->loads, fem->materials, fem->parameters,tg,TemperatureEnum,VertexEnum); - UpdateInputsFromSolutionx(fem->elements,fem->nodes, fem->vertices, fem->loads, fem->materials, fem->parameters,tg); + InputUpdateFromSolutionx(fem->elements,fem->nodes, fem->vertices, fem->loads, fem->materials, fem->parameters,tg); if (!converged){