Changeset 2731 for LMDZ5/trunk

Timestamp:

Dec 14, 2016, 8:30:27 PM (8 years ago)

Author:

jyg

Message:

Test to guarantee that dtime (in seconds) is an
integer.

File:

• LMDZ5/trunk/libf/phylmd/physiq_mod.F90 (modified) (3 diffs)

LMDZ5/trunk/libf/phylmd/physiq_mod.F90

@@ -1303 +1303 @@
        ! Il se peut qu'il faille prendre une valeur differente de nbapp_rad
        ! pour obtenir le meme resultat.
-       dtime=pdtphys
-       IF (MOD(INT(86400./dtime),nbapp_rad).EQ.0) THEN
-          radpas = NINT( 86400./dtime/nbapp_rad)
+!jyg for fh<
+!!       dtime=pdtphys
+       dtime=NINT(pdtphys)
+       WRITE(lunout,*) 'Pas de temps dtime pdtphys ',dtime,pdtphys
+       IF (abs(dtime-pdtphys)>1.e-10) THEN
+          abort_message='pas de temps doit etre entier en seconde pour orchidee et XIOS'
+          CALL abort_physic(modname,abort_message,1)
+       ENDIF
+!>jyg
+       IF (MOD(NINT(86400./dtime),nbapp_rad).EQ.0) THEN
+          radpas = NINT( 86400./dtime)/nbapp_rad
        ELSE 
           WRITE(lunout,*) 'le nombre de pas de temps physique doit etre un ', &
@@ -1318 +1326 @@
        IF (nbapp_wk .EQ. 0) nbapp_wk=86400./dtime
        print *,'physiq, nbapp_cv, nbapp_wk ',nbapp_cv,nbapp_wk
-       IF (MOD(INT(86400./dtime),nbapp_cv).EQ.0) THEN
-          cvpas = NINT( 86400./dtime/nbapp_cv)
+       IF (MOD(NINT(86400./dtime),nbapp_cv).EQ.0) THEN
+          cvpas = NINT( 86400./dtime)/nbapp_cv
        print *,'physiq, cvpas ',cvpas
        ELSE 
@@ -1330 +1338 @@
           call abort_physic(modname,abort_message,1)
        ENDIF
-       IF (MOD(INT(86400./dtime),nbapp_wk).EQ.0) THEN
-          wkpas = NINT( 86400./dtime/nbapp_wk)
+       IF (MOD(NINT(86400./dtime),nbapp_wk).EQ.0) THEN
+          wkpas = NINT( 86400./dtime)/nbapp_wk
        print *,'physiq, wkpas ',wkpas
        ELSE