stardis-solver

commit cb5e194bc9421c5f4cac10cfdf7b0bf93e34ed67
parent 881a3b8b89c86d383edab4d355b017c6424b35f8
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Wed, 17 Jun 2020 12:05:06 +0200

Still update the progress log message

Do not force a default log message, i.e. a message with the default
message prefix.

Diffstat:
M
src/sdis_solve.c
 | 
8
++------
M
src/sdis_solve_boundary_Xd.h
 | 
16
+++++-----------
M
src/sdis_solve_medium_Xd.h
 | 
8
++------
M
src/sdis_solve_probe_Xd.h
 | 
6
++----
M
src/sdis_solve_probe_boundary_Xd.h
 | 
16
++++------------

5 files changed, 15 insertions(+), 39 deletions(-)
diff --git a/src/sdis_solve.c b/src/sdis_solve.c
@@ -524,17 +524,13 @@ sdis_solve_camera
     #pragma omp critical
     if(pcent > progress) {
       progress = pcent;
-      log_info(scn->dev,
-        "\033[2K\r"MSG_INFO_PREFIX"Infrared rendering: %3d%%\r",
-        progress);
+      log_info(scn->dev, "Infrared rendering: %3d%%\r", progress);
     }
   }
   if(res != RES_OK) goto error;
 
   /* Add a new line after the progress status */
-  log_info(scn->dev,
-    "\033[2K\r"MSG_INFO_PREFIX"Infrared rendering: %3d%%\n",
-    progress);
+  log_info(scn->dev, "Infrared rendering: %3d%%\n", progress);
 
   /* Setup the accumulators of the whole estimator buffer */
   acc_temp = ACCUM_NULL;
diff --git a/src/sdis_solve_boundary_Xd.h b/src/sdis_solve_boundary_Xd.h
@@ -322,17 +322,13 @@ XD(solve_boundary)
     #pragma omp critical
     if(pcent > progress) {
       progress = pcent;
-      log_info(scn->dev,
-        "\033[2K\r"MSG_INFO_PREFIX"Solving boundary temperature: %3d%%\r",
-        progress);
+      log_info(scn->dev, "Solving boundary temperature: %3d%%\r", progress);
     }
   }
   if(res != RES_OK) goto error;
 
   /* Add a new line after the progress status */
-  log_info(scn->dev,
-    "\033[2K\r"MSG_INFO_PREFIX"Solving boundary temperature: %3d%%\n",
-    progress);
+  log_info(scn->dev, "Solving boundary temperature: %3d%%\n", progress);
 
   /* Setup the estimated temperature */
   if(out_estimator) {
@@ -614,7 +610,7 @@ XD(solve_boundary_flux)
     /* Stop time registration */
     time_sub(&t0, time_current(&t1), &t0);
 
-    if(res_simul != RES_OK && res_simul != RES_BAD_OP) { 
+    if(res_simul != RES_OK && res_simul != RES_BAD_OP) {
       ATOMIC_SET(&res, res_simul);
       continue;
     } else if(res_simul == RES_OK) { /* Update accumulators */
@@ -653,15 +649,13 @@ XD(solve_boundary_flux)
     #pragma omp critical
     if(pcent > progress) {
       progress = pcent;
-      log_info(scn->dev,
-        "\033[2K\r"MSG_INFO_PREFIX"Solving boundary flux: %3d%%\r", progress);
+      log_info(scn->dev, "Solving boundary flux: %3d%%\r", progress);
     }
   }
   if(res != RES_OK) goto error;
 
   /* Add a new line after the progress status */
-  log_info(scn->dev,
-    "\033[2K\r"MSG_INFO_PREFIX"Solving boundary flux: %3d%%\n", progress);
+  log_info(scn->dev, "Solving boundary flux: %3d%%\n", progress);
 
   /* Redux the per thread accumulators  */
   sum_accums(acc_tp, scn->dev->nthreads, &acc_tp[0]);
diff --git a/src/sdis_solve_medium_Xd.h b/src/sdis_solve_medium_Xd.h
@@ -385,17 +385,13 @@ XD(solve_medium)
     #pragma omp critical
     if(pcent > progress) {
       progress = pcent;
-      log_info(scn->dev,
-        "\033[2K\r"MSG_INFO_PREFIX"Solving medium temperature: %3d%%\r",
-        progress);
+      log_info(scn->dev, "Solving medium temperature: %3d%%\r", progress);
     }
   }
   if(res != RES_OK) goto error;
 
   /* Add a new line after the progress status */
-  log_info(scn->dev,
-    "\033[2K\r"MSG_INFO_PREFIX"Solving medium temperature: %3d%%\n",
-    progress);
+  log_info(scn->dev, "Solving medium temperature: %3d%%\n", progress);
 
   /* Setup the estimated temperature */
   if(out_estimator) {
diff --git a/src/sdis_solve_probe_Xd.h b/src/sdis_solve_probe_Xd.h
@@ -201,15 +201,13 @@ XD(solve_probe)
     #pragma omp critical
     if(pcent > progress) {
       progress = pcent;
-      log_info(scn->dev,
-        "\033[2K\r"MSG_INFO_PREFIX"Solving probe temperature: %3d%%\r", progress);
+      log_info(scn->dev, "Solving probe temperature: %3d%%\r", progress);
     }
   }
   if(res != RES_OK) goto error;
 
   /* Add a new line after the progress status */
-  log_info(scn->dev,
-    "\033[2K\r"MSG_INFO_PREFIX"Solving probe temperature: %3d%%\n", progress);
+  log_info(scn->dev, "Solving probe temperature: %3d%%\n", progress);
 
   /* Setup the estimated temperature and per realisation time */
   if(out_estimator) {
diff --git a/src/sdis_solve_probe_boundary_Xd.h b/src/sdis_solve_probe_boundary_Xd.h
@@ -238,17 +238,13 @@ XD(solve_probe_boundary)
     #pragma omp critical
     if(pcent > progress) {
       progress = pcent;
-      log_info(scn->dev,
-        "\033[2K\r"MSG_INFO_PREFIX"Solving probe boundary temperature: %3d%%\r",
-        progress);
+      log_info(scn->dev, "Solving probe boundary temperature: %3d%%\r", progress);
     }
   }
   if(res != RES_OK) goto error;
 
   /* Add a new line after the progress status */
-  log_info(scn->dev,
-    "\033[2K\r"MSG_INFO_PREFIX"Solving probe boundary temperature: %3d%%\n",
-    progress);
+  log_info(scn->dev, "Solving probe boundary temperature: %3d%%\n", progress);
 
   /* Setup the estimated temperature and per realisation time */
   if(out_estimator) {
@@ -519,17 +515,13 @@ XD(solve_probe_boundary_flux)
     #pragma omp critical
     if(pcent > progress) {
       progress = pcent;
-      log_info(scn->dev,
-        "\033[2K\r"MSG_INFO_PREFIX"Solving probe boundary flux: %3d%%\r",
-        progress);
+      log_info(scn->dev, "Solving probe boundary flux: %3d%%\r", progress);
     }
   }
   if(res != RES_OK) goto error;
 
   /* Add a new line after the progress status */
-  log_info(scn->dev,
-    "\033[2K\r"MSG_INFO_PREFIX"Solving probe boundary flux: %3d%%\n",
-    progress);
+  log_info(scn->dev, "Solving probe boundary flux: %3d%%\n", progress);
 
   /* Redux the per thread accumulators  */
   sum_accums(acc_tp, scn->dev->nthreads, &acc_tp[0]);