commit 881a3b8b89c86d383edab4d355b017c6424b35f8
parent b72f32473374c7d6d6679a3e863f0bd6e3445860
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Wed, 17 Jun 2020 11:38:18 +0200
Update the solve progress log
Diffstat:
8 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -213,7 +213,6 @@ if(NOT NO_TEST)
target_link_libraries(test_sdis_solve_probe3 Star3DUT)
target_link_libraries(test_sdis_solve_probe3_2d ${MATH_LIB})
target_link_libraries(test_sdis_solve_camera Star3DUT)
-
rcmake_copy_runtime_libraries(test_sdis_solid_random_walk_robustness)
diff --git a/src/sdis_solve.c b/src/sdis_solve.c
@@ -525,7 +525,7 @@ sdis_solve_camera
if(pcent > progress) {
progress = pcent;
log_info(scn->dev,
- "\033[2K\r"MSG_INFO_PREFIX"Infrared rendering: %3d%%",
+ "\033[2K\r"MSG_INFO_PREFIX"Infrared rendering: %3d%%\r",
progress);
}
}
diff --git a/src/sdis_solve_boundary_Xd.h b/src/sdis_solve_boundary_Xd.h
@@ -323,7 +323,7 @@ XD(solve_boundary)
if(pcent > progress) {
progress = pcent;
log_info(scn->dev,
- "\033[2K\r"MSG_INFO_PREFIX"Solving boundary temperature: %3d%%",
+ "\033[2K\r"MSG_INFO_PREFIX"Solving boundary temperature: %3d%%\r",
progress);
}
}
@@ -654,7 +654,7 @@ XD(solve_boundary_flux)
if(pcent > progress) {
progress = pcent;
log_info(scn->dev,
- "\033[2K\r"MSG_INFO_PREFIX"Solving boundary flux: %3d%%", progress);
+ "\033[2K\r"MSG_INFO_PREFIX"Solving boundary flux: %3d%%\r", progress);
}
}
if(res != RES_OK) goto error;
diff --git a/src/sdis_solve_medium_Xd.h b/src/sdis_solve_medium_Xd.h
@@ -386,7 +386,7 @@ XD(solve_medium)
if(pcent > progress) {
progress = pcent;
log_info(scn->dev,
- "\033[2K\r"MSG_INFO_PREFIX"Solving medium temperature: %3d%%",
+ "\033[2K\r"MSG_INFO_PREFIX"Solving medium temperature: %3d%%\r",
progress);
}
}
diff --git a/src/sdis_solve_probe_Xd.h b/src/sdis_solve_probe_Xd.h
@@ -202,7 +202,7 @@ XD(solve_probe)
if(pcent > progress) {
progress = pcent;
log_info(scn->dev,
- "\033[2K\r"MSG_INFO_PREFIX"Solving probe temperature: %3d%%", progress);
+ "\033[2K\r"MSG_INFO_PREFIX"Solving probe temperature: %3d%%\r", progress);
}
}
if(res != RES_OK) goto error;
diff --git a/src/sdis_solve_probe_boundary_Xd.h b/src/sdis_solve_probe_boundary_Xd.h
@@ -239,7 +239,7 @@ XD(solve_probe_boundary)
if(pcent > progress) {
progress = pcent;
log_info(scn->dev,
- "\033[2K\r"MSG_INFO_PREFIX"Solving probe boundary temperature: %3d%%",
+ "\033[2K\r"MSG_INFO_PREFIX"Solving probe boundary temperature: %3d%%\r",
progress);
}
}
@@ -520,7 +520,7 @@ XD(solve_probe_boundary_flux)
if(pcent > progress) {
progress = pcent;
log_info(scn->dev,
- "\033[2K\r"MSG_INFO_PREFIX"Solving probe boundary flux: %3d%%",
+ "\033[2K\r"MSG_INFO_PREFIX"Solving probe boundary flux: %3d%%\r",
progress);
}
}
diff --git a/src/test_sdis_flux.c b/src/test_sdis_flux.c
@@ -241,7 +241,7 @@ main(int argc, char** argv)
(void)argc, (void)argv;
OK(mem_init_proxy_allocator(&allocator, &mem_default_allocator));
- OK(sdis_device_create(NULL, &allocator, SDIS_NTHREADS_DEFAULT, 0, &dev));
+ OK(sdis_device_create(NULL, &allocator, SDIS_NTHREADS_DEFAULT, 1, &dev));
/* Create the dummy fluid medium */
OK(sdis_fluid_create(dev, &fluid_shader, NULL, &fluid));
diff --git a/src/test_sdis_solve_camera.c b/src/test_sdis_solve_camera.c
@@ -30,7 +30,7 @@
#define UNKOWN_TEMPERATURE -1
#define IMG_WIDTH 640
#define IMG_HEIGHT 480
-#define SPP 4 /* #Samples per pixel, i.e. #realisations per pixel */
+#define SPP 1024 /* #Samples per pixel, i.e. #realisations per pixel */
/*
* The scene is composed of a solid cube whose temperature is unknown. The
