Changeset 3411 for LMDZ6/branches/DYNAMICO-conv/libf/phylmd/flott_gwd_rando_m.F90

Timestamp:

Nov 5, 2018, 3:24:59 PM (6 years ago)

Author:

Laurent Fairhead

Message:

Undoing merge with trunk (r3356) to properly register Yann's latest modifications

Location:

LMDZ6/branches/DYNAMICO-conv

Files:

• . (modified) (1 prop)
• libf/phylmd/flott_gwd_rando_m.F90 (modified) (8 diffs)

LMDZ6/branches/DYNAMICO-conv/libf/phylmd/flott_gwd_rando_m.F90

@@ -18 +18 @@
       use dimphy, only: klon, klev
       use assert_m, only: assert
-      USE ioipsl_getin_p_mod, ONLY : getin_p
-      USE vertical_layers_mod, ONLY : presnivs
-
       include "YOMCST.h"
       include "clesphys.h"
@@ -106 +103 @@
     REAL PH(KLON, KLEV + 1) ! Pressure at 1/2 levels
     REAL PSEC ! Security to avoid division by 0 pressure
+    REAL PHM1(KLON, KLEV + 1) ! 1/Press at 1/2 levels
     REAL BV(KLON, KLEV + 1) ! Brunt Vaisala freq. (BVF) at 1/2 levels
     REAL BVSEC ! Security to avoid negative BVF
-    REAL RAN_NUM_1,RAN_NUM_2,RAN_NUM_3
-
-    REAL, DIMENSION(klev+1) ::HREF
-
-    LOGICAL, SAVE :: gwd_reproductibilite_mpiomp=.true.
-    LOGICAL, SAVE :: firstcall = .TRUE.
-  !$OMP THREADPRIVATE(firstcall,gwd_reproductibilite_mpiomp)
-
-    CHARACTER (LEN=20) :: modname='flott_gwd_rando'
-    CHARACTER (LEN=80) :: abort_message
-
-
-
-  IF (firstcall) THEN
-    ! Cle introduite pour resoudre un probleme de non reproductibilite
-    ! Le but est de pouvoir tester de revenir a la version precedenete
-    ! A eliminer rapidement
-    CALL getin_p('gwd_reproductibilite_mpiomp',gwd_reproductibilite_mpiomp)
-    IF (NW+3*NA>=KLEV) THEN
-       abort_message = 'NW+3*NA>=KLEV Probleme pour generation des ondes'
-       CALL abort_physic (modname,abort_message,1)
-    ENDIF
-    firstcall=.false.
-  ENDIF
-
 
     !-----------------------------------------------------------------
@@ -183 +156 @@
     ZOISEC = 1.E-6 ! Security FOR 0 INTRINSIC FREQ
 
-IF (1==0) THEN
     !ONLINE
         call assert(klon == (/size(pp, 1), size(tt, 1), size(uu, 1), &
@@ -195 +167 @@
           "FLOTT_GWD_RANDO klev")
     !END ONLINE
-ENDIF
 
     IF(DELTAT < DTIME)THEN
@@ -212 +183 @@
     DO LL = 2, KLEV
        PH(:, LL) = EXP((LOG(PP(:, LL)) + LOG(PP(:, LL - 1))) / 2.)
-    end DO
+       PHM1(:, LL) = 1. / PH(:, LL) 
+    end DO
+
     PH(:, KLEV + 1) = 0. 
+    PHM1(:, KLEV + 1) = 1. / PSEC
     PH(:, 1) = 2. * PP(:, 1) - PH(:, 2)
 
     ! Launching altitude
-
-    !Pour revenir a la version non reproductible en changeant le nombre de process
-    IF (gwd_reproductibilite_mpiomp) THEN
-       ! Reprend la formule qui calcule PH en fonction de PP=play
-       DO LL = 2, KLEV
-          HREF(LL) = EXP((LOG(presnivs(LL)) + LOG(presnivs(LL - 1))) / 2.)
-       end DO
-       HREF(KLEV + 1) = 0.
-       HREF(1) = 2. * presnivs(1) - HREF(2)
-    ELSE
-       HREF(1:KLEV)=PH(KLON/2,1:KLEV)
-    ENDIF
 
     LAUNCH=0
     LTROP =0
     DO LL = 1, KLEV
-       IF (HREF(LL) / HREF(1) > XLAUNCH) LAUNCH = LL
+       IF (PH(KLON / 2, LL) / PH(KLON / 2, 1) > XLAUNCH) LAUNCH = LL
     ENDDO
     DO LL = 1, KLEV
-       IF (HREF(LL) / HREF(1) > XTROP) LTROP = LL
+       IF (PH(KLON / 2, LL) / PH(KLON / 2, 1) > XTROP) LTROP = LL
     ENDDO
-    !LAUNCH=22 ; LTROP=33
-!   print*,'LAUNCH=',LAUNCH,'LTROP=',LTROP
 
     ! Log pressure vert. coordinate
@@ -285 +245 @@
     ! waves characteristics in an almost stochastic way
 
-    DO JW = 1, NW
+    JW = 0
+    DO JP = 1, NP
+       DO JK = 1, NK
+          DO JO = 1, NO
+             JW = JW + 1
              ! Angle
              DO II = 1, KLON
                 ! Angle (0 or PI so far)
-                RAN_NUM_1=MOD(TT(II, JW) * 10., 1.)
-                RAN_NUM_2= MOD(TT(II, JW) * 100., 1.)
-                ZP(JW, II) = (SIGN(1., 0.5 - RAN_NUM_1) + 1.) &
+                ZP(JW, II) = (SIGN(1., 0.5 - MOD(TT(II, JW) * 10., 1.)) + 1.) &
                      * RPI / 2.
                 ! Horizontal wavenumber amplitude
-                ZK(JW, II) = KMIN + (KMAX - KMIN) *RAN_NUM_2
+                ZK(JW, II) = KMIN + (KMAX - KMIN) * MOD(TT(II, JW) * 100., 1.)
                 ! Horizontal phase speed
                 CPHA = 0.
                 DO JJ = 1, NA
-                    RAN_NUM_3=MOD(TT(II, JW+3*JJ)**2, 1.)
                     CPHA = CPHA + &
-                    CMAX*2.*(RAN_NUM_3 -0.5)*SQRT(3.)/SQRT(NA*1.)
+         CMAX*2.*(MOD(TT(II, JW+3*JJ)**2, 1.)-0.5)*SQRT(3.)/SQRT(NA*1.)
                 END DO
                 IF (CPHA.LT.0.)  THEN
@@ -315 +276 @@
                 RUW0(JW, II) = RUWMAX
              ENDDO
-    ENDDO
+          end DO
+       end DO
+    end DO
 
     ! 4. COMPUTE THE FLUXES
@@ -454 +417 @@
     ENDDO
 
-
   END SUBROUTINE FLOTT_GWD_RANDO