Changeset 2160 for LMDZ5/branches/testing/libf/phylmd/flott_gwd_rando_m.F90

Timestamp:

Nov 28, 2014, 4:36:29 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2070:2158 into testing branch. Compilation problems introduced by revision r2155 have been corrected by hand

Location:

LMDZ5/branches/testing

Files:

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

LMDZ5/branches/testing/libf/phylmd/flott_gwd_rando_m.F90

@@ -238 +238 @@
                      + ZK(JW, II) * SIN(ZP(JW, II)) * VH(II, LAUNCH)
                 ! Momentum flux at launch lev 
-                RUW0(JW, II) = RUWMAX
+                RUW0(JW, II) = GWD_RANDO_RUWMAX
              ENDDO
           end DO
@@ -318 +318 @@
           WWP(JW, :) = min(WWP(JW, :), MAX(0., &
                SIGN(1., ZOP(JW, :) * ZOM(JW, :))) * ABS(ZOP(JW, :))**3 &
-               / BV(:, LL + 1) * EXP(- ZH(:, LL + 1) / H0) * SAT**2 * KMIN**2 &
-               / ZK(JW, :)**4)
+               / BV(:, LL + 1) * EXP(- ZH(:, LL + 1) / H0) * GWD_RANDO_SAT**2 &
+               * KMIN**2 / ZK(JW, :)**4)
        end DO