Index: /issm/trunk-jpl/src/c/analyses/AdjointBalancethickness2Analysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/AdjointBalancethickness2Analysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/AdjointBalancethickness2Analysis.cpp (revision 18055) @@ -123,4 +123,7 @@ _error_("not implemented yet"); }/*}}}*/ +void AdjointBalancethickness2Analysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); +}/*}}}*/ void AdjointBalancethickness2Analysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ element->InputUpdateFromSolutionOneDof(solution,AdjointEnum); Index: /issm/trunk-jpl/src/c/analyses/AdjointBalancethickness2Analysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/AdjointBalancethickness2Analysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/AdjointBalancethickness2Analysis.h (revision 18055) @@ -27,4 +27,5 @@ ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/AdjointBalancethicknessAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/AdjointBalancethicknessAnalysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/AdjointBalancethicknessAnalysis.cpp (revision 18055) @@ -150,4 +150,7 @@ _error_("not implemented yet"); }/*}}}*/ +void AdjointBalancethicknessAnalysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); +}/*}}}*/ void AdjointBalancethicknessAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/AdjointBalancethicknessAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/AdjointBalancethicknessAnalysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/AdjointBalancethicknessAnalysis.h (revision 18055) @@ -27,4 +27,5 @@ ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/AdjointHorizAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/AdjointHorizAnalysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/AdjointHorizAnalysis.cpp (revision 18055) @@ -900,4 +900,7 @@ _error_("not implemented yet"); }/*}}}*/ +void AdjointHorizAnalysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); +}/*}}}*/ void AdjointHorizAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ int approximation; Index: /issm/trunk-jpl/src/c/analyses/AdjointHorizAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/AdjointHorizAnalysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/AdjointHorizAnalysis.h (revision 18055) @@ -33,4 +33,5 @@ ElementVector* CreatePVectorFS(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/Analysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/Analysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/Analysis.h (revision 18055) @@ -40,4 +40,5 @@ virtual ElementVector* CreatePVector(Element* element)=0; virtual void GetSolutionFromInputs(Vector* solution,Element* element)=0; + virtual void GradientJ(Vector* gradient,int control_index)=0; virtual void InputUpdateFromSolution(IssmDouble* solution,Element* element)=0; virtual void UpdateConstraints(FemModel* femmodel)=0; Index: /issm/trunk-jpl/src/c/analyses/Balancethickness2Analysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/Balancethickness2Analysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/Balancethickness2Analysis.cpp (revision 18055) @@ -196,4 +196,7 @@ _error_("not implemented yet"); }/*}}}*/ +void Balancethickness2Analysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); +}/*}}}*/ void Balancethickness2Analysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/Balancethickness2Analysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/Balancethickness2Analysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/Balancethickness2Analysis.h (revision 18055) @@ -29,4 +29,5 @@ ElementVector* CreatePVectorBoundary(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/BalancethicknessAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/BalancethicknessAnalysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/BalancethicknessAnalysis.cpp (revision 18055) @@ -479,4 +479,7 @@ _error_("not implemented yet"); }/*}}}*/ +void BalancethicknessAnalysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); +}/*}}}*/ void BalancethicknessAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/BalancethicknessAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/BalancethicknessAnalysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/BalancethicknessAnalysis.h (revision 18055) @@ -33,4 +33,5 @@ void GetBprime(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/BalancethicknessSoftAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/BalancethicknessSoftAnalysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/BalancethicknessSoftAnalysis.cpp (revision 18055) @@ -45,4 +45,7 @@ _error_("not implemented yet"); }/*}}}*/ +void BalancethicknessSoftAnalysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); +}/*}}}*/ void BalancethicknessSoftAnalysis::InputUpdateFromSolution(IssmDouble* 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 18054) +++ /issm/trunk-jpl/src/c/analyses/BalancethicknessSoftAnalysis.h (revision 18055) @@ -27,4 +27,5 @@ ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/BalancevelocityAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/BalancevelocityAnalysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/BalancevelocityAnalysis.cpp (revision 18055) @@ -241,4 +241,7 @@ _error_("not implemented yet"); }/*}}}*/ +void BalancevelocityAnalysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); +}/*}}}*/ void BalancevelocityAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/BalancevelocityAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/BalancevelocityAnalysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/BalancevelocityAnalysis.h (revision 18055) @@ -27,4 +27,5 @@ ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp (revision 18055) @@ -382,4 +382,7 @@ void DamageEvolutionAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ _error_("not implemented yet"); +}/*}}}*/ +void DamageEvolutionAnalysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); }/*}}}*/ void DamageEvolutionAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.h (revision 18055) @@ -29,4 +29,5 @@ void GetBprime(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/DepthAverageAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/DepthAverageAnalysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/DepthAverageAnalysis.cpp (revision 18055) @@ -160,4 +160,7 @@ _error_("not implemented yet"); }/*}}}*/ +void DepthAverageAnalysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); +}/*}}}*/ void DepthAverageAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/DepthAverageAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/DepthAverageAnalysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/DepthAverageAnalysis.h (revision 18055) @@ -28,4 +28,5 @@ void GetB(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (revision 18055) @@ -779,4 +779,7 @@ void EnthalpyAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ element->GetSolutionFromInputsOneDof(solution,EnthalpyEnum); +}/*}}}*/ +void EnthalpyAnalysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); }/*}}}*/ void EnthalpyAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.h (revision 18055) @@ -35,4 +35,5 @@ void GetBAdvecprime(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/EnumToAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/EnumToAnalysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/EnumToAnalysis.h (revision 18055) @@ -22,4 +22,5 @@ ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/ExtrapolationAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/ExtrapolationAnalysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/ExtrapolationAnalysis.cpp (revision 18055) @@ -240,4 +240,7 @@ _error_("not implemented yet"); }/*}}}*/ +void ExtrapolationAnalysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); +}/*}}}*/ void ExtrapolationAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/ExtrapolationAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/ExtrapolationAnalysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/ExtrapolationAnalysis.h (revision 18055) @@ -26,5 +26,6 @@ ElementMatrix* CreateKMatrix(Element* element); ElementVector* CreatePVector(Element* element); - void GetSolutionFromInputs(Vector* solution,Element* element); + void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/ExtrudeFromBaseAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/ExtrudeFromBaseAnalysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/ExtrudeFromBaseAnalysis.cpp (revision 18055) @@ -222,4 +222,7 @@ _error_("not implemented yet"); }/*}}}*/ +void ExtrudeFromBaseAnalysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); +}/*}}}*/ void ExtrudeFromBaseAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/ExtrudeFromBaseAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/ExtrudeFromBaseAnalysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/ExtrudeFromBaseAnalysis.h (revision 18055) @@ -31,4 +31,5 @@ void GetB(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/ExtrudeFromTopAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/ExtrudeFromTopAnalysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/ExtrudeFromTopAnalysis.cpp (revision 18055) @@ -222,4 +222,7 @@ _error_("not implemented yet"); }/*}}}*/ +void ExtrudeFromTopAnalysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); +}/*}}}*/ void ExtrudeFromTopAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/ExtrudeFromTopAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/ExtrudeFromTopAnalysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/ExtrudeFromTopAnalysis.h (revision 18055) @@ -31,4 +31,5 @@ void GetB(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp (revision 18055) @@ -363,4 +363,7 @@ void FreeSurfaceBaseAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ _error_("not implemented yet"); +}/*}}}*/ +void FreeSurfaceBaseAnalysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); }/*}}}*/ void FreeSurfaceBaseAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.h (revision 18055) @@ -29,4 +29,5 @@ void GetBprime(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/FreeSurfaceTopAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/FreeSurfaceTopAnalysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/FreeSurfaceTopAnalysis.cpp (revision 18055) @@ -367,4 +367,7 @@ _error_("not implemented yet"); }/*}}}*/ +void FreeSurfaceTopAnalysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); +}/*}}}*/ void FreeSurfaceTopAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/FreeSurfaceTopAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/FreeSurfaceTopAnalysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/FreeSurfaceTopAnalysis.h (revision 18055) @@ -29,4 +29,5 @@ void GetBprime(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/GiaAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/GiaAnalysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/GiaAnalysis.cpp (revision 18055) @@ -57,4 +57,7 @@ _error_("not implemented yet"); }/*}}}*/ +void GiaAnalysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); +}/*}}}*/ void GiaAnalysis::InputUpdateFromSolution(IssmDouble* 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 18054) +++ /issm/trunk-jpl/src/c/analyses/GiaAnalysis.h (revision 18055) @@ -27,4 +27,5 @@ ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 18055) @@ -316,4 +316,7 @@ void HydrologyDCEfficientAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ element->GetSolutionFromInputsOneDof(solution,EplHeadEnum); +}/*}}}*/ +void HydrologyDCEfficientAnalysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); }/*}}}*/ void HydrologyDCEfficientAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.h (revision 18055) @@ -28,4 +28,5 @@ ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (revision 18055) @@ -393,4 +393,7 @@ element->GetSolutionFromInputsOneDof(solution,SedimentHeadEnum); }/*}}}*/ +void HydrologyDCInefficientAnalysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); +}/*}}}*/ void HydrologyDCInefficientAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.h (revision 18055) @@ -28,4 +28,5 @@ ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/HydrologyShreveAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyShreveAnalysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/HydrologyShreveAnalysis.cpp (revision 18055) @@ -292,4 +292,7 @@ element->GetSolutionFromInputsOneDof(solution,WatercolumnEnum); }/*}}}*/ +void HydrologyShreveAnalysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); +}/*}}}*/ void HydrologyShreveAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/HydrologyShreveAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyShreveAnalysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/HydrologyShreveAnalysis.h (revision 18055) @@ -27,4 +27,5 @@ ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/L2ProjectionBaseAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/L2ProjectionBaseAnalysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/L2ProjectionBaseAnalysis.cpp (revision 18055) @@ -199,4 +199,7 @@ _error_("not implemented yet"); }/*}}}*/ +void L2ProjectionBaseAnalysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); +}/*}}}*/ void L2ProjectionBaseAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/L2ProjectionBaseAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/L2ProjectionBaseAnalysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/L2ProjectionBaseAnalysis.h (revision 18055) @@ -27,4 +27,5 @@ ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.cpp (revision 18055) @@ -229,4 +229,7 @@ _error_("not implemented yet"); }/*}}}*/ +void L2ProjectionEPLAnalysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); +}/*}}}*/ void L2ProjectionEPLAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ int inputenum,domaintype; Index: /issm/trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.h (revision 18055) @@ -27,4 +27,5 @@ ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (revision 18055) @@ -308,4 +308,7 @@ _error_("not implemented yet"); }/*}}}*/ +void LevelsetAnalysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); +}/*}}}*/ void LevelsetAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.h (revision 18055) @@ -27,4 +27,5 @@ ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/LsfReinitializationAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/LsfReinitializationAnalysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/LsfReinitializationAnalysis.cpp (revision 18055) @@ -283,4 +283,7 @@ xDelete(doflist); +}/*}}}*/ +void LsfReinitializationAnalysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); }/*}}}*/ void LsfReinitializationAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/LsfReinitializationAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/LsfReinitializationAnalysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/LsfReinitializationAnalysis.h (revision 18055) @@ -26,5 +26,6 @@ ElementMatrix* CreateKMatrix(Element* element); ElementVector* CreatePVector(Element* element); - void GetSolutionFromInputs(Vector* solution,Element* element); + void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 18055) @@ -675,4 +675,7 @@ _error_("not implemented yet"); }/*}}}*/ +void MasstransportAnalysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); +}/*}}}*/ void MasstransportAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.h (revision 18055) @@ -33,4 +33,5 @@ void GetBprime(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/MeltingAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/MeltingAnalysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/MeltingAnalysis.cpp (revision 18055) @@ -151,4 +151,7 @@ _error_("not implemented yet"); }/*}}}*/ +void MeltingAnalysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); +}/*}}}*/ void MeltingAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ element->InputUpdateFromSolutionOneDof(solution,BasalforcingsMeltingRateEnum); Index: /issm/trunk-jpl/src/c/analyses/MeltingAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/MeltingAnalysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/MeltingAnalysis.h (revision 18055) @@ -27,4 +27,5 @@ ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/MeshdeformationAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/MeshdeformationAnalysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/MeshdeformationAnalysis.cpp (revision 18055) @@ -45,4 +45,7 @@ _error_("not implemented yet"); }/*}}}*/ +void MeshdeformationAnalysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); +}/*}}}*/ void MeshdeformationAnalysis::InputUpdateFromSolution(IssmDouble* 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 18054) +++ /issm/trunk-jpl/src/c/analyses/MeshdeformationAnalysis.h (revision 18055) @@ -27,4 +27,5 @@ ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.cpp (revision 18055) @@ -172,4 +172,7 @@ _error_("not implemented yet"); }/*}}}*/ +void SmoothedSurfaceSlopeXAnalysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); +}/*}}}*/ void SmoothedSurfaceSlopeXAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ element->InputUpdateFromSolutionOneDof(solution,SurfaceSlopeXEnum); Index: /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.h (revision 18055) @@ -27,4 +27,5 @@ ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.cpp (revision 18055) @@ -171,4 +171,7 @@ _error_("not implemented yet"); }/*}}}*/ +void SmoothedSurfaceSlopeYAnalysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); +}/*}}}*/ void SmoothedSurfaceSlopeYAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ element->InputUpdateFromSolutionOneDof(solution,SurfaceSlopeYEnum); Index: /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.h (revision 18055) @@ -27,4 +27,5 @@ ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 18055) @@ -1040,4 +1040,7 @@ xDelete(doflist); }/*}}}*/ +void StressbalanceAnalysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); +}/*}}}*/ void StressbalanceAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.h (revision 18055) @@ -27,4 +27,5 @@ ElementVector* CreatePVector(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void GetSolutionFromInputsHoriz(Vector* solution,Element* element); void InputUpdateFromSolution(IssmDouble* solution,Element* element); Index: /issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.cpp (revision 18055) @@ -493,4 +493,7 @@ xDelete(values); }/*}}}*/ +void StressbalanceSIAAnalysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); +}/*}}}*/ void StressbalanceSIAAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.h (revision 18055) @@ -31,4 +31,5 @@ ElementVector* CreatePVector3D(Element* element); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp (revision 18055) @@ -356,4 +356,7 @@ void StressbalanceVerticalAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ element->GetSolutionFromInputsOneDof(solution,VzEnum); +}/*}}}*/ +void StressbalanceVerticalAnalysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); }/*}}}*/ void StressbalanceVerticalAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.h (revision 18055) @@ -33,4 +33,5 @@ void GetBprime(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp (revision 18055) @@ -653,4 +653,7 @@ /*Clean-up*/ xDelete(dbasis); +}/*}}}*/ +void ThermalAnalysis::GradientJ(Vector* gradient,int control_index){/*{{{*/ + _error_("Not implemented yet"); }/*}}}*/ void ThermalAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/ThermalAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/ThermalAnalysis.h (revision 18054) +++ /issm/trunk-jpl/src/c/analyses/ThermalAnalysis.h (revision 18055) @@ -35,4 +35,5 @@ void GetBAdvecprime(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss); void GetSolutionFromInputs(Vector* solution,Element* element); + void GradientJ(Vector* gradient,int control_index); void InputUpdateFromSolution(IssmDouble* solution,Element* element); void UpdateConstraints(FemModel* femmodel);