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
6a54683b
Commit
6a54683b
authored
Sep 06, 2010
by
Uwe Schulzweida
Browse files
renamed cdoOperatorFunc to cdoOperatorF1 and cdoOperatorIntval to cdoOperatorF2
parent
d2c807f1
Changes
45
Hide whitespace changes
Inline
Side-by-side
src/Arith.c
View file @
6a54683b
...
...
@@ -64,7 +64,7 @@ void *Arith(void *argument)
cdoOperatorAdd
(
"atan2"
,
func_atan2
,
0
,
NULL
);
operatorID
=
cdoOperatorID
();
operfunc
=
cdoOperatorF
unc
(
operatorID
);
operfunc
=
cdoOperatorF
1
(
operatorID
);
streamID1
=
streamOpenRead
(
cdoStreamName
(
0
));
if
(
streamID1
<
0
)
cdiError
(
streamID1
,
"Open failed on %s"
,
cdoStreamName
(
0
));
...
...
src/Arithc.c
View file @
6a54683b
...
...
@@ -54,7 +54,7 @@ void *Arithc(void *argument)
cdoOperatorAdd
(
"divc"
,
func_div
,
0
,
NULL
);
operatorID
=
cdoOperatorID
();
operfunc
=
cdoOperatorF
unc
(
operatorID
);
operfunc
=
cdoOperatorF
1
(
operatorID
);
operatorInputArg
(
"constant value"
);
rconst
=
atof
(
operatorArgv
()[
0
]);
...
...
src/Arithdays.c
View file @
6a54683b
...
...
@@ -57,8 +57,8 @@ void *Arithdays(void *argument)
cdoOperatorAdd
(
"divdpy"
,
func_div
,
func_year
,
NULL
);
operatorID
=
cdoOperatorID
();
operfunc
=
cdoOperatorF
unc
(
operatorID
);
operfunc2
=
cdoOperator
Intval
(
operatorID
);
operfunc
=
cdoOperatorF
1
(
operatorID
);
operfunc2
=
cdoOperator
F2
(
operatorID
);
streamID1
=
streamOpenRead
(
cdoStreamName
(
0
));
if
(
streamID1
<
0
)
cdiError
(
streamID1
,
"Open failed on %s"
,
cdoStreamName
(
0
));
...
...
src/Arithlat.c
View file @
6a54683b
...
...
@@ -57,7 +57,7 @@ void *Arithlat(void *argument)
cdoOperatorAdd
(
"divcoslat"
,
func_div
,
0
,
NULL
);
operatorID
=
cdoOperatorID
();
operfunc
=
cdoOperatorF
unc
(
operatorID
);
operfunc
=
cdoOperatorF
1
(
operatorID
);
streamID1
=
streamOpenRead
(
cdoStreamName
(
0
));
if
(
streamID1
<
0
)
cdiError
(
streamID1
,
"Open failed on %s"
,
cdoStreamName
(
0
));
...
...
src/EOFs.c
View file @
6a54683b
...
...
@@ -95,7 +95,7 @@ void *EOFs(void * argument)
cdoOperatorAdd
(
"eofspatial"
,
EOF_SPATIAL
,
0
,
NULL
);
operatorID
=
cdoOperatorID
();
operfunc
=
cdoOperatorF
unc
(
operatorID
);
operfunc
=
cdoOperatorF
1
(
operatorID
);
operatorInputArg
(
"Number of eigen functions to write out"
);
n_eig
=
atoi
(
operatorArgv
()[
0
]);
...
...
src/Echam5ini.c
View file @
6a54683b
...
...
@@ -1452,7 +1452,7 @@ void *Echam5ini(void *argument)
EXPORT_E5RES
=
cdoOperatorAdd
(
"export_e5res"
,
func_write
,
0
,
NULL
);
operatorID
=
cdoOperatorID
();
operfunc
=
cdoOperatorF
unc
(
operatorID
);
operfunc
=
cdoOperatorF
1
(
operatorID
);
if
(
operfunc
==
func_read
)
{
...
...
src/Ensstat.c
View file @
6a54683b
...
...
@@ -88,7 +88,7 @@ void *Ensstat(void *argument)
/* QR */
operatorID
=
cdoOperatorID
();
operfunc
=
cdoOperatorF
unc
(
operatorID
);
operfunc
=
cdoOperatorF
1
(
operatorID
);
/* RQ */
if
(
operfunc
==
func_pctl
)
...
...
src/Eofcoeff.c
View file @
6a54683b
...
...
@@ -54,7 +54,7 @@ void *Eofcoeff(void * argument)
cdoInitialize
(
argument
);
cdoOperatorAdd
(
"eofcoeff"
,
0
,
0
,
NULL
);
operatorID
=
cdoOperatorID
();
operfunc
=
cdoOperatorF
unc
(
operatorID
);
operfunc
=
cdoOperatorF
1
(
operatorID
);
streamID1
=
streamOpenRead
(
cdoStreamName
(
0
));
if
(
streamID1
<
0
)
cdiError
(
streamID1
,
"Open failed on %s"
,
cdoStreamName
(
0
));
...
...
src/Filter.c
View file @
6a54683b
...
...
@@ -176,7 +176,7 @@ void *Filter(void *argument)
cdoOperatorAdd
(
"lowpass"
,
LOW
,
0
,
NULL
);
operatorID
=
cdoOperatorID
();
operfunc
=
cdoOperatorF
unc
(
operatorID
);
operfunc
=
cdoOperatorF
1
(
operatorID
);
streamID1
=
streamOpenRead
(
cdoStreamName
(
0
));
if
(
streamID1
<
0
)
cdiError
(
streamID1
,
"Open failed on %s"
,
cdoStreamName
(
0
));
...
...
src/Fldstat.c
View file @
6a54683b
...
...
@@ -74,7 +74,7 @@ void *Fldstat(void *argument)
/* QR */
operatorID
=
cdoOperatorID
();
operfunc
=
cdoOperatorF
unc
(
operatorID
);
operfunc
=
cdoOperatorF
1
(
operatorID
);
/* RQ */
if
(
operfunc
==
func_pctl
)
...
...
src/Fldstat2.c
View file @
6a54683b
...
...
@@ -93,7 +93,7 @@ void *Fldstat2(void *argument)
cdoOperatorAdd
(
"fldcor"
,
0
,
0
,
NULL
);
operatorID
=
cdoOperatorID
();
operfunc
=
cdoOperatorF
unc
(
operatorID
);
operfunc
=
cdoOperatorF
1
(
operatorID
);
if
(
operfunc
==
func_mean
||
operfunc
==
func_avg
||
operfunc
==
func_var
||
operfunc
==
func_std
)
...
...
src/Gridboxstat.c
View file @
6a54683b
...
...
@@ -633,7 +633,7 @@ void *Gridboxstat(void *argument)
cdoOperatorAdd
(
"gridboxstd"
,
func_std
,
0
,
NULL
);
operatorID
=
cdoOperatorID
();
operfunc
=
cdoOperatorF
unc
(
operatorID
);
operfunc
=
cdoOperatorF
1
(
operatorID
);
if
(
operfunc
==
func_mean
||
operfunc
==
func_avg
||
operfunc
==
func_var
||
operfunc
==
func_std
)
...
...
src/Invert.c
View file @
6a54683b
...
...
@@ -314,7 +314,7 @@ void *Invert(void *argument)
INVERTLONDATA
=
cdoOperatorAdd
(
"invertlondata"
,
func_fld
,
0
,
NULL
);
operatorID
=
cdoOperatorID
();
operfunc1
=
cdoOperatorF
unc
(
operatorID
);
operfunc1
=
cdoOperatorF
1
(
operatorID
);
if
(
operatorID
==
INVERTLAT
||
operatorID
==
INVERTLATDES
||
operatorID
==
INVERTLATDATA
)
operfunc2
=
func_lat
;
else
...
...
src/Invertlev.c
View file @
6a54683b
...
...
@@ -130,7 +130,7 @@ void *Invertlev(void *argument)
INVERTLEV
=
cdoOperatorAdd
(
"invertlev"
,
func_all
,
0
,
NULL
);
operatorID
=
cdoOperatorID
();
operfunc
=
cdoOperatorF
unc
(
operatorID
);
operfunc
=
cdoOperatorF
1
(
operatorID
);
streamID1
=
streamOpenRead
(
cdoStreamName
(
0
));
if
(
streamID1
<
0
)
cdiError
(
streamID1
,
"Open failed on %s"
,
cdoStreamName
(
0
));
...
...
src/Log.c
View file @
6a54683b
...
...
@@ -44,8 +44,8 @@ void *Log(void *argument)
SPERCLOGO
=
cdoOperatorAdd
(
"sperclogo"
,
1
,
5
,
NULL
);
operatorID
=
cdoOperatorID
();
operfunc
=
cdoOperatorF
unc
(
operatorID
);
dumptype
=
cdoOperator
Intval
(
operatorID
);
operfunc
=
cdoOperatorF
1
(
operatorID
);
dumptype
=
cdoOperator
F2
(
operatorID
);
if
(
cdoStreamName
(
0
)[
0
]
==
'-'
)
cdoAbort
(
"This operator does not work with pipes!"
);
...
...
src/Math.c
View file @
6a54683b
...
...
@@ -80,7 +80,7 @@ void *Math(void *argument)
cdoOperatorAdd
(
"reci"
,
RECI
,
0
,
NULL
);
operatorID
=
cdoOperatorID
();
operfunc
=
cdoOperatorF
unc
(
operatorID
);
operfunc
=
cdoOperatorF
1
(
operatorID
);
if
(
operfunc
==
POW
)
{
...
...
src/Merstat.c
View file @
6a54683b
...
...
@@ -74,7 +74,7 @@ void *Merstat(void *argument)
/* QR */
operatorID
=
cdoOperatorID
();
operfunc
=
cdoOperatorF
unc
(
operatorID
);
operfunc
=
cdoOperatorF
1
(
operatorID
);
/* RQ */
if
(
operfunc
==
func_pctl
)
...
...
src/Monarith.c
View file @
6a54683b
...
...
@@ -57,7 +57,7 @@ void *Monarith(void *argument)
cdoOperatorAdd
(
"mondiv"
,
func_div
,
0
,
NULL
);
operatorID
=
cdoOperatorID
();
operfunc
=
cdoOperatorF
unc
(
operatorID
);
operfunc
=
cdoOperatorF
1
(
operatorID
);
streamID1
=
streamOpenRead
(
cdoStreamName
(
0
));
if
(
streamID1
<
0
)
cdiError
(
streamID1
,
"Open failed on %s"
,
cdoStreamName
(
0
));
...
...
src/Ninfo.c
View file @
6a54683b
...
...
@@ -58,7 +58,7 @@ void *Ninfo(void *argument)
cdoOperatorAdd
(
"nlevel"
,
NLEVEL
,
0
,
NULL
);
operatorID
=
cdoOperatorID
();
operfunc
=
cdoOperatorF
unc
(
operatorID
);
operfunc
=
cdoOperatorF
1
(
operatorID
);
streamID
=
streamOpenRead
(
cdoStreamName
(
0
));
if
(
streamID
<
0
)
cdiError
(
streamID
,
"Open failed on %s"
,
cdoStreamName
(
0
));
...
...
src/Remap.c
View file @
6a54683b
...
...
@@ -213,8 +213,8 @@ void *Remap(void *argument)
cdoOperatorAdd
(
"remap"
,
REMAPXXX
,
0
,
NULL
);
operatorID
=
cdoOperatorID
();
operfunc
=
cdoOperatorF
unc
(
operatorID
);
lwrite_remap
=
cdoOperator
Intval
(
operatorID
);
operfunc
=
cdoOperatorF
1
(
operatorID
);
lwrite_remap
=
cdoOperator
F2
(
operatorID
);
if
(
operfunc
==
REMAPDIS
||
operfunc
==
GENDIS
||
operfunc
==
REMAPNN
||
operfunc
==
GENNN
)
...
...
Prev
1
2
3
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