stardis-solver

commit debdd7e6ec7c5af0440e738ce12e27187d76c884
parent 996d5238dc4575cc58024b4f6c96f57e8927e7d7
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Thu,  1 Oct 2020 12:01:26 +0200

Minor code clean up

Diffstat:
M
src/sdis_solve_boundary_Xd.h
 | 
32
++++++++------------------------
M
src/sdis_solve_probe_boundary_Xd.h
 | 
20
++++++--------------

2 files changed, 14 insertions(+), 38 deletions(-)
diff --git a/src/sdis_solve_boundary_Xd.h b/src/sdis_solve_boundary_Xd.h
@@ -452,7 +452,6 @@ XD(solve_boundary_flux)
   size_t i;
   size_t view_nprims;
   int progress = 0;
-  int msg1 = 0, msg2 = 0;
   ATOMIC nsolved_realisations = 0;
   ATOMIC res = RES_OK;
 
@@ -563,7 +562,7 @@ XD(solve_boundary_flux)
 
   nrealisations = args->nrealisations;
   omp_set_num_threads((int)scn->dev->nthreads);
-  #pragma omp parallel for schedule(static) shared(msg1, msg2)
+  #pragma omp parallel for schedule(static)
   for(irealisation = 0; irealisation < (int64_t)nrealisations; ++irealisation) {
     struct time t0, t1;
     const int ithread = omp_get_thread_num();
@@ -628,19 +627,11 @@ XD(solve_boundary_flux)
     bmd = interface_get_medium(interf, SDIS_BACK);
     if(!fmd || !bmd
       || (  !(fmd->type == SDIS_FLUID && bmd->type == SDIS_SOLID)
-         && !(fmd->type == SDIS_SOLID && bmd->type == SDIS_FLUID)))
-    {
-      #pragma omp critical
-      {
-        if(msg1 == 0) {
-          msg1 = 1,
-          log_err(scn->dev,
-            "%s: Attempt to compute a flux at a %s-%s interface.\n",
-            FUNC_NAME,
-            (fmd->type == SDIS_FLUID ? "fluid" : "solid"),
-            (bmd->type == SDIS_FLUID ? "fluid" : "solid"));
-        }
-      }
+         && !(fmd->type == SDIS_SOLID && bmd->type == SDIS_FLUID))) {
+      log_err(scn->dev, "%s: Attempt to compute a flux at a %s-%s interface.\n",
+        FUNC_NAME,
+        (fmd->type == SDIS_FLUID ? "fluid" : "solid"),
+        (bmd->type == SDIS_FLUID ? "fluid" : "solid"));
       ATOMIC_SET(&res, RES_BAD_ARG);
       continue;
     }
@@ -661,15 +652,8 @@ XD(solve_boundary_flux)
     imposed_temp = interface_side_get_temperature(interf, &frag);
     if(imposed_temp >= 0) {
       /* Flux computation on T boundaries is not supported yet */
-      #pragma omp critical
-      {
-        if(msg2 == 0) {
-          msg2 = 1,
-            log_err(scn->dev,
-              "%s: Attempt to compute a flux at a Dirichlet boundary (not available yet).\n",
-              FUNC_NAME);
-        }
-      }
+      log_err(scn->dev, "%s: Attempt to compute a flux at a Dirichlet boundary "
+        "(not available yet).\n", FUNC_NAME);
       ATOMIC_SET(&res, RES_BAD_ARG);
       continue;
     }
diff --git a/src/sdis_solve_probe_boundary_Xd.h b/src/sdis_solve_probe_boundary_Xd.h
@@ -351,7 +351,6 @@ XD(solve_probe_boundary_flux)
   int64_t irealisation = 0;
   size_t i;
   int progress = 0;
-  int msg1 = 0;
   ATOMIC nsolved_realisations = 0;
   ATOMIC res = RES_OK;
 
@@ -395,9 +394,9 @@ XD(solve_probe_boundary_flux)
     }
   } else {
     const double w = CLAMP(1 - args->uv[0] - args->uv[1], 0, 1);
-    if(args->uv[0] < 0 
-    || args->uv[1] < 0 
-    || args->uv[0] > 1 
+    if(args->uv[0] < 0
+    || args->uv[1] < 0
+    || args->uv[0] > 1
     || args->uv[1] > 1
     || !eq_eps(w + args->uv[0] + args->uv[1], 1, 1.e-6)) {
       log_err(scn->dev,
@@ -471,7 +470,7 @@ XD(solve_probe_boundary_flux)
   /* Here we go! Launch the Monte Carlo estimation */
   nrealisations = args->nrealisations;
   omp_set_num_threads((int)scn->dev->nthreads);
-  #pragma omp parallel for schedule(static) shared(msg1)
+  #pragma omp parallel for schedule(static)
   for(irealisation = 0; irealisation < (int64_t)nrealisations; ++irealisation) {
     struct time t0, t1;
     const int ithread = omp_get_thread_num();
@@ -509,15 +508,8 @@ XD(solve_probe_boundary_flux)
     imposed_temp = interface_side_get_temperature(interf, &frag);
     if(imposed_temp >= 0) {
       /* Flux computation on T boundaries is not supported yet */
-      #pragma omp critical
-      {
-        if(msg1 == 0) {
-          msg1 = 1,
-            log_err(scn->dev,
-              "%s: Attempt to compute a flux at a Dirichlet boundary (not available yet).\n",
-              FUNC_NAME);
-        }
-      }
+      log_err(scn->dev,"%s: Attempt to compute a flux at a Dirichlet boundary "
+        "(not available yet).\n",  FUNC_NAME);
       ATOMIC_SET(&res, RES_BAD_ARG);
       continue;
     }