Changeset 2298 for LMDZ5/branches/testing/libf/phylmd/stdlevvar.F90

Timestamp:

Jun 14, 2015, 9:13:32 PM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2237:2291 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/stdlevvar.F90 (modified) (8 diffs)

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

@@ -4 +4 @@
       SUBROUTINE stdlevvar(klon, knon, nsrf, zxli, &
                            u1, v1, t1, q1, z1, &
-                           ts1, qsurf, rugos, psol, pat1, &
+                           ts1, qsurf, z0m, z0h, psol, pat1, &
                            t_2m, q_2m, t_10m, q_10m, u_10m, ustar)
       IMPLICIT NONE
@@ -32 +32 @@
 ! ts1-----input-R- temperature de l'air a la surface
 ! qsurf---input-R- humidite relative a la surface
-! rugos---input-R- rugosite
+! z0m, z0h---input-R- rugosite
 ! psol----input-R- pression au sol
 ! pat1----input-R- pression au 1er niveau du modele
@@ -47 +47 @@
       LOGICAL, intent(in) :: zxli
       REAL, dimension(klon), intent(in) :: u1, v1, t1, q1, z1, ts1
-      REAL, dimension(klon), intent(in) :: qsurf, rugos
+      REAL, dimension(klon), intent(in) :: qsurf, z0m, z0h
       REAL, dimension(klon), intent(in) :: psol, pat1
 !
@@ -103 +103 @@
 ! &                   cdram, cdrah, cdran, zri1, pref)            
 ! Fuxing WANG, 04/03/2015, replace the coefcdrag by the merged version: cdrag
+
       CALL cdrag(knon, nsrf, &
  &                   speed, t1, q1, z1, &
- &                   psol, ts1, qsurf, rugos, &
+ &                   psol, ts1, qsurf, z0m, z0h, &
  &                   cdram, cdrah, zri1, pref)
 
@@ -139 +140 @@
       zref = 2.0
       CALL screenp(klon, knon, nsrf, speed, tpot, q1, &
- &                 ts1, qsurf, rugos, lmon, &
+ &                 ts1, qsurf, z0m, lmon, &
  &                 ustar, testar, qstar, zref, &
  &                 delu, delte, delq)
@@ -160 +161 @@
         CALL screenc(klon, knon, nsrf, zxli, &
  &                   u_zref, temp, q_zref, zref, &
- &                   ts1, qsurf, rugos, psol, &           
+ &                   ts1, qsurf, z0m, z0h, psol, &           
  &                   ustar, testar, qstar, okri, ri1, &
  &                   pref, delu, delte, delq) 
@@ -241 +242 @@
       zref = 10.0
       CALL screenp(klon, knon, nsrf, speed, tpot, q1, &
- &                 ts1, qsurf, rugos, lmon, &
+ &                 ts1, qsurf, z0m, lmon, &
  &                 ustar, testar, qstar, zref, &
  &                 delu, delte, delq)
@@ -262 +263 @@
         CALL screenc(klon, knon, nsrf, zxli, &
  &                   u_zref, temp, q_zref, zref, &
- &                   ts1, qsurf, rugos, psol, &
+ &                   ts1, qsurf, z0m, z0h, psol, &
  &                   ustar, testar, qstar, okri, ri1, &
  &                   pref, delu, delte, delq)