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

Cleanup

This commit is contained in:
Shahram Najm 2024-01-06 13:55:05 +00:00
parent 0f3d2bf9d2
commit 7bd5d6228b
1 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
fortran/grib_fortran.c
View File

@ -1439,7 +1439,7 @@ int any_f_scan_file_(int* fid, int* n) {
grib_context* c=grib_context_get_default(); grib_context* c=grib_context_get_default();
/* this needs a callback to a destructor*/ /* this needs a callback to a destructor*/
/* grib_oarray_delete_content(c,binary_messages); */ /* grib_oarray_delete_content(c, info_messages); */
grib_oarray_delete(c, info_messages); grib_oarray_delete(c, info_messages);
info_messages=grib_oarray_new(c, 1000, 1000); info_messages=grib_oarray_new(c, 1000, 1000);
@ -1500,64 +1500,65 @@ int any_f_new_from_scanned_file_(int* fid, int* msgid, int* gid)
} }
/*****************************************************************************/ /*****************************************************************************/
int any_f_load_all_from_file_(int* fid,int* n) { int any_f_load_all_from_file_(int* fid, int* n) {
int err = 0; int err = 0;
off_t offset=0; off_t offset=0;
void *data = NULL; void* data = NULL;
size_t olen = 0; size_t olen = 0;
l_binary_message* msg=0; l_binary_message* msg=0;
FILE* f = get_file(*fid); FILE* f = get_file(*fid);
grib_context* c=grib_context_get_default(); grib_context* c = grib_context_get_default();
/* this needs a callback to a destructor*/ /* this needs a callback to a destructor*/
/* grib_oarray_delete_content(c,binary_messages); */ /* grib_oarray_delete_content(c, binary_messages); */
grib_oarray_delete(c,binary_messages); grib_oarray_delete(c, binary_messages);
binary_messages=grib_oarray_new(c,1000,1000); binary_messages = grib_oarray_new(c, 1000, 1000);
if (f) { if (f) {
while (err!=GRIB_END_OF_FILE) { while (err != GRIB_END_OF_FILE) {
data = wmo_read_any_from_file_malloc ( f, 0,&olen,&offset,&err ); data = wmo_read_any_from_file_malloc (f, 0,&olen, &offset, &err);
msg=(l_binary_message*)grib_context_malloc_clear(c,sizeof(l_binary_message)); msg = (l_binary_message*)grib_context_malloc_clear(c,sizeof(l_binary_message));
msg->data=data; msg->data = data;
msg->size=olen; msg->size = olen;
if (err==0 && data) grib_oarray_push(c,binary_messages,msg); if (err == 0 && data) grib_oarray_push(c, binary_messages, msg);
} }
if (err==GRIB_END_OF_FILE) err=0; if (err == GRIB_END_OF_FILE) err = 0;
} }
*n=binary_messages->n; *n = binary_messages->n;
return err; return err;
} }
/*****************************************************************************/ /*****************************************************************************/
int any_f_new_from_loaded_(int* msgid,int* gid) int any_f_new_from_loaded_(int* msgid, int* gid)
{ {
grib_handle *h = NULL; grib_handle* h = NULL;
grib_context* c=grib_context_get_default(); grib_context* c = grib_context_get_default();
/* fortran convention of 1 based index*/ /* fortran convention of 1 based index*/
const int n=*msgid-1; const int n = *msgid - 1;
l_binary_message* msg=(l_binary_message*)grib_oarray_get(binary_messages,n); l_binary_message* msg = (l_binary_message*)grib_oarray_get(binary_messages, n);
if (msg && msg->data) if (msg && msg->data)
h=grib_handle_new_from_message_copy (c,msg->data,msg->size); h = grib_handle_new_from_message_copy(c, msg->data, msg->size);
if(h){ if (h) {
push_handle(h,gid); push_handle(h, gid);
return GRIB_SUCCESS; return GRIB_SUCCESS;
} else { }
*gid=-1; else {
*gid = -1;
return GRIB_END_OF_FILE; return GRIB_END_OF_FILE;
} }
} }
/*****************************************************************************/ /*****************************************************************************/
int codes_f_clear_loaded_from_file_(void) { int codes_f_clear_loaded_from_file_(void) {
grib_context* c=grib_context_get_default(); grib_context* c = grib_context_get_default();
/* grib_oarray_delete_content(c,binary_messages); */ /* grib_oarray_delete_content(c,binary_messages); */
grib_oarray_delete(c,binary_messages); grib_oarray_delete(c, binary_messages);
return GRIB_SUCCESS; return GRIB_SUCCESS;
} }
@ -1565,27 +1566,28 @@ int codes_f_clear_loaded_from_file_(void) {
int grib_f_count_in_file_(int* fid,int* n) { int grib_f_count_in_file_(int* fid,int* n) {
int err = 0; int err = 0;
FILE* f = get_file(*fid); FILE* f = get_file(*fid);
if (f) err=grib_count_in_file(0, f,n); if (f) err = grib_count_in_file(0, f, n);
return err; return err;
} }
/*****************************************************************************/ /*****************************************************************************/
int any_f_new_from_file_(int* fid, int* gid){ int any_f_new_from_file_(int* fid, int* gid) {
int err = 0; int err = 0;
FILE* f = get_file(*fid); FILE* f = get_file(*fid);
grib_handle *h = NULL; grib_handle* h = NULL;
if(f){ if (f) {
h = codes_handle_new_from_file(0,f,PRODUCT_ANY,&err); h = codes_handle_new_from_file(0, f, PRODUCT_ANY, &err);
if(h){ if (h) {
push_handle(h,gid); push_handle(h, gid);
return GRIB_SUCCESS; return GRIB_SUCCESS;
} else { }
*gid=-1; else {
*gid = -1;
return GRIB_END_OF_FILE; return GRIB_END_OF_FILE;
} }
} }
*gid=-1; *gid = -1;
return GRIB_INVALID_FILE; return GRIB_INVALID_FILE;
} }