diff --git a/src/utils/config_loader.c b/src/utils/config_loader.c index dd19983..2a5c857 100644 --- a/src/utils/config_loader.c +++ b/src/utils/config_loader.c @@ -77,8 +77,8 @@ parse_config(const char* path, AcMeshInfo* config) fclose(fp); } -void -update_config(AcMeshInfo* config) +AcResult +acUpdateConfig(AcMeshInfo* config) { config->int_params[AC_mx] = config->int_params[AC_nx] + STENCIL_ORDER; ///////////// PAD TEST @@ -109,6 +109,8 @@ update_config(AcMeshInfo* config) config->int_params[AC_mxy] = config->int_params[AC_mx] * config->int_params[AC_my]; config->int_params[AC_nxy] = config->int_params[AC_nx] * config->int_params[AC_ny]; config->int_params[AC_nxyz] = config->int_params[AC_nxy] * config->int_params[AC_nz]; + + return AC_SUCCESS; } /** @@ -126,7 +128,7 @@ acLoadConfig(const char* config_path, AcMeshInfo* config) memset(config, (uint8_t)0xFF, sizeof(*config)); parse_config(config_path, config); - update_config(config); + acUpdateConfig(config); #if VERBOSE_PRINTING // Defined in astaroth.h printf("###############################################################\n"); printf("Config dimensions recalculated:\n"); diff --git a/src/utils/config_loader.h b/src/utils/config_loader.h index 1775705..e12f13a 100644 --- a/src/utils/config_loader.h +++ b/src/utils/config_loader.h @@ -32,6 +32,9 @@ extern "C" { /** Loads data from the config file */ AcResult acLoadConfig(const char* config_path, AcMeshInfo* config); +/** Updates the built-in parameters based on nx, ny and nz */ +AcResult acUpdateConfig(AcMeshInfo* config); + #ifdef __cplusplus } // extern "C" #endif diff --git a/src/utils/verification.c b/src/utils/verification.c index 0069d52..227b8de 100644 --- a/src/utils/verification.c +++ b/src/utils/verification.c @@ -128,13 +128,23 @@ print_error_to_file(const char* path, const int n, const Error error) fclose(file); } +static bool +is_acceptable(const Error error) +{ + // TODO FIXME + const AcReal range = error.maximum_magnitude - error.minimum_magnitude; + if (error.abs_error < range * AC_REAL_EPSILON) + return true; + else + return false; +} + static void print_error_to_screen(const Error error) { - const bool is_acceptable = true; - + printf("WARNING: is_acceptable() not yet complete\n"); printf("\t%-15s... ", vtxbuf_names[error.handle]); - if (is_acceptable) { + if (is_acceptable(error)) { printf(GRN "OK! " RESET); } else {