core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ECC-1620: Remove -y option

This commit is contained in:
Eugen Betke 2023-09-04 18:41:16 +00:00
parent a08c2cec4a
commit b11a82edbb
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/grib_api_internal.h
View File

@ -1097,6 +1097,7 @@ struct grib_context
grib_trie* lists; grib_trie* lists;
grib_trie* expanded_descriptors; grib_trie* expanded_descriptors;
int file_pool_max_opened_files; int file_pool_max_opened_files;
int is_future_step_format;
#if GRIB_PTHREADS #if GRIB_PTHREADS
pthread_mutex_t mutex; pthread_mutex_t mutex;
#elif GRIB_OMP_THREADS #elif GRIB_OMP_THREADS

6
src/grib_context.cc
View File

@ -366,7 +366,8 @@ static grib_context default_grib_context = {
0, /* classes */ 0, /* classes */
0, /* lists */ 0, /* lists */
0, /* expanded_descriptors */ 0, /* expanded_descriptors */
DEFAULT_FILE_POOL_MAX_OPENED_FILES /* file_pool_max_opened_files */ DEFAULT_FILE_POOL_MAX_OPENED_FILES, /* file_pool_max_opened_files */
0
#if GRIB_PTHREADS #if GRIB_PTHREADS
, ,
PTHREAD_MUTEX_INITIALIZER /* mutex */ PTHREAD_MUTEX_INITIALIZER /* mutex */
@ -399,6 +400,7 @@ grib_context* grib_context_get_default()
const char* grib_data_quality_checks = NULL; const char* grib_data_quality_checks = NULL;
const char* single_precision = NULL; const char* single_precision = NULL;
const char* file_pool_max_opened_files = NULL; const char* file_pool_max_opened_files = NULL;
const char* is_future_step_format = NULL;
#ifdef ENABLE_FLOATING_POINT_EXCEPTIONS #ifdef ENABLE_FLOATING_POINT_EXCEPTIONS
feenableexcept(FE_ALL_EXCEPT & ~FE_INEXACT); feenableexcept(FE_ALL_EXCEPT & ~FE_INEXACT);
@ -421,6 +423,7 @@ grib_context* grib_context_get_default()
no_spd = codes_getenv("ECCODES_GRIB_NO_SPD"); no_spd = codes_getenv("ECCODES_GRIB_NO_SPD");
keep_matrix = codes_getenv("ECCODES_GRIB_KEEP_MATRIX"); keep_matrix = codes_getenv("ECCODES_GRIB_KEEP_MATRIX");
file_pool_max_opened_files = getenv("ECCODES_FILE_POOL_MAX_OPENED_FILES"); file_pool_max_opened_files = getenv("ECCODES_FILE_POOL_MAX_OPENED_FILES");
is_future_step_format = getenv("ECCODES_GRIB_IS_FUTURE_STEP_FORMAT");
/* On UNIX, when we read from a file we get exactly what is in the file on disk. /* On UNIX, when we read from a file we get exactly what is in the file on disk.
* But on Windows a file can be opened in binary or text mode. In binary mode the system behaves exactly as in UNIX. * But on Windows a file can be opened in binary or text mode. In binary mode the system behaves exactly as in UNIX.
@ -555,6 +558,7 @@ grib_context* grib_context_get_default()
default_grib_context.grib_data_quality_checks = grib_data_quality_checks ? atoi(grib_data_quality_checks) : 0; default_grib_context.grib_data_quality_checks = grib_data_quality_checks ? atoi(grib_data_quality_checks) : 0;
default_grib_context.single_precision = single_precision ? atoi(single_precision) : 0; default_grib_context.single_precision = single_precision ? atoi(single_precision) : 0;
default_grib_context.file_pool_max_opened_files = file_pool_max_opened_files ? atoi(file_pool_max_opened_files) : DEFAULT_FILE_POOL_MAX_OPENED_FILES; default_grib_context.file_pool_max_opened_files = file_pool_max_opened_files ? atoi(file_pool_max_opened_files) : DEFAULT_FILE_POOL_MAX_OPENED_FILES;
default_grib_context.is_future_step_format = is_future_step_format ? atoi(is_future_step_format) : 0;
} }
GRIB_MUTEX_UNLOCK(&mutex_c); GRIB_MUTEX_UNLOCK(&mutex_c);

7
src/step_utilities.cc
View File

@ -36,12 +36,7 @@ int set_step(grib_handle* h, const std::string& value_key, const std::string& un
bool is_future_output_enabled(grib_handle* h) bool is_future_output_enabled(grib_handle* h)
{ {
size_t step_output_format_size = 128; return h->context->is_future_step_format > 0;
char step_output_format[128];
int ret = 0;
if ((ret = grib_get_string_internal(h, "stepOutputFormat", step_output_format, &step_output_format_size)) != GRIB_SUCCESS)
return ret;
return strcmp(step_output_format, "future") == 0;
} }

1
tools/grib_options.cc
View File

@ -39,7 +39,6 @@ static grib_options_help grib_options_help_list[] = {
{ "e:", "tolerance", "\n\t\tOnly values whose difference is more than tolerance are considered different.\n" }, { "e:", "tolerance", "\n\t\tOnly values whose difference is more than tolerance are considered different.\n" },
{ "f", 0, "Force. Force the execution not to fail on error.\n" }, { "f", 0, "Force. Force the execution not to fail on error.\n" },
{ "F:", "format", "\n\t\tC style format for floating-point values.\n" }, { "F:", "format", "\n\t\tC style format for floating-point values.\n" },
{ "y", "future", "\n\t\tFuture output format.\n" },
{ "g", 0, "Copy GTS header. \n" }, { "g", 0, "Copy GTS header. \n" },
{ "G", 0, "GRIBEX compatibility mode.\n" }, { "G", 0, "GRIBEX compatibility mode.\n" },
{ "i:", "index", { "i:", "index",