From a2bea14d36582cdcf4d92c0fcc748ad332c14dc6 Mon Sep 17 00:00:00 2001
From: Uwe Schulzweida <uwe.schulzweida@mpimet.mpg.de>
Date: Fri, 20 May 2022 11:24:00 +0200
Subject: [PATCH] julianDate_sub(): changed to jul1 - jul2.
---
src/julian_date.c | 10 +++++-----
src/stream_cgribex.c | 4 ++--
src/stream_gribapi.c | 4 ++--
src/taxis.c | 6 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/julian_date.c b/src/julian_date.c
index 2f1432c9e..23df04a77 100644
--- a/src/julian_date.c
+++ b/src/julian_date.c
@@ -205,21 +205,21 @@ JulianDate
julianDate_add(JulianDate julianDate1, JulianDate julianDate2)
{
JulianDate julianDate;
- julianDate.julianDay = julianDate2.julianDay + julianDate1.julianDay;
- julianDate.secondOfDay = julianDate2.secondOfDay + julianDate1.secondOfDay;
+ julianDate.julianDay = julianDate1.julianDay + julianDate2.julianDay;
+ julianDate.secondOfDay = julianDate1.secondOfDay + julianDate2.secondOfDay;
adjust_seconds(&julianDate);
return julianDate;
}
-// subtract julianDate1 from julianDate2
+// subtract julianDate2 from julianDate1
JulianDate
julianDate_sub(JulianDate julianDate1, JulianDate julianDate2)
{
JulianDate julianDate;
- julianDate.julianDay = julianDate2.julianDay - julianDate1.julianDay;
- julianDate.secondOfDay = julianDate2.secondOfDay - julianDate1.secondOfDay;
+ julianDate.julianDay = julianDate1.julianDay - julianDate2.julianDay;
+ julianDate.secondOfDay = julianDate1.secondOfDay - julianDate2.secondOfDay;
adjust_seconds(&julianDate);
diff --git a/src/stream_cgribex.c b/src/stream_cgribex.c
index 7d6bc256d..78c8703d2 100644
--- a/src/stream_cgribex.c
+++ b/src/stream_cgribex.c
@@ -1461,7 +1461,7 @@ cgribexDefTimerange(int tsteptype, int factor, int calendar, int rdate, int rtim
CdiDateTime vDateTime = cdiDateTime_set(vdate, vtime);
JulianDate julianDate2 = julianDate_encode(calendar, vDateTime);
- JulianDate julianDate = julianDate_sub(julianDate1, julianDate2);
+ JulianDate julianDate = julianDate_sub(julianDate2, julianDate1);
int timerange = -1;
int ip1 = 0, ip2 = 0;
@@ -1476,7 +1476,7 @@ cgribexDefTimerange(int tsteptype, int factor, int calendar, int rdate, int rtim
CdiDateTime sDateTime = cdiDateTime_set(sdate, stime);
julianDate2 = julianDate_encode(calendar, sDateTime);
- julianDate = julianDate_sub(julianDate1, julianDate2);
+ julianDate = julianDate_sub(julianDate2, julianDate1);
ipx = (int) lround(julianDate_to_seconds(julianDate) / factor);
}
diff --git a/src/stream_gribapi.c b/src/stream_gribapi.c
index 1dda511ef..f7a4e7586 100644
--- a/src/stream_gribapi.c
+++ b/src/stream_gribapi.c
@@ -2005,7 +2005,7 @@ gribapiDefDateTimeRel(int editionNumber, grib_handle *gh, int fdate, int ftime,
CdiDateTime vDateTime = cdiDateTime_set(vdate, vtime);
JulianDate julianDate2 = julianDate_encode(calendar, vDateTime);
- JulianDate julianDate = julianDate_sub(julianDate1, julianDate2);
+ JulianDate julianDate = julianDate_sub(julianDate2, julianDate1);
const int factor = getTimeunitFactor(timeunit);
@@ -2029,7 +2029,7 @@ gribapiDefDateTimeRel(int editionNumber, grib_handle *gh, int fdate, int ftime,
CdiDateTime sDateTime = cdiDateTime_set(sdate, stime);
julianDate2 = julianDate_encode(calendar, sDateTime);
- julianDate = julianDate_sub(julianDate1, julianDate2);
+ julianDate = julianDate_sub(julianDate2, julianDate1);
startStep = lround(julianDate_to_seconds(julianDate) / factor);
}
diff --git a/src/taxis.c b/src/taxis.c
index 61f06cdc0..835923438 100644
--- a/src/taxis.c
+++ b/src/taxis.c
@@ -1164,7 +1164,7 @@ datetime2rtimeval(CdiDateTime vdatetime, taxis_t *taxis)
vdatetime.date.year = year;
vdatetime.date.month = month;
const JulianDate julianDate2 = julianDate_encode(calendar, vdatetime);
- const JulianDate dateDifference = julianDate_sub(julianDate1, julianDate2);
+ const JulianDate dateDifference = julianDate_sub(julianDate2, julianDate1);
value += (dateDifference.julianDay + dateDifference.secondOfDay / 86400.0) / dpm;
if (timeunits == TUNIT_YEAR) value = value / 12;
@@ -1172,7 +1172,7 @@ datetime2rtimeval(CdiDateTime vdatetime, taxis_t *taxis)
else
{
const JulianDate julianDate2 = julianDate_encode(calendar, vdatetime);
- const JulianDate dateDifference = julianDate_sub(julianDate1, julianDate2);
+ const JulianDate dateDifference = julianDate_sub(julianDate2, julianDate1);
value = cdi_encode_timevalue(dateDifference.julianDay, dateDifference.secondOfDay, timeunits);
}
@@ -1352,7 +1352,7 @@ cdiSetForecastPeriod(double timevalue, taxis_t *taxis)
const JulianDate julianDate = julianDate_encode(calendar, vdatetime);
const JulianDate julianDate2 = timevalue_decode(timeunits, timevalue);
- const CdiDateTime dt = julianDate_decode(calendar, julianDate_sub(julianDate2, julianDate));
+ const CdiDateTime dt = julianDate_decode(calendar, julianDate_sub(julianDate, julianDate2));
(*taxis).fdate = (int)cdiDate_get(dt.date);
(*taxis).ftime = (int)cdiTime_get(dt.time);
--
GitLab