Changeset 2435 for LMDZ5/branches/testing/libf/phylmd/surf_land_orchidee_noopenmp_mod.F90

Timestamp:

Jan 28, 2016, 5:02:13 PM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2396:2434 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/surf_land_orchidee_noopenmp_mod.F90 (modified) (3 diffs)

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

@@ -5 +5 @@
 !
 ! This module is compiled only if CPP key ORCHIDEE_NOOPENMP is defined.
-! This module should be used with ORCHIDEE sequentiel or parallele MPI version (not MPI-OpenMP mixte)
+! This module should be used with ORCHIDEE sequentiel or parallele MPI version 
+! (not MPI-OpenMP mixte) until revision 1077 in the ORCHIDEE trunk.
 
 #ifdef ORCHIDEE_NOOPENMP
@@ -35 +36 @@
 !  
   SUBROUTINE surf_land_orchidee(itime, dtime, date0, knon, &
-       knindex, rlon, rlat, pctsrf, &
+       knindex, rlon, rlat, yrmu0, pctsrf, &
        debut, lafin, &
        plev,  u1_lay, v1_lay, temp_air, spechum, epot_air, ccanopy, & 
@@ -118 +119 @@
     REAL, DIMENSION(klon,nbsrf), INTENT(IN)   :: pctsrf
     REAL, DIMENSION(klon), INTENT(IN)         :: rlon, rlat
+    REAL, DIMENSION(klon), INTENT(IN)         :: yrmu0
     REAL, DIMENSION(klon), INTENT(IN)         :: plev
     REAL, DIMENSION(klon), INTENT(IN)         :: u1_lay, v1_lay