From 0444e01d0529e049ab33178e2dd9f619a7d9a668 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Fri, 22 Feb 2019 10:32:38 +0100
Subject: [PATCH] Philippe 22/02/2019: use MOD intrinsics with same kind for
all arguments (to respect Fortran standard)
---
src/MNH/flash_geom_elec.f90 | 8 +++++---
src/MNH/mode_datetime.f90 | 7 +++++--
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/MNH/flash_geom_elec.f90 b/src/MNH/flash_geom_elec.f90
index e0b13e74f..cc467d1dd 100644
--- a/src/MNH/flash_geom_elec.f90
+++ b/src/MNH/flash_geom_elec.f90
@@ -2,6 +2,7 @@
!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
! #############################
MODULE MODI_FLASH_GEOM_ELEC_n
! #############################
@@ -91,8 +92,9 @@ END MODULE MODI_FLASH_GEOM_ELEC_n
!! J.Escobar : 20/06/2018 : Correction of computation of global index I8VECT
!! J.Escobar : 10/12/2018 : // Correction , mpi_bcast CG & CG_POS parameter
!! & initialize INBLIGHT on all proc for filling/saving AREA* arrays
-!! Philippe Wautelet: 10/01/2019: use NEWUNIT argument of OPEN
-!! Philippe Wautelet: 22/01/2019: use standard FLUSH statement instead of non standard intrinsics!!
+! P. Wautelet 10/01/2019: use NEWUNIT argument of OPEN
+! P. Wautelet 22/01/2019: use standard FLUSH statement instead of non standard intrinsics!!
+! P. Wautelet 22/02/2019: use MOD intrinsics with same kind for all arguments (to respect Fortran standard)
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -2191,7 +2193,7 @@ DO WHILE (IM .LE. IDELTA_IND .AND. ISTOP .NE. 1)
IF (IRANK_LL(IORDER_LL(ICHOICE)) .EQ. IPROC) THEN
JK = 1 + (I8VECT_LL(ICHOICE)-1) / ( IJU_ll*IIU_ll )
JJ = 1 + ( (I8VECT_LL(ICHOICE)-1) - IJU_ll*IIU_ll*(JK-1) ) / IIU_ll - IYOR +1
- JI = 1 + MOD((I8VECT_LL(ICHOICE)-1) , IIU_ll) - IXOR +1
+ JI = 1 + MOD((I8VECT_LL(ICHOICE)-1) , int(IIU_ll,kind(I8VECT_LL(1)))) - IXOR +1
!print*,"OUT => I8VECT_LL(ICHOICE)=",I8VECT_ll(ICHOICE),JI,JJ,JK,ICHOICE
ZFLASH(JI,JJ,JK,IL) = 2.
END IF
diff --git a/src/MNH/mode_datetime.f90 b/src/MNH/mode_datetime.f90
index a09557b78..2684e11d4 100644
--- a/src/MNH/mode_datetime.f90
+++ b/src/MNH/mode_datetime.f90
@@ -1,8 +1,11 @@
-!MNH_LIC Copyright 2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2018-2019 CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
+! Modifications:
+! P. Wautelet 22/02/2019: use MOD intrinsics with same kind for all arguments (to respect Fortran standard)
+!-----------------------------------------------------------------
MODULE MODE_DATETIME
!
USE MODD_TYPE_DATE
@@ -57,7 +60,7 @@ IDAY_CUR = TZDATE%TDATE%DAY
ZSEC = TZDATE%TIME
!
!Compute number of days since beginning of the year
-IF ( ((MOD(IYEAR_CUR,4)==0).AND.(MOD(IYEAR_CUR,100)/=0)) .OR. (MOD(IYEAR_CUR,400)==0)) ILEAPS=1
+IF ( ((MOD(IYEAR_CUR,4_8)==0).AND.(MOD(IYEAR_CUR,100_8)/=0)) .OR. (MOD(IYEAR_CUR,400_8)==0)) ILEAPS=1
SELECT CASE(IMONTH_CUR)
CASE(1)
IDAYS = IDAY_CUR-1
--
GitLab