source: issm/oecreview/Archive/26740-27031/ISSM-26889-26890.diff

Last change on this file was 27032, checked in by Mathieu Morlighem, 3 years ago

CHG: added 26740-27031
File size: 3.1 KB
RevLine 
[27032]1Index: ../trunk-jpl/src/c/classes/FemModel.cpp
2===================================================================
3--- ../trunk-jpl/src/c/classes/FemModel.cpp (revision 26889)
4+++ ../trunk-jpl/src/c/classes/FemModel.cpp (revision 26890)
5@@ -575,14 +575,14 @@
6 }
7 }
8 /*}}}*/
9-void FemModel::Restart(){ /*{{{*/
10+void FemModel::Restart(int verboselevel){ /*{{{*/
11
12- FILE* restartfid=NULL;
13- char* restartfilename = NULL;
14- int femmodel_size=0;
15- int fread_return=0;
16- char* femmodel_buffer=NULL;
17- char* femmodel_buffer_ini=NULL;
18+ FILE *restartfid = NULL;
19+ char *restartfilename = NULL;
20+ int femmodel_size = 0;
21+ int fread_return = 0;
22+ char *femmodel_buffer = NULL;
23+ char *femmodel_buffer_ini = NULL;
24
25 /*First, recover the name of the restart file: */
26 parameters->FindParam(&restartfilename,RestartFileNameEnum);
27@@ -596,11 +596,19 @@
28 }
29
30 /*Print banner*/
31- _printf0_(" \n");
32- _printf0_("====================================================================\n");
33- _printf0_(" RESTART DETECTED: "<<restartfilename<< "\n");
34- _printf0_("====================================================================\n");
35- _printf0_(" \n");
36+ if(verboselevel>1){
37+ _printf0_(" \n");
38+ _printf0_("====================================================================\n");
39+ _printf0_(" RESTART DETECTED: "<<restartfilename<< "\n");
40+ _printf0_("====================================================================\n");
41+ _printf0_(" \n");
42+ }
43+ else if(verboselevel==1){
44+ _printf0_(" == restarting from "<<restartfilename<<"\n");
45+ }
46+ else{
47+ /*Do not print anything*/
48+ }
49
50 /*Figure out size of buffer to be read: */
51 fseek(restartfid, 0L, SEEK_END);
52@@ -644,7 +652,7 @@
53 this->parameters->AddObject(new StringParam(RestartFileNameEnum,restartfilename));
54
55 /*Read files*/
56- this->Restart();
57+ this->Restart(1);
58
59 /*Clean up and return*/
60 xDelete<char>(restartfilename);
61Index: ../trunk-jpl/src/c/classes/FemModel.h
62===================================================================
63--- ../trunk-jpl/src/c/classes/FemModel.h (revision 26889)
64+++ ../trunk-jpl/src/c/classes/FemModel.h (revision 26890)
65@@ -82,7 +82,7 @@
66 void InitFromFiles(char* rootpath, char* inputfilename, char* outputfilename, char* petscfilename, char* lockfilename, char* restartfilename, char* modelname, const int solution_type,bool trace,IssmPDouble* X=NULL);
67 void InitFromFids(char* rootpath, FILE* IOMODEL, FILE* toolkitsoptionsfid, int in_solution_type, bool trace, IssmPDouble* X=NULL);
68 void Marshall(MarshallHandle* marshallhandle);
69- void Restart(void);
70+ void Restart(int verboselevel=2);
71 void RestartAD(int step);
72 void SetCurrentConfiguration(int configuration_type);
73 void SetCurrentConfiguration(int configuration_type,int analysis_type);
Note: See TracBrowser for help on using the repository browser.