Changeset 1146 for LMDZ4/trunk/libf/phylmd/surf_land_orchidee_mod.F90

Timestamp:

Apr 9, 2009, 12:11:35 PM (15 years ago)

Author:

Laurent Fairhead

Message:

Réintegration dans le tronc des modifications issues de la branche LMDZ-dev
comprises entre la révision 1074 et 1145
Validation: une simulation de 1 jour en séquentiel sur PC donne les mêmes
résultats entre la trunk et la dev
LF

Location:

LMDZ4/trunk

Files:

• . (modified) (1 prop)
• libf/phylmd/surf_land_orchidee_mod.F90 (modified) (7 diffs)

LMDZ4/trunk/libf/phylmd/surf_land_orchidee_mod.F90

@@ -1 +1 @@
 !
 MODULE surf_land_orchidee_mod
+#ifndef ORCHIDEE_NOOPENMP
 !
 ! This module controles the interface towards the model ORCHIDEE
@@ -35 +36 @@
        tq_cdrag, petAcoef, peqAcoef, petBcoef, peqBcoef, &
        precip_rain, precip_snow, lwdown, swnet, swdown, &
-       ps, &
+       ps, q2m, t2m, &
        evap, fluxsens, fluxlat, &              
        tsol_rad, tsurf_new, alb1_new, alb2_new, &
@@ -119 +120 @@
     REAL, DIMENSION(klon), INTENT(IN)         :: precip_rain, precip_snow
     REAL, DIMENSION(klon), INTENT(IN)         :: lwdown, swnet, swdown, ps
-    REAL, DIMENSION(klon)                     :: swdown_vrai
+    REAL, DIMENSION(klon), INTENT(IN)         :: q2m, t2m
 
 ! Parametres de sortie
@@ -132 +133 @@
     INTEGER                                   :: ij, jj, igrid, ireal, index
     INTEGER                                   :: error
+    REAL, DIMENSION(klon)                     :: swdown_vrai
     CHARACTER (len = 20)                      :: modname = 'surf_land_orchidee'
     CHARACTER (len = 80)                      :: abort_message
@@ -390 +392 @@
                evap, fluxsens, fluxlat, coastalflow, riverflow, &
                tsol_rad, tsurf_new, qsurf, albedo_out, emis_new, z0_new, &
-               lon_scat, lat_scat)
+               lon_scat, lat_scat, q2m, t2m)
 #endif         
        ENDIF
@@ -414 +416 @@
             evap(1:knon), fluxsens(1:knon), fluxlat(1:knon), coastalflow(1:knon), riverflow(1:knon), &
             tsol_rad(1:knon), tsurf_new(1:knon), qsurf(1:knon), albedo_out(1:knon,:), emis_new(1:knon), z0_new(1:knon), &
-            lon_scat, lat_scat)
+            lon_scat, lat_scat, q2m, t2m)
 #endif       
     ENDIF
@@ -632 +634 @@
 !****************************************************************************************
 !
-
+#endif
 END MODULE surf_land_orchidee_mod