Changeset 2160 for LMDZ5/branches/testing/libf/phylmd/YOEGWD.h

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/YOEGWD.h (modified) (2 diffs)

LMDZ5/branches/testing/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/