stardis-solver

commit 809dc3025efdb64a7c629911bb0952736bdf9961
parent ce9d5263b9396058a1c52e591aa9ea3f9115bd5c
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Wed, 19 Jun 2024 15:41:27 +0200

Update Makefile directives for custom path sampling test

The test depends on Star-3DUT, Star-3D and Star-SP, and optionally on
MPI. So far, we haven't explicitly provided compiler flags for its
Star-3D and Star-SP dependencies. It was still compiled without error
because of the solver dependencies which, in fact, are not known to the
test and should therefore be ignored. So, even though there were no
errors, it was a problem that this commit corrects.

Diffstat:
M
Makefile
 | 
20
+++++++++++++++++---

1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
@@ -463,7 +463,6 @@ test_sdis_solve_medium_2d \
 # Tests based on Star-3DUT with (optional) MPI support
 ################################################################################
 src/test_sdis_compute_power.d \
-src/test_sdis_custom_solid_path_sampling.d \
 src/test_sdis_solve_camera.d \
 src/test_sdis_solve_medium.d \
 src/test_sdis_solve_probe_boundary_list.d \
@@ -471,7 +470,6 @@ src/test_sdis_solve_probe_boundary_list.d \
 	@$(CC) $(TEST_CFLAGS_MPI) $(S3DUT_CFLAGS) -MM -MT "$(@:.d=.o) $@" $(@:.d=.c) -MF $@
 
 src/test_sdis_compute_power.o \
-src/test_sdis_custom_solid_path_sampling.o \
 src/test_sdis_solve_camera.o \
 src/test_sdis_solve_medium.o \
 src/test_sdis_solve_probe_boundary_list.o \
@@ -479,7 +477,6 @@ src/test_sdis_solve_probe_boundary_list.o \
 	$(CC) $(TEST_CFLAGS_MPI) $(S3DUT_CFLAGS) -c $(@:.o=.c) -o $@
 
 test_sdis_compute_power \
-test_sdis_custom_solid_path_sampling \
 test_sdis_solve_camera \
 test_sdis_solve_medium \
 test_sdis_solve_probe_boundary_list \
@@ -502,6 +499,23 @@ test_sdis_solve_probe_list \
 	$(CC) $(TEST_CFLAGS_MPI) $(S3D_CFLAGS) $(S3DUT_CFLAGS) -o $@ src/$@.o $(TEST_LIBS_MPI) $(S3D_LIBS) $(S3DUT_LIBS)
 
 ################################################################################
+# Tests based on Star-3D, Star-3DUT and Star-SP with (optional) MPI support
+################################################################################
+src/test_sdis_custom_solid_path_sampling.d \
+: config.mk sdis-local.pc
+	@$(CC) $(TEST_CFLAGS_MPI) $(S3D_CFLAGS) $(S3DUT_CFLAGS) $(SSP_CFLAGS) \
+	-MM -MT "$(@:.d=.o) $@" $(@:.d=.c) -MF $@
+
+src/test_sdis_custom_solid_path_sampling.o \
+: config.mk sdis-local.pc
+	$(CC) $(TEST_CFLAGS_MPI) $(S3D_CFLAGS) $(S3DUT_CFLAGS) $(SSP_CFLAGS) -c $(@:.o=.c) -o $@
+
+test_sdis_custom_solid_path_sampling \
+: config.mk sdis-local.pc $(LIBNAME) src/test_sdis_utils.o
+	$(CC) $(TEST_CFLAGS_MPI) $(S3D_CFLAGS) $(S3DUT_CFLAGS) $(SSP_CFLAGS) \
+	-o $@ src/$@.o $(TEST_LIBS_MPI) $(S3D_LIBS) $(S3DUT_LIBS) $(SSP_CFLAGS)
+
+################################################################################
 # Tests based on Star-SP with (optional) MPI support
 ################################################################################
 src/test_sdis_solve_boundary.d \