Skip to content
Snippets Groups Projects
Commit 2edba113 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

petscfinalize + client progress

parent 7419dce0
No related branches found
No related tags found
No related merge requests found
...@@ -113,6 +113,9 @@ void Msg::Exit(int level) ...@@ -113,6 +113,9 @@ void Msg::Exit(int level)
} }
#endif #endif
#if defined(HAVE_PETSC)
PetscFinalize();
#endif
#if defined(HAVE_MPI) #if defined(HAVE_MPI)
MPI_Finalize(); MPI_Finalize();
#endif #endif
...@@ -373,12 +376,15 @@ void Msg::ProgressMeter(int n, int N, const char *fmt, ...) ...@@ -373,12 +376,15 @@ void Msg::ProgressMeter(int n, int N, const char *fmt, ...)
sprintf(str2, "(%d %%)", _progressMeterCurrent); sprintf(str2, "(%d %%)", _progressMeterCurrent);
strcat(str, str2); strcat(str, str2);
if(_client) _client->Progress(str);
#if defined(HAVE_FLTK) #if defined(HAVE_FLTK)
if(FlGui::available()){ if(FlGui::available()){
if(_verbosity > 3) FlGui::instance()->setStatus(str, 1); if(_verbosity > 3) FlGui::instance()->setStatus(str, 1);
FlGui::instance()->check(); FlGui::instance()->check();
} }
#endif #endif
if(CTX::instance()->terminal){ if(CTX::instance()->terminal){
fprintf(stdout, "%s \r", str); fprintf(stdout, "%s \r", str);
fflush(stdout); fflush(stdout);
...@@ -389,11 +395,14 @@ void Msg::ProgressMeter(int n, int N, const char *fmt, ...) ...@@ -389,11 +395,14 @@ void Msg::ProgressMeter(int n, int N, const char *fmt, ...)
} }
if(n > N - 1){ if(n > N - 1){
if(_client) _client->Progress("Done!");
#if defined(HAVE_FLTK) #if defined(HAVE_FLTK)
if(FlGui::available()){ if(FlGui::available()){
if(_verbosity > 3) FlGui::instance()->setStatus("", 1); if(_verbosity > 3) FlGui::instance()->setStatus("", 1);
} }
#endif #endif
if(CTX::instance()->terminal){ if(CTX::instance()->terminal){
fprintf(stdout, "Done! \r"); fprintf(stdout, "Done! \r");
fflush(stdout); fflush(stdout);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment