Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cdo
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mpim-sw
cdo
Commits
69f0374d
Commit
69f0374d
authored
1 year ago
by
Oliver Heidmann
Committed by
Uwe Schulzweida
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
fixed forgotten renames
parent
e6e1054e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!135
fixed unintended usage of operator f2 variable
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/EcaEtccdi.cc
+16
-16
16 additions, 16 deletions
src/EcaEtccdi.cc
with
16 additions
and
16 deletions
src/EcaEtccdi.cc
+
16
−
16
View file @
69f0374d
...
...
@@ -797,16 +797,16 @@ public:
if
(
cdo_operator_argc
()
<
3
)
cdo_abort
(
"Too few arguments!"
);
if
(
cdo_operator_argc
()
>
4
)
cdo_abort
(
"Too many arguments!"
);
int
TX90P
,
TX10P
,
TN90P
,
TN10P
,
R99P
,
R95P
;
TX90P
=
cdo_operator_add
(
"etccdi_tx90p"
,
func_selge
,
CMP_DATE
,
nullptr
);
R99P
=
cdo_operator_add
(
"etccdi_r99p"
,
func_selge
,
CMP_DATE
,
nullptr
);
R95P
=
cdo_operator_add
(
"etccdi_r95p"
,
func_selge
,
CMP_DATE
,
nullptr
);
TX10P
=
cdo_operator_add
(
"etccdi_tx10p"
,
func_selle
,
CMP_DATE
,
nullptr
);
TN90P
=
cdo_operator_add
(
"etccdi_tn90p"
,
func_selge
,
CMP_DATE
,
nullptr
);
TN10P
=
cdo_operator_add
(
"etccdi_tn10p"
,
func_selle
,
CMP_DATE
,
nullptr
);
int
ETCCDI_TX90P
,
ETCCDI_R99P
,
ETCCDI_R95P
,
ETCCDI_TX10P
,
ETCCDI_TN90P
,
ETCCDI_TN10P
;
ETCCDI_TX90P
=
cdo_operator_add
(
"etccdi_tx90p"
,
func_selge
,
CMP_DATE
,
nullptr
);
ETCCDI_R99P
=
cdo_operator_add
(
"etccdi_r99p"
,
func_selge
,
CMP_DATE
,
nullptr
);
ETCCDI_R95P
=
cdo_operator_add
(
"etccdi_r95p"
,
func_selge
,
CMP_DATE
,
nullptr
);
ETCCDI_TX10P
=
cdo_operator_add
(
"etccdi_tx10p"
,
func_selle
,
CMP_DATE
,
nullptr
);
ETCCDI_TN90P
=
cdo_operator_add
(
"etccdi_tn90p"
,
func_selge
,
CMP_DATE
,
nullptr
);
ETCCDI_TN10P
=
cdo_operator_add
(
"etccdi_tn10p"
,
func_selle
,
CMP_DATE
,
nullptr
);
cdo_operator_add
(
"etccdi"
,
0
,
CMP_DATE
,
nullptr
);
if
(
cdo_operator_argc
()
==
4
&&
'm'
==
cdo_operator_argv
(
3
)[
0
])
{
request
.
compare_type
=
CMP_YEAR
;
}
request
.
ndates
=
parameter_to_int
(
cdo_operator_argv
(
0
));
...
...
@@ -815,21 +815,21 @@ public:
const
auto
operatorID
=
cdo_operator_id
();
request
.
compare_type
=
cdo_operator_f2
(
cdo_operator_id
());
if
(
operatorID
==
TX90P
||
operatorID
==
TN90P
||
operatorID
==
R95P
||
operatorID
==
R99P
)
if
(
operatorID
==
ETCCDI_
TX90P
||
operatorID
==
ETCCDI_
TN90P
||
operatorID
==
ETCCDI_
R95P
||
operatorID
==
ETCCDI_
R99P
)
{
if
(
operatorID
==
TX90P
||
operatorID
==
TN90P
)
if
(
operatorID
==
ETCCDI_
TX90P
||
operatorID
==
ETCCDI_
TN90P
)
{
if
(
cdo_operator_argc
()
<
3
)
cdo_abort
(
"Operator requires at least 3 parameter values, you provided '%d'!"
,
cdo_operator_argc
());
request
.
endboot
=
parameter_to_int
(
cdo_operator_argv
(
2
));
if
(
operatorID
==
TX90P
)
if
(
operatorID
==
ETCCDI_
TX90P
)
{
request
.
name
=
TX90P_NAME
;
request
.
longname
=
TX90P_LONGNAME
;
request
.
units
=
TX90P_UNITS
;
request
.
func2
=
FieldFunc_Avg
;
}
else
if
(
operatorID
==
TN90P
)
else
if
(
operatorID
==
ETCCDI_
TN90P
)
{
request
.
name
=
TN90P_NAME
;
request
.
longname
=
TN90P_LONGNAME
;
...
...
@@ -845,7 +845,7 @@ public:
request
.
ndates
=
1
;
request
.
startboot
=
parameter_to_int
(
cdo_operator_argv
(
0
));
request
.
endboot
=
parameter_to_int
(
cdo_operator_argv
(
1
));
if
(
operatorID
==
R95P
)
if
(
operatorID
==
ETCCDI_
R95P
)
{
request
.
name
=
R95P_NAME
;
request
.
longname
=
R95P_LONGNAME
;
...
...
@@ -853,7 +853,7 @@ public:
request
.
pn
=
95
;
request
.
func2
=
FieldFunc_Sum
;
}
else
if
(
operatorID
==
R99P
)
else
if
(
operatorID
==
ETCCDI_
R99P
)
{
request
.
name
=
R99P_NAME
;
request
.
longname
=
R99P_LONGNAME
;
...
...
@@ -863,12 +863,12 @@ public:
}
}
}
else
if
(
operatorID
==
TX10P
||
operatorID
==
TN10P
)
else
if
(
operatorID
==
ETCCDI_
TX10P
||
operatorID
==
ETCCDI_
TN10P
)
{
if
(
cdo_operator_argc
()
<
3
)
cdo_abort
(
"Operator requires at least 3 parameter values, you provided '%d'!"
,
cdo_operator_argc
());
request
.
endboot
=
parameter_to_int
(
cdo_operator_argv
(
2
));
if
(
operatorID
==
TX10P
)
if
(
operatorID
==
ETCCDI_
TX10P
)
{
request
.
name
=
TX10P_NAME
;
request
.
longname
=
TX10P_LONGNAME
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment