Changeset 2072 for LMDZ5/trunk/libf

Timestamp:

Jun 23, 2014, 4:53:24 PM (10 years ago)

Author:

lguez

Message:

Chose more specific variable names.

Location:

LMDZ5/trunk/libf/phylmd

Files:

• YOEGWD.h (modified) (2 diffs)
• conf_phys_m.F90 (modified) (4 diffs)
• flott_gwd_rando_m.F90 (modified) (2 diffs)

LMDZ5/trunk/libf/phylmd/YOEGWD.h

@@ -14 +14 @@
       real GHMAX,GRAHILO,GSIGCR,GSSEC,GTSEC,GVSEC
 
-      REAL RUWMAX
+      REAL GWD_RANDO_RUWMAX
 !     Maximum Eliassen-Palm flux at launch level, in "FLOTT_GWD_rando"
 
-      REAL SAT ! saturation parameter in "FLOTT_GWD_rando"
+      REAL GWD_RANDO_SAT ! saturation parameter in "FLOTT_GWD_rando"
 !     S_c in equation (12) of Lott (JGR, vol 118, page 8897, 2013)
 
@@ -23 +23 @@
       COMMON/YOEGWD/ GFRCRIT,GKWAKE,GRCRIT,GVCRIT,GKDRAG,GKLIFT,        &
      &     GHMAX,GRAHILO,GSIGCR,NKTOPG,NSTRA,GSSEC,GTSEC,GVSEC,         &
-     &     RUWMAX, sat
+     &     GWD_RANDO_RUWMAX, gwd_rando_sat
 
       save /YOEGWD/

LMDZ5/trunk/libf/phylmd/conf_phys_m.F90

@@ -186 +186 @@
     LOGICAL,SAVE :: ok_strato_omp
     LOGICAL,SAVE :: ok_hines_omp, ok_gwd_rando_omp
-    real, SAVE:: RUWMAX_omp, sat_omp
+    real, SAVE:: GWD_RANDO_RUWMAX_omp, gwd_rando_sat_omp
     LOGICAL,SAVE      :: carbon_cycle_tr_omp
     LOGICAL,SAVE      :: carbon_cycle_cpl_omp
@@ -1687 +1687 @@
     CALL getin('ok_gwd_rando', ok_gwd_rando_omp)
 
-    RUWMAX_omp = 0.01
-    CALL getin('ruwmax', RUWMAX_omp)
-
-    sat_omp = 0.25
-    CALL getin('sat', sat_omp)
+    GWD_RANDO_RUWMAX_omp = 0.01
+    CALL getin('gwd_rando_ruwmax', GWD_RANDO_RUWMAX_omp)
+
+    gwd_rando_sat_omp = 0.25
+    CALL getin('gwd_rando_sat', gwd_rando_sat_omp)
 
     !Config Key  = OK_LES                                               
@@ -1917 +1917 @@
     ok_hines = ok_hines_omp
     ok_gwd_rando = ok_gwd_rando_omp
-    RUWMAX = RUWMAX_omp
-    sat = sat_omp
+    GWD_RANDO_RUWMAX = GWD_RANDO_RUWMAX_omp
+    gwd_rando_sat = gwd_rando_sat_omp
     ok_LES = ok_LES_omp
     callstats = callstats_omp
@@ -2109 +2109 @@
     write(lunout,*) 'ok_hines = ',  ok_hines
     write(lunout,*) 'ok_gwd_rando = ',  ok_gwd_rando
-    write(lunout,*) 'RUWMAX = ', RUWMAX
-    write(lunout,*) 'sat = ', sat
+    write(lunout,*) 'GWD_RANDO_RUWMAX = ', GWD_RANDO_RUWMAX
+    write(lunout,*) 'gwd_rando_sat = ', gwd_rando_sat
     write(lunout,*) 'read_climoz = ', read_climoz
     write(lunout,*) 'carbon_cycle_tr = ', carbon_cycle_tr

LMDZ5/trunk/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