Index: trunk/LMDZ.VENUS/libf/phyvenus/flott_gwd_ran.F90
===================================================================
--- trunk/LMDZ.VENUS/libf/phyvenus/flott_gwd_ran.F90	(revision 2320)
+++ trunk/LMDZ.VENUS/libf/phyvenus/flott_gwd_ran.F90	(revision 2381)
@@ -15,4 +15,5 @@
 
       use dimphy
+      USE geometry_mod, only: cell_area, latitude_deg
       implicit none
 
@@ -57,4 +58,5 @@
     INTEGER JK, JP, JO, JW
     REAL KMIN, KMAX ! Min and Max horizontal wavenumbers
+    REAL KSTAR ! Min horizontal wavenumber constrained by resolution
     REAL CMIN, CMAX ! Min and Max absolute ph. vel.
     REAL CPHA ! absolute PHASE VELOCITY frequency
@@ -129,5 +131,7 @@
 
     !  PARAMETERS CORRESPONDING TO V3:
-    RUWMAX = 0.005      ! Max EP-Flux at Launch altitude
+    RUWMAX = 0.005      ! Max EP-Flux at Launch altitude (Nominal as Gilli2017)
+!    RUWMAX = 0.0025    ! Half-nominal 
+!    RUWMAX = 0.01       ! Double-nominal
     SAT    = 0.85       ! Saturation parameter: Sc in (12)
     RDISS  = 0.1        ! Diffusion parameter 
@@ -135,9 +139,28 @@
     DELTAT=24.*3600.    ! Time scale of the waves (first introduced in 9b)
 
-!!!! TEST GG Values corresponding to min/max horizontal wavel 50-500 km
-!(similar to observations)
-    KMIN = 1.E-5        ! Min horizontal wavenumber
-!    KMIN = 6.3E-6       ! Min horizontal wavenumber
-    KMAX = 1.E-4        ! Max horizontal wavenumber
+!!!! TESTS
+!    KMIN = 1.E-5         ! Min horizontal wavenumber    (lambda max 628)
+!    KMIN = 6.3E-6       ! Min horizontal wavenumber    (lambda max 1000 km)
+!    KMIN = 1.2E-6       ! Min horizontal wavenumber     (lambda max 5000 km)
+!    KMAX = 1.E-4        ! Max horizontal wavenumber     (lambda min 50 km)
+
+!!! TEST Kobs  and BestFit Diogo
+    KMIN = 1.E-5         ! Min horizontal wavenumber    (lambda max 628)
+    KMAX = 1.E-4        ! Max horizontal wavenumber     (lambda min 50 km)
+
+!!!  TEST GW8
+
+!    KMIN = 1.25E-5       ! Min horizontal wavenumber     (lambda max 500 km)
+!    KMAX = 1.E-4        ! Max horizontal wavenumber     (lambda min 50 km)
+
+!!!  TEST GW9
+
+!    KMIN = 1.E-6       ! Min horizontal wavenumber     (lambda max 6000 km)
+!    KMAX = 2.E-5       ! Max horizontal wavenumber     (lambda min 300 km)
+
+!!!  TEST BestFit GG
+!    KMIN = 6.3E-6       ! Min horizontal wavenumber    (lambda max 1000 km)
+!    KMAX = 1.E-4        ! Max horizontal wavenumber     (lambda min 50 km)
+
     !Online output: one value only
     if (output) then
@@ -145,8 +168,12 @@
       KMAX = 3E-5
     endif
+
+!!
     CMIN = 1.           ! Min phase velocity
-    CMAX = 61.          ! Max phase speed velocity
-!    XLAUNCH=0.6         ! Parameter that control launching altitude
-    XLAUNCH=5e-3        ! Value for top of cloud convective region
+    CMAX = 61.          ! Max phase speed velocity  TestGW6
+!     CMAX= 111.         ! TestGW2
+!    XLAUNCH=0.6        ! Parameter that control launching altitude
+     XLAUNCH=5e-3        ! Value for top of cloud convective region
+!    XLAUNCH=2.e-4         ! Value for ~ 70 km? Review this 
 
 !    PR = 9.2e6          ! Reference pressure    ! VENUS!!
@@ -246,5 +273,9 @@
                 ! Horizontal wavenumber amplitude
 !                ZK(JW, II) = KMIN + (KMAX - KMIN) * MOD(TT(II, JW) * 100., 1.)
-                ZK(JW, II) = KMIN + (KMAX - KMIN) * ALEAS(0.)
+                ! TN+GG April/June 2020 - "Individual waves are not supposed to occupy
+                ! the entire domain, but only a fraction of it" [Lott+2012]:
+                KSTAR = RPI/SQRT(cell_area(II))     ! KSTAR should be < KMAX...
+                ZK(JW, II) = MAX(KMIN,KSTAR) + (KMAX - MAX(KMIN,KSTAR)) * ALEAS(0.)
+!               ZK(JW, II) = KMIN + (KMAX - KMIN) * ALEAS(0.)
                 ! Horizontal phase speed
 !                CPHA = CMIN + (CMAX - CMIN) * MOD(TT(II, JW)**2, 1.)