source: issm/oecreview/Archive/11268-11286/ISSM-11285-11286.diff@ 11515

Last change on this file since 11515 was 11515, checked in by Eric.Larour, 13 years ago

Oecreview up to 11509
File size: 1.1 KB
RevLine 
[11515]1Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/solutions.h
2===================================================================
3--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/solutions.h (revision 11285)
4+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/solutions.h (revision 11286)
5@@ -21,6 +21,7 @@
6 void thermal_core(FemModel* femmodel);
7 void thermal_core_step(FemModel* femmodel,int step, double time);
8 void enthalpy_core(FemModel* femmodel);
9+void enthalpy_core_step(FemModel* femmodel,int step, double time);
10 void surfaceslope_core(FemModel* femmodel);
11 void bedslope_core(FemModel* femmodel);
12 void control_core(FemModel* femmodel);
13@@ -33,7 +34,7 @@
14 double objectivefunctionC(double search_scalar,OptArgs* optargs);
15
16 //convergence:
17-void convergence(int* pconverged, Mat K_ff,Vec p_f,Vec u_f,Vec u_f_old,Parameters* parameters);
18+void convergence(bool* pconverged, Mat K_ff,Vec p_f,Vec u_f,Vec u_f_old,Parameters* parameters);
19 bool controlconvergence(double J,double tol_cm);
20 bool steadystateconvergence(FemModel* femmodel);
21
Note: See TracBrowser for help on using the repository browser.