Commit f28213b4 authored by Yvonne Kuestermann's avatar Yvonne Kuestermann
Browse files

refactor cdo.[ch]: vars timer_* to util.[ch] or static

parent 26eefe11
......@@ -95,7 +95,6 @@ void *CDIread(void *argument)
double tw, tw0, t0, twsum = 0;
float *farray = NULL;
double *darray = NULL;
extern int timer_read;
sinfo[0] = 0;
......
......@@ -111,7 +111,6 @@ void *CDIwrite(void *argument)
double tw, tw0, t0, twsum = 0;
double ***vars = NULL;
float *farray = NULL;
extern int timer_write;
srand(seed);
sinfo[0] = 0;
......
......@@ -69,20 +69,15 @@
int cdoRegulargrid = FALSE;
static int CDO_netcdf_hdr_pad = 0;
#define MAX_NUM_VARNAMES 256
int timer_total, timer_read, timer_write;
static int Debug = 0;
static int Version = 0;
static int Help = 0;
static int DebugLevel = 0;
static int numThreads = 0;
static int timer_total;
static int CDO_netcdf_hdr_pad = 0;
#define PRINT_RLIMIT(resource) \
......
......@@ -45,8 +45,6 @@ int pclose(FILE *stream);
#include "dmemory.h"
extern int timer_read, timer_write;
static int PSTREAM_Debug = 0;
#define MAX_PSTREAMS 4096
......
......@@ -100,6 +100,9 @@ char CDO_File_Suffix[32];
int cdoExpMode = -1;
char *cdoExpName = NULL;
int timer_read, timer_write;
int cdo_omp_get_thread_num(void)
{
......
......@@ -41,6 +41,7 @@ extern char *Progname; // refactor: process.c defined in cdo.c
extern char *cdoGridSearchDir; // refactor: gridreference.c defined in cd.c
extern int CDO_Append_History; // refactor: history.c defined in cdo.c
extern int CDO_Reset_History; // refactor: history.c defined in cdo.c
extern int timer_read, timer_write; // refactor: both pstream.c and CDIread.c CDIwrite.c defined in cdo.c
/* refactor: moved from cdo.c */
extern int CDO_optind;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment