From d903a9da22e670e13e45c3dee116d69c79e60d94 Mon Sep 17 00:00:00 2001 From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr> Date: Thu, 27 Oct 2022 17:03:02 +0200 Subject: [PATCH] Philippe 27/10/2022: datetime: add - operator via DATETIME_TIME_SUBSTRACT subroutine --- src/MNH/mode_datetime.f90 | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/src/MNH/mode_datetime.f90 b/src/MNH/mode_datetime.f90 index 2ccc4700b..07e9c816b 100644 --- a/src/MNH/mode_datetime.f90 +++ b/src/MNH/mode_datetime.f90 @@ -7,7 +7,7 @@ ! P. Wautelet 22/02/2019: use MOD intrinsics with same kind for all arguments (to respect Fortran standard) ! P. Wautelet 19/04/2019: use modd_precision kinds ! P. Wautelet 20/07/2021: modify DATETIME_TIME2REFERENCE and DATETIME_DISTANCE to allow correct computation with 32-bit floats -! P. Wautelet 27/10/2022: add +, <= and > operators and improve older comparison subroutines (more robust but slower) +! P. Wautelet 27/10/2022: add +, -, <= and > operators and improve older comparison subroutines (more robust but slower) !----------------------------------------------------------------- MODULE MODE_DATETIME ! @@ -25,6 +25,7 @@ PUBLIC :: OPERATOR(<=) PUBLIC :: OPERATOR(>) PUBLIC :: OPERATOR(>=) PUBLIC :: OPERATOR(+) +PUBLIC :: OPERATOR(-) ! !Reference date (do not change it) !To work with DATETIME_TIME2REFERENCE, we assume the year is a multiple of 400 + 1 and the date is January 1st (and time=0.) @@ -50,6 +51,10 @@ INTERFACE OPERATOR(+) MODULE PROCEDURE DATETIME_TIME_ADD END INTERFACE ! +INTERFACE OPERATOR(-) + MODULE PROCEDURE DATETIME_TIME_SUBSTRACT +END INTERFACE +! CONTAINS ! SUBROUTINE DATETIME_TIME2REFERENCE( TPDATE, KDAYS, PSEC ) @@ -405,4 +410,20 @@ CALL DATETIME_CORRECTDATE( TPOUT ) END FUNCTION DATETIME_TIME_ADD + +FUNCTION DATETIME_TIME_SUBSTRACT( TPT1, TPT2 ) RESULT( PDIST ) +! +!Compute distance (in seconds) between 2 dates +! + +IMPLICIT NONE + +TYPE(DATE_TIME), INTENT(IN) :: TPT1 +TYPE(DATE_TIME), INTENT(IN) :: TPT2 +REAL :: PDIST + +CALL DATETIME_DISTANCE( TPT2, TPT1, PDIST ) + +END FUNCTION DATETIME_TIME_SUBSTRACT + END MODULE MODE_DATETIME -- GitLab