Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpim-sw
libcdi
Commits
775af42d
Commit
775af42d
authored
Feb 01, 2019
by
Uwe Schulzweida
Browse files
taxisCopyTimestep: don't copy rdate/rtime (bug fix)
parent
93176a17
Changes
3
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
775af42d
...
...
@@ -4,6 +4,10 @@
* using EXSE library version 1.4.1
* Version 1.9.6 released
2019-02-01 Uwe Schulzweida
* taxisCopyTimestep: don't copy rdate/rtime (bug fix)
2019-01-26 Uwe Schulzweida
* ecCodes: deleteLocalDefinition for GRIB1.tmpl
...
...
src/stream_cdf_time.c
View file @
775af42d
...
...
@@ -82,7 +82,7 @@ void cdfDefTimeUnits(char *unitstr, taxis_t *taxis)
cdiDecodeDate
(
taxis
->
rdate
,
&
year
,
&
month
,
&
day
);
cdiDecodeTime
(
taxis
->
rtime
,
&
hour
,
&
minute
,
&
second
);
int
timeunit
=
taxis
->
unit
!=
-
1
?
taxis
->
unit
:
TUNIT_HOUR
;
int
timeunit
=
(
taxis
->
unit
!=
-
1
)
?
taxis
->
unit
:
TUNIT_HOUR
;
if
(
timeunit
==
TUNIT_QUARTER
)
timeunit
=
TUNIT_MINUTE
;
else
if
(
timeunit
==
TUNIT_30MINUTES
)
timeunit
=
TUNIT_MINUTE
;
else
if
(
timeunit
==
TUNIT_3HOURS
...
...
src/taxis.c
View file @
775af42d
...
...
@@ -594,6 +594,7 @@ void taxisCopyTimestep(int taxisID2, int taxisID1)
reshLock
();
/* reference date/time and units can't be changed after streamDefVlist().
if (taxisptr2->units && taxisptr2->rdate != CDI_UNDEFID)
{
if (taxisptr2->rdate != taxisptr1->rdate || taxisptr2->rtime != taxisptr1->rtime)
...
...
@@ -605,7 +606,7 @@ void taxisCopyTimestep(int taxisID2, int taxisID1)
taxisptr2->rdate = taxisptr1->rdate;
taxisptr2->rtime = taxisptr1->rtime;
*/
taxisptr2
->
vdate
=
taxisptr1
->
vdate
;
taxisptr2
->
vtime
=
taxisptr1
->
vtime
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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