Changeset 3411 for LMDZ6/branches/DYNAMICO-conv/libf/phylmd/acama_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/acama_gwd_rando_m.F90 (modified) (5 diffs)

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

@@ -20 +20 @@
     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"
@@ -114 +111 @@
     REAL BV(KLON, KLEV + 1) ! Brunt Vaisala freq. (BVF) at 1/2 levels
     REAL BVSEC ! Security to avoid negative BVF
-
-    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+4*(NA-1)+NA>=KLEV) THEN
-       abort_message = 'NW+3*NA>=KLEV Probleme pour generation des ondes'
-       CALL abort_physic (modname,abort_message,1)
-    ENDIF
-    firstcall=.false.
-!    CALL iophys_ini
-  ENDIF
 
     !-----------------------------------------------------------------
@@ -231 +205 @@
     ! Launching altitude
 
-    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
-
 
 !   PRINT *,'LAUNCH IN ACAMARA:',LAUNCH
@@ -333 +293 @@
 
     JW = 0
-    DO JW = 1, NW
+    DO JP = 1, NP
+       DO JK = 1, NK
+          DO JO = 1, NO
+             JW = JW + 1
              ! Angle
              DO II = 1, KLON
@@ -377 +340 @@
                 ! RUW0(JW, II) = RUWFRT
              ENDDO
+          end DO
+       end DO
     end DO