Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpim-sw
cdo
Commits
9e628e47
Commit
9e628e47
authored
Jan 14, 2018
by
Oliver Heidmann
Browse files
changed module function parameter void *argument to void *process
parent
e180c59a
Changes
198
Hide whitespace changes
Inline
Side-by-side
src/Adisit.cc
View file @
9e628e47
...
...
@@ -154,7 +154,7 @@ void calc_adipot(long gridsize, long nlevel, double *pressure, field_type t, fie
}
void
*
Adisit
(
void
*
argument
)
void
*
Adisit
(
void
*
process
)
{
int
nrecs
;
int
varID
,
levelID
;
...
...
@@ -166,7 +166,7 @@ void *Adisit(void *argument)
double
pin
=
-
1
;
double
*
single
;
cdoInitialize
(
argument
);
cdoInitialize
(
process
);
int
ADISIT
=
cdoOperatorAdd
(
"adisit"
,
1
,
1
,
""
);
int
ADIPOT
=
cdoOperatorAdd
(
"adipot"
,
1
,
1
,
""
);
...
...
src/Afterburner.cc
View file @
9e628e47
...
...
@@ -2403,9 +2403,9 @@ int afterburner(int argc, char *argv[])
#endif
#if defined(CDO)
void
*
Afterburner
(
void
*
argument
)
void
*
Afterburner
(
void
*
process
)
{
cdoInitialize
(
argument
);
cdoInitialize
(
process
);
CDO_task
=
true
;
...
...
src/Arith.cc
View file @
9e628e47
...
...
@@ -33,7 +33,7 @@
#include
"pstream.h"
void
*
Arith
(
void
*
argument
)
void
*
Arith
(
void
*
process
)
{
enum
{
FILL_NONE
,
FILL_TS
,
FILL_VAR
,
FILL_VARTS
,
FILL_FILE
};
int
filltype
=
FILL_NONE
;
...
...
@@ -47,7 +47,7 @@ void *Arith(void *argument)
double
*
vardata2
=
NULL
;
double
**
vardata
=
NULL
;
cdoInitialize
(
argument
);
cdoInitialize
(
process
);
// clang-format off
cdoOperatorAdd
(
"add"
,
func_add
,
0
,
NULL
);
...
...
src/Arithc.cc
View file @
9e628e47
...
...
@@ -70,13 +70,13 @@ int *fill_vars(int vlistID)
}
void
*
Arithc
(
void
*
argument
)
void
*
Arithc
(
void
*
process
)
{
size_t
nmiss
;
int
nrecs
;
int
varID
,
levelID
;
cdoInitialize
(
argument
);
cdoInitialize
(
process
);
// clang-format off
cdoOperatorAdd
(
"addc"
,
func_add
,
0
,
"constant value"
);
...
...
src/Arithdays.cc
View file @
9e628e47
...
...
@@ -68,7 +68,7 @@ double dayofyear(int calendar, int vdate, int vtime)
}
void
*
Arithdays
(
void
*
argument
)
void
*
Arithdays
(
void
*
process
)
{
int
nrecs
;
int
varID
,
levelID
;
...
...
@@ -76,7 +76,7 @@ void *Arithdays(void *argument)
size_t
nmiss
;
double
rconst
;
cdoInitialize
(
argument
);
cdoInitialize
(
process
);
// clang-format off
cdoOperatorAdd
(
"muldpm"
,
func_mul
,
func_month
,
NULL
);
...
...
src/Arithlat.cc
View file @
9e628e47
...
...
@@ -30,7 +30,7 @@
#include
"grid.h"
void
*
Arithlat
(
void
*
argument
)
void
*
Arithlat
(
void
*
process
)
{
int
gridtype
;
int
gridID0
=
-
1
;
...
...
@@ -41,7 +41,7 @@ void *Arithlat(void *argument)
char
units
[
CDI_MAX_NAME
];
double
*
scale
=
NULL
;
cdoInitialize
(
argument
);
cdoInitialize
(
process
);
cdoOperatorAdd
(
"mulcoslat"
,
func_mul
,
0
,
NULL
);
cdoOperatorAdd
(
"divcoslat"
,
func_div
,
0
,
NULL
);
...
...
src/CDIread.cc
View file @
9e628e47
...
...
@@ -79,7 +79,7 @@ void print_stat(const char *sinfo, int memtype, int datatype, int filetype, off_
}
void
*
CDIread
(
void
*
argument
)
void
*
CDIread
(
void
*
process
)
{
int
memtype
=
CDO_Memtype
;
int
varID
,
levelID
;
...
...
@@ -96,7 +96,7 @@ void *CDIread(void *argument)
sinfo
[
0
]
=
0
;
cdoInitialize
(
argument
);
cdoInitialize
(
process
);
if
(
cdoVerbose
)
cdoPrint
(
"parameter: <nruns>"
);
...
...
src/CDItest.cc
View file @
9e628e47
...
...
@@ -26,7 +26,7 @@
#include
"pstream.h"
void
*
CDItest
(
void
*
argument
)
void
*
CDItest
(
void
*
process
)
{
int
nrecs
;
int
varID
,
levelID
;
...
...
@@ -35,7 +35,7 @@ void *CDItest(void *argument)
double
s_utime
,
s_stime
;
double
e_utime
,
e_stime
;
cdoInitialize
(
argument
);
cdoInitialize
(
process
);
bool
lcopy
=
false
;
//bool lcopy = UNCHANGED_RECORD;
...
...
src/CDIwrite.cc
View file @
9e628e47
...
...
@@ -88,7 +88,7 @@ void print_stat(const char *sinfo, int memtype, int datatype, int filetype, off_
}
void
*
CDIwrite
(
void
*
argument
)
void
*
CDIwrite
(
void
*
process
)
{
int
memtype
=
CDO_Memtype
;
int
nvars
=
10
,
nlevs
=
0
,
ntimesteps
=
30
;
...
...
@@ -111,7 +111,7 @@ void *CDIwrite(void *argument)
srand
(
seed
);
sinfo
[
0
]
=
0
;
cdoInitialize
(
argument
);
cdoInitialize
(
process
);
if
(
cdoVerbose
)
cdoPrint
(
"parameter: <nruns, <grid, <nlevs, <ntimesteps, <nvars>>>>>"
);
...
...
src/CMOR.cc
View file @
9e628e47
...
...
@@ -4866,7 +4866,7 @@ static int cmor_load_and_set_table(list_t *kvl, char *param0, char *project_id,
#endif
void
*
CMOR
(
void
*
argument
)
void
*
CMOR
(
void
*
process
)
{
if
(
cdoVerbose
)
{
...
...
@@ -4878,7 +4878,7 @@ void *CMOR(void *argument)
*/
}
cdoInitialize
(
argument
);
cdoInitialize
(
process
);
#ifdef HAVE_LIBCMOR
signal
(
SIGTERM
,
sigfunc
);
...
...
src/CMOR_lite.cc
View file @
9e628e47
...
...
@@ -359,7 +359,7 @@ void apply_cmorlist(list_t *pmlist, int nvars, int vlistID2, var_t *vars)
}
void
*
CMOR_lite
(
void
*
argument
)
void
*
CMOR_lite
(
void
*
process
)
{
int
nrecs
;
int
varID
,
levelID
;
...
...
@@ -367,7 +367,7 @@ void *CMOR_lite(void *argument)
bool
delvars
=
false
;
double
missval
;
cdoInitialize
(
argument
);
cdoInitialize
(
process
);
CDO_CMOR_Mode
=
1
;
if
(
CDO_CMOR_Mode
)
cdiDefGlobal
(
"CMOR_MODE"
,
CDO_CMOR_Mode
);
...
...
src/CMOR_table.cc
View file @
9e628e47
...
...
@@ -132,9 +132,9 @@ void conv_cmor_table(list_t *pmlist)
}
void
*
CMOR_table
(
void
*
argument
)
void
*
CMOR_table
(
void
*
process
)
{
cdoInitialize
(
argument
);
cdoInitialize
(
process
);
int
DUMP_CMOR_TABLE
=
cdoOperatorAdd
(
"dump_cmor_table"
,
0
,
0
,
NULL
);
int
CONV_CMOR_TABLE
=
cdoOperatorAdd
(
"conv_cmor_table"
,
0
,
0
,
NULL
);
...
...
src/Cat.cc
View file @
9e628e47
...
...
@@ -27,7 +27,7 @@
#include
"pstream.h"
void
*
Cat
(
void
*
argument
)
void
*
Cat
(
void
*
process
)
{
bool
lconstvars
=
true
;
int
nrecs
;
...
...
@@ -39,7 +39,7 @@ void *Cat(void *argument)
double
tw0
=
0
,
tw
=
0
;
double
*
array
=
NULL
;
cdoInitialize
(
argument
);
cdoInitialize
(
process
);
bool
lcopy
=
UNCHANGED_RECORD
;
...
...
src/Change.cc
View file @
9e628e47
...
...
@@ -37,7 +37,7 @@ int stringToParam(const char *paramstr);
#define MAXARG 16384
void
*
Change
(
void
*
argument
)
void
*
Change
(
void
*
process
)
{
int
nrecs
,
nvars
;
int
varID
=
0
,
levelID
;
...
...
@@ -56,7 +56,7 @@ void *Change(void *argument)
double
*
levels
=
NULL
;
double
*
newlevels
=
NULL
;
cdoInitialize
(
argument
);
cdoInitialize
(
process
);
// clang-format off
int
CHCODE
=
cdoOperatorAdd
(
"chcode"
,
0
,
0
,
"pairs of old and new code numbers"
);
...
...
src/Change_e5slm.cc
View file @
9e628e47
...
...
@@ -27,14 +27,14 @@
#include
"pstream.h"
void
*
Change_e5slm
(
void
*
argument
)
void
*
Change_e5slm
(
void
*
process
)
{
char
name
[
CDI_MAX_NAME
];
int
nrecs
;
int
varID
,
levelID
;
size_t
nmiss
;
cdoInitialize
(
argument
);
cdoInitialize
(
process
);
int
streamID1
=
cdoStreamOpenRead
(
cdoStreamName
(
0
));
...
...
src/Cloudlayer.cc
View file @
9e628e47
...
...
@@ -119,7 +119,7 @@ void pl_index(int *kmax, int *kmin, double pmax, double pmin, long nlevs, double
#define NVARS 3
void
*
Cloudlayer
(
void
*
argument
)
void
*
Cloudlayer
(
void
*
process
)
{
int
gridID
,
zaxisID
;
int
nlevel
,
nlevs
,
nrecs
,
code
;
...
...
@@ -137,7 +137,7 @@ void *Cloudlayer(void *argument)
double
*
cloud
[
NVARS
];
double
pmin
=
0
,
pmax
=
0
;
cdoInitialize
(
argument
);
cdoInitialize
(
process
);
if
(
operatorArgc
()
>
0
)
{
...
...
src/Collgrid.cc
View file @
9e628e47
...
...
@@ -301,13 +301,13 @@ int genGrid(int ngrids, int nfiles, ens_file_t *ef, bool ginit, int igrid, int n
}
void
*
Collgrid
(
void
*
argument
)
void
*
Collgrid
(
void
*
process
)
{
int
nxblocks
=
-
1
;
int
varID
,
levelID
;
int
nrecs0
;
cdoInitialize
(
argument
);
cdoInitialize
(
process
);
int
nfiles
=
cdoStreamCnt
()
-
1
;
const
char
*
ofilename
=
cdoGetStreamName
(
nfiles
).
c_str
();
...
...
src/Command.cc
View file @
9e628e47
...
...
@@ -327,7 +327,7 @@ void command_init()
}
void
*
Command
(
void
*
argument
)
void
*
Command
(
void
*
process
)
{
// int recID, varID, levelID;
// size_t nmiss;
...
...
@@ -336,7 +336,7 @@ void *Command(void *argument)
double
c_cputime
=
0
,
c_usertime
=
0
,
c_systime
=
0
;
char
line
[
MAX_LINE
];
cdoInitialize
(
argument
);
cdoInitialize
(
process
);
processStartTime
(
&
s_utime
,
&
s_stime
);
...
...
src/Comp.cc
View file @
9e628e47
...
...
@@ -32,7 +32,7 @@
#include
"pstream.h"
void
*
Comp
(
void
*
argument
)
void
*
Comp
(
void
*
process
)
{
enum
{
FILL_NONE
,
FILL_TS
,
FILL_REC
};
int
filltype
=
FILL_NONE
;
...
...
@@ -42,7 +42,7 @@ void *Comp(void *argument)
double
missval1
,
missval2
=
0
;
double
**
vardata
=
NULL
;
cdoInitialize
(
argument
);
cdoInitialize
(
process
);
int
EQ
=
cdoOperatorAdd
(
"eq"
,
0
,
0
,
NULL
);
int
NE
=
cdoOperatorAdd
(
"ne"
,
0
,
0
,
NULL
);
...
...
src/Compc.cc
View file @
9e628e47
...
...
@@ -33,13 +33,13 @@
#include
"pstream.h"
void
*
Compc
(
void
*
argument
)
void
*
Compc
(
void
*
process
)
{
int
nrecs
;
int
varID
,
levelID
;
size_t
nmiss
;
cdoInitialize
(
argument
);
cdoInitialize
(
process
);
int
EQC
=
cdoOperatorAdd
(
"eqc"
,
0
,
0
,
NULL
);
int
NEC
=
cdoOperatorAdd
(
"nec"
,
0
,
0
,
NULL
);
...
...
Prev
1
2
3
4
5
…
10
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment