Index: /issm/trunk/src/c/objects/Elements/Tria.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 3833) +++ /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 3834) @@ -381,42 +381,31 @@ /*Just branch to the correct UpdateInputsFromSolution generator, according to the type of analysis we are carrying out: */ if (analysis_type==ControlAnalysisEnum){ - UpdateInputsFromSolutionDiagnosticHoriz( solution,analysis_type,sub_analysis_type); } else if (analysis_type==DiagnosticAnalysisEnum){ - if (sub_analysis_type==HorizAnalysisEnum){ - UpdateInputsFromSolutionDiagnosticHoriz( solution,analysis_type,sub_analysis_type); } else ISSMERROR("%s%i%s\n","sub_analysis: ",sub_analysis_type," not supported yet"); - } else if (analysis_type==SlopecomputeAnalysisEnum){ - UpdateInputsFromSolutionSlopeCompute( solution,analysis_type,sub_analysis_type); } else if (analysis_type==PrognosticAnalysisEnum){ - UpdateInputsFromSolutionPrognostic( solution,analysis_type,sub_analysis_type); } else if (analysis_type==Prognostic2AnalysisEnum){ - UpdateInputsFromSolutionPrognostic2(solution,analysis_type,sub_analysis_type); } else if (analysis_type==BalancedthicknessAnalysisEnum){ - UpdateInputsFromSolutionBalancedthickness( solution,analysis_type,sub_analysis_type); } else if (analysis_type==Balancedthickness2AnalysisEnum){ - UpdateInputsFromSolutionBalancedthickness2( solution,analysis_type,sub_analysis_type); } else if (analysis_type==BalancedvelocitiesAnalysisEnum){ - UpdateInputsFromSolutionBalancedvelocities( solution,analysis_type,sub_analysis_type); } else{ - ISSMERROR("%s%i%s\n","analysis: ",analysis_type," not supported yet"); } @@ -425,5 +414,4 @@ /*FUNCTION Tria::UpdateInputsFromSolutionDiagnosticHoriz {{{1*/ void Tria::UpdateInputsFromSolutionDiagnosticHoriz(double* solution, int analysis_type, int sub_analysis_type){ - int i; @@ -495,7 +483,52 @@ } /*}}}*/ -/*FUNCTION Tria::GetSolutionFromInputs(Vec solution, int analysis_type,int sub_analysis_type);{{{1*/ +/*FUNCTION Tria::GetSolutionFromInputs(Vec solution, int analysis_type,int sub_analysis_type){{{1*/ void Tria::GetSolutionFromInputs(Vec solution, int analysis_type,int sub_analysis_type){ - ISSMERROR(" not supported yet!"); + /*Just branch to the correct UpdateInputsFromSolution generator, according to the type of analysis we are carrying out: */ + if (analysis_type==DiagnosticAnalysisEnum){ + if (sub_analysis_type==HorizAnalysisEnum){ + GetSolutionFromInputsDiagnosticHoriz(solution,analysis_type,sub_analysis_type); + } + else ISSMERROR("%s%i%s\n","sub_analysis: ",sub_analysis_type," not supported yet"); + } + else{ + ISSMERROR("%s%i%s\n","analysis: ",analysis_type," not supported yet"); + } +} +/*}}}*/ +/*FUNCTION Tria::GetSolutionFromInputsDiagnosticHoriz(Vec solution, int analysis_type,int sub_analysis_type){{{1*/ +void Tria::GetSolutionFromInputsDiagnosticHoriz(Vec solution,int analysis_type,int sub_analysis_type){ + + int i; + + const int numvertices=3; + const int numdofpervertex=2; + const int numdof=numdofpervertex*numvertices; + double gauss[numvertices][numvertices]={{1,0,0},{0,1,0},{0,0,1}}; + + int doflist[numdof]; + double values[numdof]; + double vx; + double vy; + + int dummy; + + /*Get dof list: */ + GetDofList(&doflist[0],&dummy); + + /*Ok, we have vx and vy in values, fill in vx and vy arrays: */ + /*P1 element only for now*/ + for(i=0;iGetParameterValue(&vx,&gauss[i][0],VxEnum); + inputs->GetParameterValue(&vy,&gauss[i][0],VyEnum); + values[i*numdofpervertex+0]=vx; + values[i*numdofpervertex+1]=vy; + } + + /*Add value to global vector*/ + VecSetValues(solution,numdof,doflist,(const double*)values,INSERT_VALUES); + } /*}}}*/ @@ -4611,2 +4644,7 @@ } /*}}}*/ +/*FUNCTION Tria::UpdateInputsFromConstant(int value, int name);{{{1*/ +void Tria::UpdateInputsFromConstant(int 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 3833) +++ /issm/trunk/src/c/objects/Elements/Tria.h (revision 3834) @@ -58,4 +58,5 @@ void CreatePVector(Vec pg, int analysis_type,int sub_analysis_type); void GetSolutionFromInputs(Vec solution, int analysis_type,int sub_analysis_type); + void GetSolutionFromInputsDiagnosticHoriz(Vec solution,int analysis_type,int sub_analysis_type); void GetDofList(int* doflist,int* pnumberofdofs); void GetDofList1(int* doflist); @@ -130,8 +131,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 pdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type); + void UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");}; + void UpdateInputsFromConstant(int constant, int name); + void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");}; /*}}}*/ Index: /issm/trunk/src/c/objects/Loads/Icefront.cpp =================================================================== --- /issm/trunk/src/c/objects/Loads/Icefront.cpp (revision 3833) +++ /issm/trunk/src/c/objects/Loads/Icefront.cpp (revision 3834) @@ -1349,2 +1349,8 @@ } /*}}}*/ +/*FUNCTION Icefront::UpdateInputsFromConstant(int constant, int name) {{{1*/ +void Icefront::UpdateInputsFromConstant(int constant, int name){ + + /*Nothing updated for now*/ +} +/*}}}*/ Index: /issm/trunk/src/c/objects/Loads/Icefront.h =================================================================== --- /issm/trunk/src/c/objects/Loads/Icefront.h (revision 3833) +++ /issm/trunk/src/c/objects/Loads/Icefront.h (revision 3834) @@ -54,5 +54,5 @@ 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(int constant, int name); void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} Index: /issm/trunk/src/c/objects/Materials/Matice.cpp =================================================================== --- /issm/trunk/src/c/objects/Materials/Matice.cpp (revision 3833) +++ /issm/trunk/src/c/objects/Materials/Matice.cpp (revision 3834) @@ -438,2 +438,9 @@ } /*}}}*/ +/*FUNCTION Matice::UpdateInputsFromConstant(int constant, int name){{{1*/ +void Matice::UpdateInputsFromConstant(int constant, int name){ + + /*Nothing updated for now*/ + +} +/*}}}*/ Index: /issm/trunk/src/c/objects/Materials/Matice.h =================================================================== --- /issm/trunk/src/c/objects/Materials/Matice.h (revision 3833) +++ /issm/trunk/src/c/objects/Materials/Matice.h (revision 3834) @@ -49,5 +49,5 @@ 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(int constant, int name); void UpdateInputsFromConstant(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/Materials/Matpar.cpp =================================================================== --- /issm/trunk/src/c/objects/Materials/Matpar.cpp (revision 3833) +++ /issm/trunk/src/c/objects/Materials/Matpar.cpp (revision 3834) @@ -282,2 +282,8 @@ } /*}}}1*/ +/*FUNCTION Matpar::UpdateInputsFromConstant(int constant, int name){{{1*/ +void Matpar::UpdateInputsFromConstant(int constant, int name){ + + /*Nothing updated for now*/ +} +/*}}}1*/ Index: /issm/trunk/src/c/objects/Materials/Matpar.h =================================================================== --- /issm/trunk/src/c/objects/Materials/Matpar.h (revision 3833) +++ /issm/trunk/src/c/objects/Materials/Matpar.h (revision 3834) @@ -57,12 +57,12 @@ double GetMeltingPoint(); Object* copy(); - void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} - 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 UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} + 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); + void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){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/Node.cpp =================================================================== --- /issm/trunk/src/c/objects/Node.cpp (revision 3833) +++ /issm/trunk/src/c/objects/Node.cpp (revision 3834) @@ -882,4 +882,9 @@ } /*}}}*/ +/*FUNCTION Node::UpdateInputsFromConstant(int constant, int name){{{2*/ +void Node::UpdateInputsFromConstant(int constant, int name){ + /*nothing updated for now*/ +} +/*}}}*/ /*}}}*/ /* DofObject routines: {{{1*/ Index: /issm/trunk/src/c/objects/Node.h =================================================================== --- /issm/trunk/src/c/objects/Node.h (revision 3833) +++ /issm/trunk/src/c/objects/Node.h (revision 3834) @@ -51,12 +51,12 @@ int MyRank(void); void SetVertexDof(int in_dof); - void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} - 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 UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} + 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); + void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} - void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){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/Params/BoolParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/BoolParam.cpp (revision 3833) +++ /issm/trunk/src/c/objects/Params/BoolParam.cpp (revision 3834) @@ -143,2 +143,33 @@ #endif /*}}}*/ + +/*FUNCTION BoolParam::UpdateInputsFromVector(double* vector, int name, int type) {{{1*/ +void BoolParam::UpdateInputsFromVector(double* vector, int name, int type){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION BoolParam::UpdateInputsFromVector(int* vector, int name, int type) {{{1*/ +void BoolParam::UpdateInputsFromVector(int* vector, int name, int type){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION BoolParam::UpdateInputsFromVector(bool* vector, int name, int type) {{{1*/ +void BoolParam::UpdateInputsFromVector(bool* vector, int name, int type){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION BoolParam::UpdateInputsFromConstant(double constant, int name) {{{1*/ +void BoolParam::UpdateInputsFromConstant(double constant, int name){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION BoolParam::UpdateInputsFromConstant(int constant, int name) {{{1*/ +void BoolParam::UpdateInputsFromConstant(int constant, int name){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION BoolParam::UpdateInputsFromConstant(bool constant, int name) {{{1*/ +void BoolParam::UpdateInputsFromConstant(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 3833) +++ /issm/trunk/src/c/objects/Params/BoolParam.h (revision 3834) @@ -50,12 +50,12 @@ int MarshallSize(); int MyRank(); - void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} - 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 UpdateInputsFromVector(double* vector, int name, int type); + 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 UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){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/Params/DoubleMatParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleMatParam.cpp (revision 3833) +++ /issm/trunk/src/c/objects/Params/DoubleMatParam.cpp (revision 3834) @@ -199,2 +199,33 @@ #endif /*}}}*/ + +/*FUNCTION DoubleMatParam::UpdateInputsFromVector(double* vector, int name, int type) {{{1*/ +void DoubleMatParam::UpdateInputsFromVector(double* vector, int name, int type){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION DoubleMatParam::UpdateInputsFromVector(int* vector, int name, int type) {{{1*/ +void DoubleMatParam::UpdateInputsFromVector(int* vector, int name, int type){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION DoubleMatParam::UpdateInputsFromVector(bool* vector, int name, int type) {{{1*/ +void DoubleMatParam::UpdateInputsFromVector(bool* vector, int name, int type){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*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){ + /*Nothing updated yet*/ +} +/*}}}*/ Index: /issm/trunk/src/c/objects/Params/DoubleMatParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleMatParam.h (revision 3833) +++ /issm/trunk/src/c/objects/Params/DoubleMatParam.h (revision 3834) @@ -53,12 +53,12 @@ int MarshallSize(); int MyRank(); - void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} - 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 UpdateInputsFromVector(double* vector, int name, int type); + 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 UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){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/Params/DoubleParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleParam.cpp (revision 3833) +++ /issm/trunk/src/c/objects/Params/DoubleParam.cpp (revision 3834) @@ -141,2 +141,33 @@ #endif /*}}}*/ + +/*FUNCTION DoubleParam::UpdateInputsFromVector(double* vector, int name, int type) {{{1*/ +void DoubleParam::UpdateInputsFromVector(double* vector, int name, int type){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION DoubleParam::UpdateInputsFromVector(int* vector, int name, int type) {{{1*/ +void DoubleParam::UpdateInputsFromVector(int* vector, int name, int type){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION DoubleParam::UpdateInputsFromVector(bool* vector, int name, int type) {{{1*/ +void DoubleParam::UpdateInputsFromVector(bool* vector, int name, int type){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION DoubleParam::UpdateInputsFromConstant(double constant, int name) {{{1*/ +void DoubleParam::UpdateInputsFromConstant(double constant, int name){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION DoubleParam::UpdateInputsFromConstant(int constant, int name) {{{1*/ +void DoubleParam::UpdateInputsFromConstant(int constant, int name){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION DoubleParam::UpdateInputsFromConstant(bool constant, int name) {{{1*/ +void DoubleParam::UpdateInputsFromConstant(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 3833) +++ /issm/trunk/src/c/objects/Params/DoubleParam.h (revision 3834) @@ -51,12 +51,12 @@ int MarshallSize(); int MyRank(); - void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} - 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 UpdateInputsFromVector(double* vector, int name, int type); + 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 UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){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/Params/DoubleVecParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleVecParam.cpp (revision 3833) +++ /issm/trunk/src/c/objects/Params/DoubleVecParam.cpp (revision 3834) @@ -209,2 +209,33 @@ #endif /*}}}*/ + +/*FUNCTION DoubleVecParam::UpdateInputsFromVector(double* vector, int name, int type) {{{1*/ +void DoubleVecParam::UpdateInputsFromVector(double* vector, int name, int type){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION DoubleVecParam::UpdateInputsFromVector(int* vector, int name, int type) {{{1*/ +void DoubleVecParam::UpdateInputsFromVector(int* vector, int name, int type){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION DoubleVecParam::UpdateInputsFromVector(bool* vector, int name, int type) {{{1*/ +void DoubleVecParam::UpdateInputsFromVector(bool* vector, int name, int type){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*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){ + /*Nothing updated yet*/ +} +/*}}}*/ Index: /issm/trunk/src/c/objects/Params/DoubleVecParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleVecParam.h (revision 3833) +++ /issm/trunk/src/c/objects/Params/DoubleVecParam.h (revision 3834) @@ -52,10 +52,10 @@ int MarshallSize(); int MyRank(); - void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} - 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 UpdateInputsFromVector(double* vector, int name, int type); + 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 UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} Index: /issm/trunk/src/c/objects/Params/IntParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/IntParam.cpp (revision 3833) +++ /issm/trunk/src/c/objects/Params/IntParam.cpp (revision 3834) @@ -144,2 +144,33 @@ #endif /*}}}*/ + +/*FUNCTION IntParam::UpdateInputsFromVector(double* vector, int name, int type) {{{1*/ +void IntParam::UpdateInputsFromVector(double* vector, int name, int type){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION IntParam::UpdateInputsFromVector(int* vector, int name, int type) {{{1*/ +void IntParam::UpdateInputsFromVector(int* vector, int name, int type){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION IntParam::UpdateInputsFromVector(bool* vector, int name, int type) {{{1*/ +void IntParam::UpdateInputsFromVector(bool* vector, int name, int type){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION IntParam::UpdateInputsFromConstant(double constant, int name) {{{1*/ +void IntParam::UpdateInputsFromConstant(double constant, int name){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION IntParam::UpdateInputsFromConstant(int constant, int name) {{{1*/ +void IntParam::UpdateInputsFromConstant(int constant, int name){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION IntParam::UpdateInputsFromConstant(bool constant, int name) {{{1*/ +void IntParam::UpdateInputsFromConstant(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 3833) +++ /issm/trunk/src/c/objects/Params/IntParam.h (revision 3834) @@ -51,12 +51,12 @@ int MarshallSize(); int MyRank(); - void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} - 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 UpdateInputsFromVector(double* vector, int name, int type); + 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 UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){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/Params/PetscMatParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/PetscMatParam.cpp (revision 3833) +++ /issm/trunk/src/c/objects/Params/PetscMatParam.cpp (revision 3834) @@ -226,2 +226,33 @@ #endif /*}}}*/ + +/*FUNCTION PetscMatParam::UpdateInputsFromVector(double* vector, int name, int type) {{{1*/ +void PetscMatParam::UpdateInputsFromVector(double* vector, int name, int type){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION PetscMatParam::UpdateInputsFromVector(int* vector, int name, int type) {{{1*/ +void PetscMatParam::UpdateInputsFromVector(int* vector, int name, int type){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION PetscMatParam::UpdateInputsFromVector(bool* vector, int name, int type) {{{1*/ +void PetscMatParam::UpdateInputsFromVector(bool* vector, int name, int type){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*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){ + /*Nothing updated yet*/ +} +/*}}}*/ Index: /issm/trunk/src/c/objects/Params/PetscMatParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/PetscMatParam.h (revision 3833) +++ /issm/trunk/src/c/objects/Params/PetscMatParam.h (revision 3834) @@ -51,12 +51,12 @@ int MarshallSize(); int MyRank(); - void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} - 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 UpdateInputsFromVector(double* vector, int name, int type); + 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 UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){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/Params/PetscVecParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/PetscVecParam.cpp (revision 3833) +++ /issm/trunk/src/c/objects/Params/PetscVecParam.cpp (revision 3834) @@ -220,2 +220,33 @@ #endif /*}}}*/ + +/*FUNCTION PetscVecParam::UpdateInputsFromVector(double* vector, int name, int type) {{{1*/ +void PetscVecParam::UpdateInputsFromVector(double* vector, int name, int type){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION PetscVecParam::UpdateInputsFromVector(int* vector, int name, int type) {{{1*/ +void PetscVecParam::UpdateInputsFromVector(int* vector, int name, int type){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION PetscVecParam::UpdateInputsFromVector(bool* vector, int name, int type) {{{1*/ +void PetscVecParam::UpdateInputsFromVector(bool* vector, int name, int type){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*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){ + /*Nothing updated yet*/ +} +/*}}}*/ Index: /issm/trunk/src/c/objects/Params/PetscVecParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/PetscVecParam.h (revision 3833) +++ /issm/trunk/src/c/objects/Params/PetscVecParam.h (revision 3834) @@ -51,12 +51,12 @@ int MarshallSize(); int MyRank(); - void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} - 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 UpdateInputsFromVector(double* vector, int name, int type); + 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 UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){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/Params/StringArrayParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/StringArrayParam.cpp (revision 3833) +++ /issm/trunk/src/c/objects/Params/StringArrayParam.cpp (revision 3834) @@ -249,2 +249,33 @@ #endif /*}}}*/ + +/*FUNCTION StringArrayParam::UpdateInputsFromVector(double* vector, int name, int type) {{{1*/ +void StringArrayParam::UpdateInputsFromVector(double* vector, int name, int type){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION StringArrayParam::UpdateInputsFromVector(int* vector, int name, int type) {{{1*/ +void StringArrayParam::UpdateInputsFromVector(int* vector, int name, int type){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION StringArrayParam::UpdateInputsFromVector(bool* vector, int name, int type) {{{1*/ +void StringArrayParam::UpdateInputsFromVector(bool* vector, int name, int type){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*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){ + /*Nothing updated yet*/ +} +/*}}}*/ Index: /issm/trunk/src/c/objects/Params/StringArrayParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/StringArrayParam.h (revision 3833) +++ /issm/trunk/src/c/objects/Params/StringArrayParam.h (revision 3834) @@ -53,12 +53,12 @@ int MarshallSize(); int MyRank(); - void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} - 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 UpdateInputsFromVector(double* vector, int name, int type); + 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 UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){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/Params/StringParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/StringParam.cpp (revision 3833) +++ /issm/trunk/src/c/objects/Params/StringParam.cpp (revision 3834) @@ -175,2 +175,33 @@ #endif /*}}}*/ + +/*FUNCTION StringParam::UpdateInputsFromVector(double* vector, int name, int type) {{{1*/ +void StringParam::UpdateInputsFromVector(double* vector, int name, int type){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION StringParam::UpdateInputsFromVector(int* vector, int name, int type) {{{1*/ +void StringParam::UpdateInputsFromVector(int* vector, int name, int type){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION StringParam::UpdateInputsFromVector(bool* vector, int name, int type) {{{1*/ +void StringParam::UpdateInputsFromVector(bool* vector, int name, int type){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*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){ + /*Nothing updated yet*/ +} +/*}}}*/ Index: /issm/trunk/src/c/objects/Params/StringParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/StringParam.h (revision 3833) +++ /issm/trunk/src/c/objects/Params/StringParam.h (revision 3834) @@ -51,12 +51,12 @@ int MarshallSize(); int MyRank(); - void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} - 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 UpdateInputsFromVector(double* vector, int name, int type); + 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 UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){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/Vertex.cpp =================================================================== --- /issm/trunk/src/c/objects/Vertex.cpp (revision 3833) +++ /issm/trunk/src/c/objects/Vertex.cpp (revision 3834) @@ -182,4 +182,11 @@ } /*}}}*/ +/*FUNCTION UpdateInputsFromConstant(int constant, int name){{{2*/ +void Vertex::UpdateInputsFromConstant(int constant, int name){ + + /*Nothing updated for now*/ + +} +/*}}}*/ /*}}}*/ /* DofObject routines: {{{1*/ Index: /issm/trunk/src/c/objects/Vertex.h =================================================================== --- /issm/trunk/src/c/objects/Vertex.h (revision 3833) +++ /issm/trunk/src/c/objects/Vertex.h (revision 3834) @@ -53,7 +53,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 UpdateInputsFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");} + void UpdateInputsFromConstant(int constant, int name); + void UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");} void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}