From eeabeb9cd921df3d180bf50a862bc5cba63efe3a Mon Sep 17 00:00:00 2001
From: Florian Prill <florian.prill@dwd.de>
Date: Mon, 13 May 2019 16:22:55 +0200
Subject: [PATCH] somewhat more structured example output.
---
examples/example_hl.f90 | 87 +++++++++++++++++++++++++----------------
1 file changed, 53 insertions(+), 34 deletions(-)
diff --git a/examples/example_hl.f90 b/examples/example_hl.f90
index 2aaca9c3..af3d1d3d 100644
--- a/examples/example_hl.f90
+++ b/examples/example_hl.f90
@@ -18,6 +18,7 @@ PROGRAM example
WRITE (0,*) "example_hl : test example"
+ WRITE (0,*) " "
WRITE (0,*) " setting calendar."
CALL setCalendar(PROLEPTIC_GREGORIAN)
@@ -27,6 +28,7 @@ PROGRAM example
! CALL deallocateDatetime(dt)
! TYPE(t_datetime) :: dt
+ WRITE (0,*) " "
WRITE (0,*) " testing assignment of t_datetime."
dt = t_datetime("1970-01-01T00:00:00")
@@ -36,6 +38,7 @@ PROGRAM example
! CALL deallocateTimedelta(td)
! TYPE(t_timedelta) :: td
+ WRITE (0,*) " "
WRITE (0,*) " testing assignment of t_timedelta."
td = t_timedelta("PT1H1M1S")
@@ -43,71 +46,87 @@ PROGRAM example
! CALL timedeltaToString(td, dstring2)
! WRITE (0,*) "compute ", dstring1, " + ", dstring2
- WRITE (0,*) "compute ", dt%toString(), " + ", td%toString()
-
! Adding time intervals is unchanged:
-
+ WRITE (0,*) " "
+ WRITE (0,*) " adding time intervals."
+ WRITE (0,*) " compute ", dt%toString(), " + ", td%toString()
dt = dt + td
- WRITE (0,*) "result: ", dt%toString()
+ WRITE (0,*) " result: ", dt%toString()
! --- Further examples:
! subtraction of two dates
+ WRITE (0,*) " "
+ WRITE (0,*) " subtraction of two dates."
dt2 = t_datetime("1970-01-01T00:00:00")
td = dt-dt2
- WRITE (0,*) "subtraction of dates: time delta: ", td%toString()
+ WRITE (0,*) " subtraction of dates: time delta: ", td%toString()
! comparison of dates
+ WRITE (0,*) " "
+ WRITE (0,*) " comparison of dates."
dt = t_datetime("1970-01-01T00:00:00")
dt2 = t_datetime("1970-01-01T00:00:00")
- WRITE (0,*) dt%toString(), " == ", dt2%toString(), ": ", (dt == dt2)
+ WRITE (0,*) " ", dt%toString(), " == ", dt2%toString(), ": ", (dt == dt2)
dt3 = t_datetime("1970-01-01T00:00:01")
- WRITE (0,*) dt%toString(), " == ", dt3%toString(), ": ", (dt == dt3)
+ WRITE (0,*) " ", dt%toString(), " == ", dt3%toString(), ": ", (dt == dt3)
! min / max
+ WRITE (0,*) " "
+ WRITE (0,*) " min / max."
dt4 = min(dt2,dt3)
- WRITE (0,*) "MIN(", dt2%toString(), ", ", dt3%toString(), "): ", dt4%toString()
+ WRITE (0,*) " MIN(", dt2%toString(), ", ", dt3%toString(), "): ", dt4%toString()
dt4 = max(dt2,dt3)
- WRITE (0,*) "MAX(", dt2%toString(), ", ", dt3%toString(), "): ", dt4%toString()
+ WRITE (0,*) " MAX(", dt2%toString(), ", ", dt3%toString(), "): ", dt4%toString()
! interval assignment with milliseconds
td = t_timedeltaFromMilliseconds(360000)
- WRITE (0,*) "interval assignment with milliseconds: ", td%toString()
+ WRITE (0,*) " "
+ WRITE (0,*) " interval assignment with milliseconds"
+ WRITE (0,*) " interval assignment with milliseconds: ", td%toString()
+ WRITE (0,*) " "
+ WRITE (0,*) " factor multiplication."
td = t_timedelta("PT1H")
td = td*0.5_c_double
- WRITE (0,*) "PT1H * 0.5 = ", td%toString()
+ WRITE (0,*) " PT1H * 0.5 = ", td%toString()
td = t_timedelta("PT1H")
td = 0.5_c_double*td
- WRITE (0,*) "PT1H * 0.5 = ", td%toString()
+ WRITE (0,*) " PT1H * 0.5 = ", td%toString()
td = t_timedelta("PT1H")
td = td*2
- WRITE (0,*) "PT1H * 2 = ", td%toString()
+ WRITE (0,*) " PT1H * 2 = ", td%toString()
td = t_timedelta("PT1H")
td = 2*td
- WRITE (0,*) "PT1H * 2 = ", td%toString()
+ WRITE (0,*) " PT1H * 2 = ", td%toString()
! division
+ WRITE (0,*) " "
+ WRITE (0,*) " division."
td1 = t_timedelta("PT23H42M")
- dqts = td1%divideInSecondsBy(td,dt)
- WRITE (0,*) td1%toString(), " / ", td%toString(), " = ", dqts%quotient, " plus stuff"
+ dqts = td1%divideBy(td,dt)
+ WRITE (0,*) " ", td1%toString(), " / ", td%toString(), " = ", dqts%quotient, " plus stuff"
! toSeconds, toMilliSeconds
- WRITE (0,*) td%toString(), " is in seconds ", td%toSeconds(dt)
- WRITE (0,*) td%toString(), " is in milliseconds ", td%toMilliSeconds(dt)
+ WRITE (0,*) " "
+ WRITE (0,*) " toSeconds, toMilliSeconds."
+ WRITE (0,*) " ", td%toString(), " is in seconds ", td%toSeconds(dt)
+ WRITE (0,*) " ", td%toString(), " is in milliseconds ", td%toMilliSeconds(dt)
dt = t_datetime("1970-01-01T00:00:00")
jday = dt%toJulianDay()
dt2 = jday%toDateTime()
- print *, dt%toString(), " = ", dt2%toString()
+ WRITE (0,*) " ", dt%toString(), " = ", dt2%toString()
! register an error callback without stopping the application for
! our tests:
CALL register_finish_mtime_procedure(error_callback)
! produce errors
- WRITE (0,*) 'error test: dt = t_datetime("1970--01-01T00:00:00")'
+ WRITE (0,*) " "
+ WRITE (0,*) " produce errors"
+ WRITE (0,*) ' error test: dt = t_datetime("1970--01-01T00:00:00")'
lerror = .FALSE.
dt = t_datetime("1970--01-01T00:00:00")
IF (.NOT. lerror) WRITE(0,*) ERR_UNCAUGHT
@@ -120,58 +139,58 @@ PROGRAM example
! dt = dt5
! IF (.NOT. lerror) WRITE(0,*) ERR_UNCAUGHT
- WRITE (0,*) 'error test: dt5%toString()'
+ WRITE (0,*) ' error test: dt5%toString()'
lerror = .FALSE.
WRITE (0,*) dt5%toString()
IF (.NOT. lerror) WRITE(0,*) ERR_UNCAUGHT
- WRITE (0,*) 'error test: dt5%to_posix_string()'
+ WRITE (0,*) ' error test: dt5%to_posix_string()'
lerror = .FALSE.
WRITE (0,*) dt5%toString("%s%d%LK")
IF (.NOT. lerror) WRITE(0,*) ERR_UNCAUGHT
- WRITE (0,*) 'error test: dt = dt + td2'
+ WRITE (0,*) ' error test: dt = dt + td2'
lerror = .FALSE.
dt = dt + td2
IF (.NOT. lerror) WRITE(0,*) ERR_UNCAUGHT
- WRITE (0,*) 'error test: dt = dt - td2'
+ WRITE (0,*) ' error test: dt = dt - td2'
lerror = .FALSE.
dt = dt - td2
IF (.NOT. lerror) WRITE(0,*) ERR_UNCAUGHT
- WRITE (0,*) 'error test: dt = dt - td2'
+ WRITE (0,*) ' error test: dt = dt - td2'
lerror = .FALSE.
dt = dt - td2
IF (.NOT. lerror) WRITE(0,*) ERR_UNCAUGHT
- WRITE (0,*) 'error test: td = t_timedelta(...)'
+ WRITE (0,*) ' error test: td = t_timedelta(...)'
lerror = .FALSE.
td = t_timedelta("P1lK")
IF (.NOT. lerror) WRITE(0,*) ERR_UNCAUGHT
td = t_timedeltaFromMilliseconds(HUGE(INT(1)))
- WRITE (0,*) "t_timedeltaFromMilliseconds(HUGE(INT(1))) : HUGE(INT(1)) = ", HUGE(INT(1))
- WRITE (0,*) "td%toString() = ", td%toString()
+ WRITE (0,*) " t_timedeltaFromMilliseconds(HUGE(INT(1))) : HUGE(INT(1)) = ", HUGE(INT(1))
+ WRITE (0,*) " td%toString() = ", td%toString()
- WRITE (0,*) 'error test: td = td * 0.000001D0'
- WRITE (0,*) 'td%toString() = ', td%toString()
+ WRITE (0,*) ' error test: td = td * 0.000001D0'
+ WRITE (0,*) ' td%toString() = ', td%toString()
lerror = .FALSE.
td = td * 0.000001D0
IF (.NOT. lerror) WRITE(0,*) ERR_UNCAUGHT
! FIXME: This does no longer work, probably it initially worked for the wrong
! reasons?
- WRITE (0,*) 'error test: td2 = td2 * 1'
+ WRITE (0,*) ' error test: td2 = td2 * 1'
lerror = .FALSE.
td2 = td2 * 1
IF (.NOT. lerror) WRITE(0,*) ERR_UNCAUGHT
! FIXME: This does no longer work, probably it initially worked for the wrong
! reasons?
- WRITE (0,*) 'error test: td2%toString()'
+ WRITE (0,*) ' error test: td2%toString()'
lerror = .FALSE.
- WRITE (0,*) 'td2%toString() = ', td2%toString()
+ WRITE (0,*) ' td2%toString() = ', td2%toString()
IF (.NOT. lerror) WRITE(0,*) ERR_UNCAUGHT
! --------------------------------------------------------------------------------
@@ -179,7 +198,7 @@ PROGRAM example
c_sign = '+'
jd = t_juliandelta(sign=c_sign, day=99_c_int64_t, ms=123_c_int64_t)
- WRITE (0,*) "error test: jd = t_juliandelta(sign='r', day='99', ms='123')"
+ WRITE (0,*) " error test: jd = t_juliandelta(sign='r', day='99', ms='123')"
lerror = .FALSE.
c_sign = 'r'
jd = t_juliandelta(sign=c_sign, day=99_c_int64_t, ms=123_c_int64_t)
--
GitLab