commit 6c6e0fb04d1d3fb9e0a0a4f80f19b5c8059b0791
parent 05cd3f120efc653480c21212131e95f3a3952c5f
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date: Tue, 3 Mar 2020 17:54:58 +0100
Rename API enum members
Diffstat:
9 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/sdis.h b/src/sdis.h
@@ -106,9 +106,9 @@ enum sdis_heat_vertex_type {
};
enum sdis_heat_path_flag {
- SDIS_HEAT_PATH_SUCCEED = BIT(0),
- SDIS_HEAT_PATH_FAILED = BIT(1),
- SDIS_HEAT_PATH_ALL = SDIS_HEAT_PATH_SUCCEED | SDIS_HEAT_PATH_FAILED,
+ SDIS_HEAT_PATH_SUCCESS = BIT(0),
+ SDIS_HEAT_PATH_FAILURE = BIT(1),
+ SDIS_HEAT_PATH_ALL = SDIS_HEAT_PATH_SUCCESS | SDIS_HEAT_PATH_FAILURE,
SDIS_HEAT_PATH_NONE = 0
};
diff --git a/src/sdis_solve.c b/src/sdis_solve.c
@@ -125,8 +125,8 @@ solve_pixel
if(pheat_path) {
pheat_path->status = res_simul == RES_OK
- ? SDIS_HEAT_PATH_SUCCEED
- : SDIS_HEAT_PATH_FAILED;
+ ? SDIS_HEAT_PATH_SUCCESS
+ : SDIS_HEAT_PATH_FAILURE;
/* Check if the path must be saved regarding the register_paths mask */
if(!(register_paths & (int)pheat_path->status)) {
diff --git a/src/sdis_solve_boundary_Xd.h b/src/sdis_solve_boundary_Xd.h
@@ -290,8 +290,8 @@ XD(solve_boundary)
/* Register heat path */
if(pheat_path) {
pheat_path->status = res_simul == RES_OK
- ? SDIS_HEAT_PATH_SUCCEED
- : SDIS_HEAT_PATH_FAILED;
+ ? SDIS_HEAT_PATH_SUCCESS
+ : SDIS_HEAT_PATH_FAILURE;
/* Check if the path must be saved regarding the register_paths mask */
if(!(register_paths & (int)pheat_path->status)) {
diff --git a/src/sdis_solve_medium_Xd.h b/src/sdis_solve_medium_Xd.h
@@ -353,8 +353,8 @@ XD(solve_medium)
/* Finalize the registered path */
if(pheat_path) {
pheat_path->status = res_simul == RES_OK
- ? SDIS_HEAT_PATH_SUCCEED
- : SDIS_HEAT_PATH_FAILED;
+ ? SDIS_HEAT_PATH_SUCCESS
+ : SDIS_HEAT_PATH_FAILURE;
/* Check if the path must be saved regarding the register_paths mask */
if(!(register_paths & (int)pheat_path->status)) {
diff --git a/src/sdis_solve_probe_Xd.h b/src/sdis_solve_probe_Xd.h
@@ -168,8 +168,8 @@ XD(solve_probe)
if(pheat_path) {
pheat_path->status = res_simul == RES_OK
- ? SDIS_HEAT_PATH_SUCCEED
- : SDIS_HEAT_PATH_FAILED;
+ ? SDIS_HEAT_PATH_SUCCESS
+ : SDIS_HEAT_PATH_FAILURE;
/* Check if the path must be saved regarding the register_paths mask */
if(!(register_paths & (int)pheat_path->status)) {
diff --git a/src/sdis_solve_probe_boundary_Xd.h b/src/sdis_solve_probe_boundary_Xd.h
@@ -205,8 +205,8 @@ XD(solve_probe_boundary)
if(pheat_path) {
pheat_path->status = res_simul == RES_OK
- ? SDIS_HEAT_PATH_SUCCEED
- : SDIS_HEAT_PATH_FAILED;
+ ? SDIS_HEAT_PATH_SUCCESS
+ : SDIS_HEAT_PATH_FAILURE;
/* Check if the path must be saved regarding the register_paths mask */
if(!(register_paths & (int)pheat_path->status)) {
diff --git a/src/test_sdis_solid_random_walk_robustness.c b/src/test_sdis_solid_random_walk_robustness.c
@@ -354,7 +354,7 @@ main(int argc, char** argv)
/* Launch probe estimation with trilinear profile set at interfaces */
interf_param->profile = PROFILE_TRILINEAR;
OK(sdis_solve_probe(scn, Nreals, probe, time, 1.0, -1, 0,
- SDIS_HEAT_PATH_FAILED, &estimator));
+ SDIS_HEAT_PATH_FAILURE, &estimator));
print_estimation_result(estimator, trilinear_temperature(probe));
OK(sdis_estimator_ref_put(estimator));
@@ -362,7 +362,7 @@ main(int argc, char** argv)
interf_param->profile = PROFILE_VOLUMETRIC_POWER;
solid_param->power = Pw;
OK(sdis_solve_probe(scn, Nreals, probe, time, 1.0, -1, 0,
- SDIS_HEAT_PATH_FAILED, &estimator));
+ SDIS_HEAT_PATH_FAILURE, &estimator));
print_estimation_result(estimator, volumetric_temperature(probe, upper));
solid_param->power = SDIS_VOLUMIC_POWER_NONE;
OK(sdis_estimator_ref_put(estimator));
@@ -370,7 +370,7 @@ main(int argc, char** argv)
/* Launch medium integration */
interf_param->profile = PROFILE_UNKNOWN;
OK(sdis_solve_medium(scn, Nreals, solid, time, 1.0, -1, 0,
- SDIS_HEAT_PATH_FAILED, &estimator));
+ SDIS_HEAT_PATH_FAILURE, &estimator));
print_estimation_result(estimator, Tfluid);
/*dump_heat_paths(stdout, estimator);*/
OK(sdis_estimator_ref_put(estimator));
diff --git a/src/test_sdis_solve_probe.c b/src/test_sdis_solve_probe.c
@@ -206,11 +206,11 @@ process_heat_path(const struct sdis_heat_path* path, void* context)
BA(sdis_heat_path_get_status(NULL, &status));
BA(sdis_heat_path_get_status(path, NULL));
OK(sdis_heat_path_get_status(path, &status));
- CHK(status == SDIS_HEAT_PATH_SUCCEED || status == SDIS_HEAT_PATH_FAILED);
+ CHK(status == SDIS_HEAT_PATH_SUCCESS || status == SDIS_HEAT_PATH_FAILURE);
switch(status) {
- case SDIS_HEAT_PATH_FAILED: ++ctx->nfailures; break;
- case SDIS_HEAT_PATH_SUCCEED: ++ctx->nsuccesses; break;
+ case SDIS_HEAT_PATH_FAILURE: ++ctx->nfailures; break;
+ case SDIS_HEAT_PATH_SUCCESS: ++ctx->nsuccesses; break;
default: FATAL("Unreachable code.\n"); break;
}
diff --git a/src/test_sdis_utils.c b/src/test_sdis_utils.c
@@ -354,8 +354,8 @@ dump_heat_paths(FILE* stream, const struct sdis_estimator* estimator)
OK(sdis_estimator_get_path(estimator, ipath, &path));
OK(sdis_heat_path_get_status(path, &status));
switch(status) {
- case SDIS_HEAT_PATH_SUCCEED: fprintf(stream, "0.0\n"); break;
- case SDIS_HEAT_PATH_FAILED: fprintf(stream, "1.0\n"); break;
+ case SDIS_HEAT_PATH_SUCCESS: fprintf(stream, "0.0\n"); break;
+ case SDIS_HEAT_PATH_FAILURE: fprintf(stream, "1.0\n"); break;
default: FATAL("Unreachable code.\n"); break;
}
}
