Skip to content
Snippets Groups Projects

Etccdi fixes

Merged Fabian Wachsmann requested to merge etccdi-fixes into develop
2 files
+ 9
9
Compare changes
  • Side-by-side
  • Inline
Files
2
+ 4
5
@@ -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]);
Loading