Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/solutions.h =================================================================== --- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/solutions.h (revision 11285) +++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/solutions.h (revision 11286) @@ -21,6 +21,7 @@ void thermal_core(FemModel* femmodel); void thermal_core_step(FemModel* femmodel,int step, double time); void enthalpy_core(FemModel* femmodel); +void enthalpy_core_step(FemModel* femmodel,int step, double time); void surfaceslope_core(FemModel* femmodel); void bedslope_core(FemModel* femmodel); void control_core(FemModel* femmodel); @@ -33,7 +34,7 @@ double objectivefunctionC(double search_scalar,OptArgs* optargs); //convergence: -void convergence(int* pconverged, Mat K_ff,Vec p_f,Vec u_f,Vec u_f_old,Parameters* parameters); +void convergence(bool* pconverged, Mat K_ff,Vec p_f,Vec u_f,Vec u_f_old,Parameters* parameters); bool controlconvergence(double J,double tol_cm); bool steadystateconvergence(FemModel* femmodel);