Index: /issm/trunk-jpl/src/c/analyses/AdjointBalancethicknessAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/AdjointBalancethicknessAnalysis.cpp (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/AdjointBalancethicknessAnalysis.cpp (revision 16782) @@ -25,5 +25,11 @@ }/*}}}*/ -/*Numerics*/ +/*Finite Element Analysis*/ +ElementMatrix* AdjointBalancethicknessAnalysis::CreateKMatrix(Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +ElementVector* AdjointBalancethicknessAnalysis::CreatePVector(Element* element){/*{{{*/ +_error_("not implemented yet"); +}/*}}}*/ void AdjointBalancethicknessAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ _error_("not implemented yet"); Index: /issm/trunk-jpl/src/c/analyses/AdjointBalancethicknessAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/AdjointBalancethicknessAnalysis.h (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/AdjointBalancethicknessAnalysis.h (revision 16782) @@ -12,4 +12,5 @@ public: + /*Model processing*/ int DofsPerNode(int** doflist,int meshtype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); @@ -18,4 +19,8 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); void InputUpdateFromSolution(IssmDouble* solution,Element* element); Index: /issm/trunk-jpl/src/c/analyses/AdjointHorizAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/AdjointHorizAnalysis.cpp (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/AdjointHorizAnalysis.cpp (revision 16782) @@ -25,5 +25,11 @@ }/*}}}*/ -/*Numerics*/ +/*Finite Element Analysis*/ +ElementMatrix* AdjointHorizAnalysis::CreateKMatrix(Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +ElementVector* AdjointHorizAnalysis::CreatePVector(Element* element){/*{{{*/ +_error_("not implemented yet"); +}/*}}}*/ void AdjointHorizAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ _error_("not implemented yet"); Index: /issm/trunk-jpl/src/c/analyses/AdjointHorizAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/AdjointHorizAnalysis.h (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/AdjointHorizAnalysis.h (revision 16782) @@ -12,4 +12,5 @@ public: + /*Model processing*/ int DofsPerNode(int** doflist,int meshtype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); @@ -18,4 +19,8 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); void InputUpdateFromSolution(IssmDouble* solution,Element* element); Index: /issm/trunk-jpl/src/c/analyses/Analysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/Analysis.h (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/Analysis.h (revision 16782) @@ -14,10 +14,14 @@ class Loads; class Element; +class ElementVector; +class ElementMatrix; class Analysis{ public: + /*Constructor/Destructor*/ + virtual ~Analysis(){}; - virtual ~Analysis(){}; + /*Model processing*/ virtual int DofsPerNode(int** doflist,int meshtype,int approximation)=0; virtual void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum)=0; @@ -27,4 +31,7 @@ virtual void CreateLoads(Loads* loads, IoModel* iomodel)=0; + /*Finite element Analysis*/ + virtual ElementMatrix* CreateKMatrix(Element* element)=0; + virtual ElementVector* CreatePVector(Element* element)=0; virtual void GetSolutionFromInputs(Vector* solution,Element* element)=0; virtual void InputUpdateFromSolution(IssmDouble* solution,Element* element)=0; Index: /issm/trunk-jpl/src/c/analyses/BalancethicknessAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/BalancethicknessAnalysis.cpp (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/BalancethicknessAnalysis.cpp (revision 16782) @@ -113,5 +113,11 @@ }/*}}}*/ -/*Numerics*/ +/*Finite Element Analysis*/ +ElementMatrix* BalancethicknessAnalysis::CreateKMatrix(Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +ElementVector* BalancethicknessAnalysis::CreatePVector(Element* element){/*{{{*/ +_error_("not implemented yet"); +}/*}}}*/ void BalancethicknessAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ _error_("not implemented yet"); Index: /issm/trunk-jpl/src/c/analyses/BalancethicknessAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/BalancethicknessAnalysis.h (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/BalancethicknessAnalysis.h (revision 16782) @@ -12,4 +12,5 @@ public: + /*Model processing*/ int DofsPerNode(int** doflist,int meshtype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); @@ -18,4 +19,8 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); void InputUpdateFromSolution(IssmDouble* solution,Element* element); Index: /issm/trunk-jpl/src/c/analyses/BalancethicknessSoftAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/BalancethicknessSoftAnalysis.cpp (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/BalancethicknessSoftAnalysis.cpp (revision 16782) @@ -25,5 +25,11 @@ }/*}}}*/ -/*Numerics*/ +/*Finite Element Analysis*/ +ElementMatrix* BalancethicknessSoftAnalysis::CreateKMatrix(Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +ElementVector* BalancethicknessSoftAnalysis::CreatePVector(Element* element){/*{{{*/ +_error_("not implemented yet"); +}/*}}}*/ void BalancethicknessSoftAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ _error_("not implemented yet"); Index: /issm/trunk-jpl/src/c/analyses/BalancethicknessSoftAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/BalancethicknessSoftAnalysis.h (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/BalancethicknessSoftAnalysis.h (revision 16782) @@ -12,4 +12,5 @@ public: + /*Model processing*/ int DofsPerNode(int** doflist,int meshtype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); @@ -18,4 +19,8 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); void InputUpdateFromSolution(IssmDouble* solution,Element* element); Index: /issm/trunk-jpl/src/c/analyses/BalancevelocityAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/BalancevelocityAnalysis.cpp (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/BalancevelocityAnalysis.cpp (revision 16782) @@ -58,5 +58,11 @@ }/*}}}*/ -/*Numerics*/ +/*Finite Element Analysis*/ +ElementMatrix* BalancevelocityAnalysis::CreateKMatrix(Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +ElementVector* BalancevelocityAnalysis::CreatePVector(Element* element){/*{{{*/ +_error_("not implemented yet"); +}/*}}}*/ void BalancevelocityAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ _error_("not implemented yet"); Index: /issm/trunk-jpl/src/c/analyses/BalancevelocityAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/BalancevelocityAnalysis.h (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/BalancevelocityAnalysis.h (revision 16782) @@ -12,4 +12,5 @@ public: + /*Model processing*/ int DofsPerNode(int** doflist,int meshtype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); @@ -18,4 +19,8 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); void InputUpdateFromSolution(IssmDouble* solution,Element* element); Index: /issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp (revision 16782) @@ -94,5 +94,11 @@ }/*}}}*/ -/*Numerics*/ +/*Finite Element Analysis*/ +ElementMatrix* DamageEvolutionAnalysis::CreateKMatrix(Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +ElementVector* DamageEvolutionAnalysis::CreatePVector(Element* element){/*{{{*/ +_error_("not implemented yet"); +}/*}}}*/ void DamageEvolutionAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ _error_("not implemented yet"); Index: /issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.h (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.h (revision 16782) @@ -12,4 +12,5 @@ public: + /*Model processing*/ int DofsPerNode(int** doflist,int meshtype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); @@ -18,4 +19,8 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); void InputUpdateFromSolution(IssmDouble* solution,Element* element); Index: /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (revision 16782) @@ -183,5 +183,11 @@ }/*}}}*/ -/*Numerics*/ +/*Finite Element Analysis*/ +ElementMatrix* EnthalpyAnalysis::CreateKMatrix(Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +ElementVector* EnthalpyAnalysis::CreatePVector(Element* element){/*{{{*/ +_error_("not implemented yet"); +}/*}}}*/ void EnthalpyAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ element->GetSolutionFromInputsOneDof(solution,EnthalpyEnum); Index: /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.h (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.h (revision 16782) @@ -12,4 +12,5 @@ public: + /*Model processing*/ int DofsPerNode(int** doflist,int meshtype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); @@ -18,4 +19,8 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); void InputUpdateFromSolution(IssmDouble* solution,Element* element); Index: /issm/trunk-jpl/src/c/analyses/EnumToAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/EnumToAnalysis.h (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/EnumToAnalysis.h (revision 16782) @@ -7,4 +7,5 @@ #endif + /*Model processing*/ int DofsPerNode(int** doflist,int meshtype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); @@ -13,4 +14,8 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); void InputUpdateFromSolution(IssmDouble* solution,Element* element); Index: /issm/trunk-jpl/src/c/analyses/ExtrudeFromBaseAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/ExtrudeFromBaseAnalysis.cpp (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/ExtrudeFromBaseAnalysis.cpp (revision 16782) @@ -36,5 +36,11 @@ }/*}}}*/ -/*Numerics*/ +/*Finite Element Analysis*/ +ElementMatrix* ExtrudeFromBaseAnalysis::CreateKMatrix(Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +ElementVector* ExtrudeFromBaseAnalysis::CreatePVector(Element* element){/*{{{*/ +_error_("not implemented yet"); +}/*}}}*/ void ExtrudeFromBaseAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ _error_("not implemented yet"); Index: /issm/trunk-jpl/src/c/analyses/ExtrudeFromBaseAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/ExtrudeFromBaseAnalysis.h (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/ExtrudeFromBaseAnalysis.h (revision 16782) @@ -12,4 +12,5 @@ public: + /*Model processing*/ int DofsPerNode(int** doflist,int meshtype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); @@ -18,4 +19,8 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); void InputUpdateFromSolution(IssmDouble* solution,Element* element); Index: /issm/trunk-jpl/src/c/analyses/ExtrudeFromTopAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/ExtrudeFromTopAnalysis.cpp (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/ExtrudeFromTopAnalysis.cpp (revision 16782) @@ -36,5 +36,11 @@ }/*}}}*/ -/*Numerics*/ +/*Finite Element Analysis*/ +ElementMatrix* ExtrudeFromTopAnalysis::CreateKMatrix(Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +ElementVector* ExtrudeFromTopAnalysis::CreatePVector(Element* element){/*{{{*/ +_error_("not implemented yet"); +}/*}}}*/ void ExtrudeFromTopAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ _error_("not implemented yet"); Index: /issm/trunk-jpl/src/c/analyses/ExtrudeFromTopAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/ExtrudeFromTopAnalysis.h (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/ExtrudeFromTopAnalysis.h (revision 16782) @@ -12,4 +12,5 @@ public: + /*Model processing*/ int DofsPerNode(int** doflist,int meshtype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); @@ -18,4 +19,8 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); void InputUpdateFromSolution(IssmDouble* solution,Element* element); Index: /issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp (revision 16782) @@ -89,5 +89,11 @@ }/*}}}*/ -/*Numerics*/ +/*Finite Element Analysis*/ +ElementMatrix* FreeSurfaceBaseAnalysis::CreateKMatrix(Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +ElementVector* FreeSurfaceBaseAnalysis::CreatePVector(Element* element){/*{{{*/ +_error_("not implemented yet"); +}/*}}}*/ void FreeSurfaceBaseAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ _error_("not implemented yet"); Index: /issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.h (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.h (revision 16782) @@ -12,4 +12,5 @@ public: + /*Model processing*/ int DofsPerNode(int** doflist,int meshtype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); @@ -18,4 +19,8 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); void InputUpdateFromSolution(IssmDouble* solution,Element* element); Index: /issm/trunk-jpl/src/c/analyses/FreeSurfaceTopAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/FreeSurfaceTopAnalysis.cpp (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/FreeSurfaceTopAnalysis.cpp (revision 16782) @@ -87,5 +87,11 @@ }/*}}}*/ -/*Numerics*/ +/*Finite Element Analysis*/ +ElementMatrix* FreeSurfaceTopAnalysis::CreateKMatrix(Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +ElementVector* FreeSurfaceTopAnalysis::CreatePVector(Element* element){/*{{{*/ +_error_("not implemented yet"); +}/*}}}*/ void FreeSurfaceTopAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ _error_("not implemented yet"); Index: /issm/trunk-jpl/src/c/analyses/FreeSurfaceTopAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/FreeSurfaceTopAnalysis.h (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/FreeSurfaceTopAnalysis.h (revision 16782) @@ -12,4 +12,5 @@ public: + /*Model processing*/ int DofsPerNode(int** doflist,int meshtype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); @@ -18,4 +19,8 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); void InputUpdateFromSolution(IssmDouble* solution,Element* element); Index: /issm/trunk-jpl/src/c/analyses/GiaAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/GiaAnalysis.cpp (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/GiaAnalysis.cpp (revision 16782) @@ -37,5 +37,11 @@ }/*}}}*/ -/*Numerics*/ +/*Finite Element Analysis*/ +ElementMatrix* GiaAnalysis::CreateKMatrix(Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +ElementVector* GiaAnalysis::CreatePVector(Element* element){/*{{{*/ +_error_("not implemented yet"); +}/*}}}*/ void GiaAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ _error_("not implemented yet"); Index: /issm/trunk-jpl/src/c/analyses/GiaAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/GiaAnalysis.h (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/GiaAnalysis.h (revision 16782) @@ -12,4 +12,5 @@ public: + /*Model processing*/ int DofsPerNode(int** doflist,int meshtype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); @@ -18,4 +19,8 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); void InputUpdateFromSolution(IssmDouble* solution,Element* element); Index: /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 16782) @@ -95,5 +95,11 @@ }/*}}}*/ -/*Numerics*/ +/*Finite Element Analysis*/ +ElementMatrix* HydrologyDCEfficientAnalysis::CreateKMatrix(Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +ElementVector* HydrologyDCEfficientAnalysis::CreatePVector(Element* element){/*{{{*/ +_error_("not implemented yet"); +}/*}}}*/ void HydrologyDCEfficientAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ element->GetSolutionFromInputsOneDof(solution,EplHeadEnum); Index: /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.h (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.h (revision 16782) @@ -12,4 +12,5 @@ public: + /*Model processing*/ int DofsPerNode(int** doflist,int meshtype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); @@ -18,4 +19,8 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); void InputUpdateFromSolution(IssmDouble* solution,Element* element); Index: /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (revision 16782) @@ -136,5 +136,11 @@ }/*}}}*/ -/*Numerics*/ +/*Finite Element Analysis*/ +ElementMatrix* HydrologyDCInefficientAnalysis::CreateKMatrix(Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +ElementVector* HydrologyDCInefficientAnalysis::CreatePVector(Element* element){/*{{{*/ +_error_("not implemented yet"); +}/*}}}*/ void HydrologyDCInefficientAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ element->GetSolutionFromInputsOneDof(solution,SedimentHeadEnum); Index: /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.h (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.h (revision 16782) @@ -12,4 +12,5 @@ public: + /*Model processing*/ int DofsPerNode(int** doflist,int meshtype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); @@ -18,4 +19,8 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); void InputUpdateFromSolution(IssmDouble* solution,Element* element); Index: /issm/trunk-jpl/src/c/analyses/HydrologyShreveAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyShreveAnalysis.cpp (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/HydrologyShreveAnalysis.cpp (revision 16782) @@ -81,5 +81,11 @@ }/*}}}*/ -/*Numerics*/ +/*Finite Element Analysis*/ +ElementMatrix* HydrologyShreveAnalysis::CreateKMatrix(Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +ElementVector* HydrologyShreveAnalysis::CreatePVector(Element* element){/*{{{*/ +_error_("not implemented yet"); +}/*}}}*/ void HydrologyShreveAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ element->GetSolutionFromInputsOneDof(solution,WatercolumnEnum); Index: /issm/trunk-jpl/src/c/analyses/HydrologyShreveAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyShreveAnalysis.h (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/HydrologyShreveAnalysis.h (revision 16782) @@ -12,4 +12,5 @@ public: + /*Model processing*/ int DofsPerNode(int** doflist,int meshtype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); @@ -18,4 +19,8 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); void InputUpdateFromSolution(IssmDouble* solution,Element* element); Index: /issm/trunk-jpl/src/c/analyses/L2ProjectionBaseAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/L2ProjectionBaseAnalysis.cpp (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/L2ProjectionBaseAnalysis.cpp (revision 16782) @@ -54,5 +54,11 @@ }/*}}}*/ -/*Numerics*/ +/*Finite Element Analysis*/ +ElementMatrix* L2ProjectionBaseAnalysis::CreateKMatrix(Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +ElementVector* L2ProjectionBaseAnalysis::CreatePVector(Element* element){/*{{{*/ +_error_("not implemented yet"); +}/*}}}*/ void L2ProjectionBaseAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ _error_("not implemented yet"); Index: /issm/trunk-jpl/src/c/analyses/L2ProjectionBaseAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/L2ProjectionBaseAnalysis.h (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/L2ProjectionBaseAnalysis.h (revision 16782) @@ -12,4 +12,5 @@ public: + /*Model processing*/ int DofsPerNode(int** doflist,int meshtype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); @@ -18,4 +19,8 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); void InputUpdateFromSolution(IssmDouble* solution,Element* element); Index: /issm/trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.cpp (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.cpp (revision 16782) @@ -69,5 +69,11 @@ }/*}}}*/ -/*Numerics*/ +/*Finite Element Analysis*/ +ElementMatrix* L2ProjectionEPLAnalysis::CreateKMatrix(Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +ElementVector* L2ProjectionEPLAnalysis::CreatePVector(Element* element){/*{{{*/ +_error_("not implemented yet"); +}/*}}}*/ void L2ProjectionEPLAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ _error_("not implemented yet"); Index: /issm/trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.h (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.h (revision 16782) @@ -12,4 +12,5 @@ public: + /*Model processing*/ int DofsPerNode(int** doflist,int meshtype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); @@ -18,4 +19,8 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); void InputUpdateFromSolution(IssmDouble* solution,Element* element); Index: /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 16782) @@ -211,5 +211,11 @@ }/*}}}*/ -/*Numerics*/ +/*Finite Element Analysis*/ +ElementMatrix* MasstransportAnalysis::CreateKMatrix(Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +ElementVector* MasstransportAnalysis::CreatePVector(Element* element){/*{{{*/ +_error_("not implemented yet"); +}/*}}}*/ void MasstransportAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ _error_("not implemented yet"); Index: /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.h (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.h (revision 16782) @@ -12,4 +12,5 @@ public: + /*Model processing*/ int DofsPerNode(int** doflist,int meshtype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); @@ -18,4 +19,8 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); void InputUpdateFromSolution(IssmDouble* solution,Element* element); Index: /issm/trunk-jpl/src/c/analyses/MeltingAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/MeltingAnalysis.cpp (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/MeltingAnalysis.cpp (revision 16782) @@ -71,5 +71,11 @@ }/*}}}*/ -/*Numerics*/ +/*Finite Element Analysis*/ +ElementMatrix* MeltingAnalysis::CreateKMatrix(Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +ElementVector* MeltingAnalysis::CreatePVector(Element* element){/*{{{*/ +_error_("not implemented yet"); +}/*}}}*/ void MeltingAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ _error_("not implemented yet"); Index: /issm/trunk-jpl/src/c/analyses/MeltingAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/MeltingAnalysis.h (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/MeltingAnalysis.h (revision 16782) @@ -12,4 +12,5 @@ public: + /*Model processing*/ int DofsPerNode(int** doflist,int meshtype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); @@ -18,4 +19,8 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); void InputUpdateFromSolution(IssmDouble* solution,Element* element); Index: /issm/trunk-jpl/src/c/analyses/MeshdeformationAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/MeshdeformationAnalysis.cpp (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/MeshdeformationAnalysis.cpp (revision 16782) @@ -25,5 +25,11 @@ }/*}}}*/ -/*Numerics*/ +/*Finite Element Analysis*/ +ElementMatrix* MeshdeformationAnalysis::CreateKMatrix(Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +ElementVector* MeshdeformationAnalysis::CreatePVector(Element* element){/*{{{*/ +_error_("not implemented yet"); +}/*}}}*/ void MeshdeformationAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ _error_("not implemented yet"); Index: /issm/trunk-jpl/src/c/analyses/MeshdeformationAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/MeshdeformationAnalysis.h (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/MeshdeformationAnalysis.h (revision 16782) @@ -12,4 +12,5 @@ public: + /*Model processing*/ int DofsPerNode(int** doflist,int meshtype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); @@ -18,4 +19,8 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); void InputUpdateFromSolution(IssmDouble* solution,Element* element); Index: /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.cpp (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.cpp (revision 16782) @@ -44,5 +44,11 @@ }/*}}}*/ -/*Numerics*/ +/*Finite Element Analysis*/ +ElementMatrix* SmoothedSurfaceSlopeXAnalysis::CreateKMatrix(Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +ElementVector* SmoothedSurfaceSlopeXAnalysis::CreatePVector(Element* element){/*{{{*/ +_error_("not implemented yet"); +}/*}}}*/ void SmoothedSurfaceSlopeXAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ _error_("not implemented yet"); Index: /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.h (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.h (revision 16782) @@ -12,4 +12,5 @@ public: + /*Model processing*/ int DofsPerNode(int** doflist,int meshtype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); @@ -18,4 +19,8 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); void InputUpdateFromSolution(IssmDouble* solution,Element* element); Index: /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.cpp (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.cpp (revision 16782) @@ -44,5 +44,11 @@ }/*}}}*/ -/*Numerics*/ +/*Finite Element Analysis*/ +ElementMatrix* SmoothedSurfaceSlopeYAnalysis::CreateKMatrix(Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +ElementVector* SmoothedSurfaceSlopeYAnalysis::CreatePVector(Element* element){/*{{{*/ +_error_("not implemented yet"); +}/*}}}*/ void SmoothedSurfaceSlopeYAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ _error_("not implemented yet"); Index: /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.h (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.h (revision 16782) @@ -12,4 +12,5 @@ public: + /*Model processing*/ int DofsPerNode(int** doflist,int meshtype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); @@ -18,4 +19,8 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); void InputUpdateFromSolution(IssmDouble* solution,Element* element); Index: /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 16782) @@ -801,5 +801,11 @@ }/*}}}*/ -/*Numerics*/ +/*Finite Element Analysis*/ +ElementMatrix* StressbalanceAnalysis::CreateKMatrix(Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +ElementVector* StressbalanceAnalysis::CreatePVector(Element* element){/*{{{*/ +_error_("not implemented yet"); +}/*}}}*/ void StressbalanceAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.h (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.h (revision 16782) @@ -12,4 +12,5 @@ public: + /*Model processing*/ int DofsPerNode(int** doflist,int meshtype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); @@ -18,4 +19,8 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); void GetSolutionFromInputsFS(Vector* solution,Element* element); Index: /issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.cpp (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.cpp (revision 16782) @@ -133,5 +133,11 @@ }/*}}}*/ -/*Numerics*/ +/*Finite Element Analysis*/ +ElementMatrix* StressbalanceSIAAnalysis::CreateKMatrix(Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +ElementVector* StressbalanceSIAAnalysis::CreatePVector(Element* element){/*{{{*/ +_error_("not implemented yet"); +}/*}}}*/ void StressbalanceSIAAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.h (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.h (revision 16782) @@ -12,4 +12,5 @@ public: + /*Model processing*/ int DofsPerNode(int** doflist,int meshtype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); @@ -18,4 +19,8 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); void InputUpdateFromSolution(IssmDouble* solution,Element* element); Index: /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp (revision 16782) @@ -95,5 +95,11 @@ }/*}}}*/ -/*Numerics*/ +/*Finite Element Analysis*/ +ElementMatrix* StressbalanceVerticalAnalysis::CreateKMatrix(Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +ElementVector* StressbalanceVerticalAnalysis::CreatePVector(Element* element){/*{{{*/ +_error_("not implemented yet"); +}/*}}}*/ void StressbalanceVerticalAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ element->GetSolutionFromInputsOneDof(solution,VzEnum); Index: /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.h (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.h (revision 16782) @@ -12,4 +12,5 @@ public: + /*Model processing*/ int DofsPerNode(int** doflist,int meshtype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); @@ -18,4 +19,8 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); void InputUpdateFromSolution(IssmDouble* solution,Element* element); Index: /issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp (revision 16782) @@ -111,5 +111,11 @@ }/*}}}*/ -/*Numerics*/ +/*Finite Element Analysis*/ +ElementMatrix* ThermalAnalysis::CreateKMatrix(Element* element){/*{{{*/ + _error_("not implemented yet"); +}/*}}}*/ +ElementVector* ThermalAnalysis::CreatePVector(Element* element){/*{{{*/ +_error_("not implemented yet"); +}/*}}}*/ void ThermalAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ element->GetSolutionFromInputsOneDof(solution,TemperatureEnum); Index: /issm/trunk-jpl/src/c/analyses/ThermalAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/ThermalAnalysis.h (revision 16781) +++ /issm/trunk-jpl/src/c/analyses/ThermalAnalysis.h (revision 16782) @@ -12,4 +12,5 @@ public: + /*Model processing*/ int DofsPerNode(int** doflist,int meshtype,int approximation); void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum); @@ -18,4 +19,8 @@ void CreateConstraints(Constraints* constraints,IoModel* iomodel); void CreateLoads(Loads* loads, IoModel* iomodel); + + /*Finite element Analysis*/ + ElementMatrix* CreateKMatrix(Element* element); + ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); void InputUpdateFromSolution(IssmDouble* solution,Element* element);