stardis

commit e4f172eb02bf0c6207f8af46f56ff963cb12da09
parent 8d8a57eff6197c11637d33f3703f1e2bda5a2649
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Wed,  4 Nov 2020 11:36:18 +0100

Use new stardis-solver API

Diffstat:
M
cmake/CMakeLists.txt
 | 
2
+-
M
src/stardis-app.c
 | 
1
+
M
src/stardis-compute.c
 | 
21
---------------------

3 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -72,7 +72,7 @@ find_package(RSys 0.9.1 REQUIRED)
 find_package(StarGeom3D 0.1 REQUIRED)
 find_package(Star3D 0.7.1 REQUIRED)
 find_package(StarEnc3D 0.4.2 REQUIRED)
-find_package(Stardis 0.8.2 REQUIRED)
+find_package(Stardis 0.11 REQUIRED)
 find_package(StarSTL 0.3 REQUIRED)
 if(MSVC)
   find_package(MuslGetopt REQUIRED)
diff --git a/src/stardis-app.c b/src/stardis-app.c
@@ -378,6 +378,7 @@ stardis_init
       sg3d_sdisXd_geometry_get_indices,
       sg3d_sdisXd_geometry_get_interface,
       vcount, sg3d_sdisXd_geometry_get_position,
+      stardis->scale_factor, stardis->ambient_temp, stardis->ref_temp,
       &create_context, &stardis->sdis_scn);
     if(res != RES_OK) {
       logger_print(stardis->logger, LOG_ERROR,
diff --git a/src/stardis-compute.c b/src/stardis-compute.c
@@ -384,9 +384,6 @@ compute_probe(struct stardis* stardis)
   args.nrealisations = stardis->samples;
   d3_set(args.position, stardis->probe);
   d2_set(args.time_range, stardis->time_range);
-  args.fp_to_meter = stardis->scale_factor;
-  args.ambient_radiative_temperature = stardis->ambient_temp;
-  args.reference_temperature = stardis->ref_temp;
 
   if(stardis->mode & (MODE_BIN_GREEN | MODE_GREEN)) {
     ERR(sdis_solve_probe_green_function(stardis->sdis_scn, &args, &green));
@@ -455,9 +452,6 @@ compute_probe_on_interface(struct stardis* stardis)
   d3_set(args.uv, uv);
   args.side = SDIS_FRONT;
   d2_set(args.time_range, stardis->time_range);
-  args.fp_to_meter = stardis->scale_factor;
-  args.ambient_radiative_temperature = stardis->ambient_temp;
-  args.reference_temperature = stardis->ref_temp;
 
   if(stardis->mode & (MODE_BIN_GREEN | MODE_GREEN)) {
     ERR(sdis_solve_probe_boundary_green_function(stardis->sdis_scn, &args,
@@ -621,9 +615,6 @@ compute_camera(struct stardis* stardis)
 
   args.cam = cam;
   d2_set(args.time_range, stardis->camera.time_range);
-  args.fp_to_meter = stardis->scale_factor;
-  args.ambient_radiative_temperature = stardis->ambient_temp;
-  args.reference_temperature = stardis->ref_temp;
   args.image_resolution[0] = width;
   args.image_resolution[1] = height;
   args.spp = (size_t)stardis->camera.spp;
@@ -681,9 +672,6 @@ compute_medium(struct stardis* stardis)
   args.nrealisations = stardis->samples;
   args.medium = medium;
   d2_set(args.time_range, stardis->time_range);
-  args.fp_to_meter = stardis->scale_factor;
-  args.ambient_radiative_temperature = stardis->ambient_temp;
-  args.reference_temperature = stardis->ref_temp;
 
   if(stardis->mode & (MODE_BIN_GREEN | MODE_GREEN)) {
     ERR(sdis_solve_medium_green_function(stardis->sdis_scn, &args, &green));
@@ -797,9 +785,6 @@ compute_boundary(struct stardis* stardis)
   args.nprimitives
     = darray_size_t_size_get(&stardis->compute_surface.primitives);
   d2_set(args.time_range, stardis->time_range);
-  args.fp_to_meter = stardis->scale_factor;
-  args.ambient_radiative_temperature = stardis->ambient_temp;
-  args.reference_temperature = stardis->ref_temp;
 
   if(stardis->mode & (MODE_BIN_GREEN | MODE_GREEN)) {
     ERR(sdis_solve_boundary_green_function(stardis->sdis_scn, &args, &green));
@@ -864,9 +849,6 @@ compute_flux_boundary(struct stardis* stardis)
   args.nprimitives
     = darray_size_t_size_get(&stardis->compute_surface.primitives);
   d2_set(args.time_range, stardis->time_range);
-  args.fp_to_meter = stardis->scale_factor;
-  args.ambient_radiative_temperature = stardis->ambient_temp;
-  args.reference_temperature = stardis->ref_temp;
 
   ERR(sdis_solve_boundary_flux(stardis->sdis_scn, &args, &estimator));
   ERR(print_single_MC_result(estimator, stardis, stdout));
@@ -914,9 +896,6 @@ compute_map(struct stardis* stardis)
     args.nprimitives
       = darray_size_t_size_get(&stardis->compute_surface.primitives);
     d2_set(args.time_range, stardis->time_range);
-    args.fp_to_meter = stardis->scale_factor;
-    args.ambient_radiative_temperature = stardis->ambient_temp;
-    args.reference_temperature = stardis->ref_temp;
     args.register_paths = stardis->dump_paths;
 
     ERR(sdis_solve_boundary(stardis->sdis_scn, &args,