Changeset 2408 for LMDZ5/branches/testing/libf/phylmd/yamada4.F90

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/yamada4.F90 (modified) (4 diffs)

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

@@ -5 +5 @@
     cd, q2, km, kn, kq, ustar, iflag_pbl)
   USE dimphy
+  USE print_control_mod, ONLY: prt_level
   IMPLICIT NONE
-  include "iniprint.h"
-  ! .......................................................................
-  ! ym#include "dimensions.h"
-  ! ym#include "dimphy.h"
-  ! .......................................................................
 
   ! dt : pas de temps
@@ -344 +340 @@
     ! print*,'Longueur ',l(:,:)
     DO k = 2, klev - 1
-      l(:, k) = max(l(:,k), 1.)
-      km(:, k) = l(:, k)*sqrt(q2(:,k))*sm(:, k)
-      q2(:, k) = q2(:, k) + dt*km(:, k)*m2(:, k)*(1.-rif(:,k))
-      q2(:, k) = min(max(q2(:,k),1.E-10), 1.E4)
-      q2(:, k) = 1./(1./sqrt(q2(:,k))+dt/(2*l(:,k)*b1))
-      q2(:, k) = q2(:, k)*q2(:, k)
+      DO ig = 1, ngrid
+        l(ig, k) = max(l(ig,k), 1.)
+        km(ig, k) = l(ig, k)*sqrt(q2(ig,k))*sm(ig, k)
+        q2(ig, k) = q2(ig, k) + dt*km(ig, k)*m2(ig, k)*(1.-rif(ig,k))
+        q2(ig, k) = min(max(q2(ig,k),1.E-10), 1.E4)
+        q2(ig, k) = 1./(1./sqrt(q2(ig,k))+dt/(2*l(ig,k)*b1))
+        q2(ig, k) = q2(ig, k)*q2(ig, k)
+      END DO
     END DO
 
@@ -496 +494 @@
   USE dimphy
   IMPLICIT NONE
-  ! .......................................................................
-  include "dimensions.h"
-  ! ccc#include "dimphy.h"
-  ! .......................................................................
 
   ! dt : pas de temps
@@ -572 +566 @@
   USE dimphy
   IMPLICIT NONE
-  ! .......................................................................
-  include "dimensions.h"
-  ! ccc#include "dimphy.h"
-  ! .......................................................................
 
   ! dt : pas de temps