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
7e801482
Commit
7e801482
authored
6 months ago
by
Fabian Wachsmann
Browse files
Options
Downloads
Patches
Plain Diff
Use rm=c
parent
971a32fe
No related branches found
Branches containing commit
Tags
cdo-1.9.4
Tags containing commit
1 merge request
!268
Etccdi fixes
Pipeline
#82601
failed
6 months ago
Stage: build
Stage: check
Changes
2
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Ydrunpctl.cc
+4
-5
4 additions, 5 deletions
src/Ydrunpctl.cc
src/Ydrunstat.cc
+5
-4
5 additions, 4 deletions
src/Ydrunstat.cc
with
9 additions
and
9 deletions
src/Ydrunpctl.cc
+
4
−
5
View file @
7e801482
...
...
@@ -141,7 +141,6 @@ public:
FieldVector
constFields
(
maxRecords
);
int
startYear
=
0
;
int
tsID
=
0
;
while
(
true
)
{
...
...
@@ -154,7 +153,7 @@ public:
auto
vDateTime
=
taxisInqVdatetime
(
taxisID2
);
if
(
cdiDateTime_isNE
(
vDateTime
,
taxisInqVdatetime
(
taxisID3
)))
if
(
decode_month_and_day
(
vDateTime
.
date
)
!=
decode_month_and_day
(
taxisInqVdatetime
(
taxisID3
)
.
date
))
cdo_abort
(
"Verification dates at time step %d of %s and %s differ!"
,
tsID
+
1
,
cdo_get_stream_name
(
1
),
cdo_get_stream_name
(
2
));
...
...
@@ -293,6 +292,7 @@ public:
auto
dayOfYear
=
decode_day_of_year
(
vDateTime
.
date
);
if
(
dayOfYear
<
0
||
dayOfYear
>=
MaxDays
)
cdo_abort
(
"Day %d out of range!"
,
dayOfYear
);
vDateTimes1
[
dayOfYear
]
=
vDateTime
;
numSets
[
dayOfYear
]
+=
numDates
;
...
...
@@ -345,9 +345,8 @@ public:
for
(
int
dayOfYear
=
0
;
dayOfYear
<
MaxDays
;
dayOfYear
++
)
if
(
numSets
[
dayOfYear
])
{
if
(
readMethod
!=
"c"
)
if
(
decode_month_and_day
(
vDateTimes1
[
dayOfYear
].
date
)
!=
decode_month_and_day
(
vDateTimes2
[
dayOfYear
].
date
))
cdo_abort
(
"Verification dates for day %d of %s and %s are different!"
,
dayOfYear
,
cdo_get_stream_name
(
0
),
if
(
decode_month_and_day
(
vDateTimes1
[
dayOfYear
].
date
)
!=
decode_month_and_day
(
vDateTimes2
[
dayOfYear
].
date
))
cdo_abort
(
"Verification dates for day %d of %s and %s are different!"
,
dayOfYear
,
cdo_get_stream_name
(
0
),
cdo_get_stream_name
(
1
));
taxisDefVdatetime
(
taxisID4
,
vDateTimes1
[
dayOfYear
]);
...
...
This diff is collapsed.
Click to expand it.
src/Ydrunstat.cc
+
5
−
4
View file @
7e801482
...
...
@@ -29,6 +29,8 @@
#include
"param_conversion.h"
#include
"datetime.h"
#include
"field_functions.h"
#include
"pmlist.h"
constexpr
int
MaxDays
=
373
;
...
...
@@ -172,20 +174,19 @@ public:
{
auto
operatorID
=
cdo_operator_id
();
operfunc
=
cdo_operator_f1
(
operatorID
);
std
::
string
readMethod
;
readMethod
=
'0'
;
operator_input_arg
(
"number of timesteps"
);
auto
numParams
=
cdo_operator_argc
();
numDates
=
parameter_to_int
(
cdo_operator_argv
(
0
));
if
(
cdo_operator_argc
()
>
1
)
if
(
numParams
>
1
)
{
auto
params
=
cdo_get_oper_argv
();
params
=
std
::
vector
<
std
::
string
>
(
params
.
begin
()
+
1
,
params
.
end
());
KVList
kvlist
;
if
(
kvlist
.
parse_arguments
(
params
)
!=
0
)
cdo_abort
(
"Argument parse error!"
);
kv
=
kvlist
.
search
(
"rm"
);
if
(
kv
&&
kv
->
nvalues
>
0
)
readMethod
=
parameter_to_word
(
kv
->
values
[
0
]);
auto
kv
=
kvlist
.
search
(
"rm"
);
if
(
kv
&&
kv
->
nvalues
>
0
)
readMethod
=
parameter_to_word
(
kv
->
values
[
0
])
[
0
]
;
}
auto
lminmax
=
(
operfunc
==
FieldFunc_Min
||
operfunc
==
FieldFunc_Max
);
...
...
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