stardis-solver

commit 8941ba92d7d4480f4f66622235ed1c64dff13e7b
parent dccaa691cefada50a1a47ee04789a4b68b6e150a
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Wed, 30 Sep 2020 11:55:01 +0200

Merge branch 'develop' into feature_unsteady_green

Diffstat:
M
src/sdis_solve_boundary_Xd.h
 | 
2
+-
M
src/sdis_solve_probe_boundary_Xd.h
 | 
2
+-
M
src/test_sdis_solve_boundary_flux.c
 | 
24
++++++------------------

3 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/src/sdis_solve_boundary_Xd.h b/src/sdis_solve_boundary_Xd.h
@@ -662,7 +662,7 @@ XD(solve_boundary_flux)
         if(msg2 == 0) {
           msg2 = 1,
             log_err(scn->dev,
-              "%s: Attempt to compute a flux at a Dirichlet boundary.\n",
+              "%s: Attempt to compute a flux at a Dirichlet boundary (not available yet).\n",
               FUNC_NAME);
         }
       }
diff --git a/src/sdis_solve_probe_boundary_Xd.h b/src/sdis_solve_probe_boundary_Xd.h
@@ -510,7 +510,7 @@ XD(solve_probe_boundary_flux)
         if(msg1 == 0) {
           msg1 = 1,
             log_err(scn->dev,
-              "%s: Attempt to compute a flux at a Dirichlet boundary.\n",
+              "%s: Attempt to compute a flux at a Dirichlet boundary (not available yet).\n",
               FUNC_NAME);
         }
       }
diff --git a/src/test_sdis_solve_boundary_flux.c b/src/test_sdis_solve_boundary_flux.c
@@ -447,29 +447,17 @@ main(int argc, char** argv)
   printf("Average values of the right side of the square = ");
   check_estimator(estimator, N, analyticT, analyticCF, analyticRF, analyticTF);
   OK(sdis_estimator_ref_put(estimator));
-  
-  /* Average temperature on the left side of the box */
+
+  /* Flux computation on Dirichlet boundaries is not available yet.
+   * Once available, the expected total flux is the same we expect on the right
+   * side (as the other sides are adiabatic). */
   prims[0] = 2;
   prims[1] = 3;
-
-  analyticT = Tb;
-  analyticCF = H * (analyticT - Tf);
-  analyticRF = Hrad * (analyticT - Trad);
-  analyticTF = analyticCF + analyticRF;
-
   bound_args.nprimitives = 2;
-  OK(SOLVE(box_scn, &bound_args, &estimator));
-  printf("Average values of the left side of the box = ");
-  check_estimator(estimator, N, analyticT, analyticCF, analyticRF, analyticTF);
-  OK(sdis_estimator_ref_put(estimator));
-
-  /* Average temperature on the left/right side of the square */
+  BA(SOLVE(box_scn, &bound_args, &estimator));
   prims[0] = 1;
   bound_args.nprimitives = 1;
-  OK(SOLVE(square_scn, &bound_args, &estimator));
-  printf("Average values of the left side of the square = ");
-  check_estimator(estimator, N, analyticT, analyticCF, analyticRF, analyticTF);
-  OK(sdis_estimator_ref_put(estimator));
+  BA(SOLVE(square_scn, &bound_args, &estimator));
   #undef SOLVE
 
   OK(sdis_scene_ref_put(box_scn));