Changeset 2924 for LMDZ5/branches/LMDZ_tree_FC/libf/phylmd/surf_land_mod.F90

Timestamp:

Jun 30, 2017, 12:00:23 PM (7 years ago)

Author:

fcheruy

Message:

Creation of LMDZ branch to incorporate tree drag from ORCHIDEE.
Should merge in LMDZ trunk quickly

6. Cheruy with assistance from LF

Location:

LMDZ5/branches/LMDZ_tree_FC

Files:

• . (copied) (copied from LMDZ5/trunk)
• libf/phylmd/surf_land_mod.F90 (modified) (7 diffs)

LMDZ5/branches/LMDZ_tree_FC/libf/phylmd/surf_land_mod.F90

@@ -1 +1 @@
 !
 MODULE surf_land_mod
-  
+#ifndef LMDZ_nofrein
+
   IMPLICIT NONE
 
@@ -19 +20 @@
        z0m, z0h, SFRWL, alb_dir_new, alb_dif_new, evap, fluxsens, fluxlat, &   
        qsurf, tsurf_new, dflux_s, dflux_l, &
-       flux_u1, flux_v1 ) 
+       flux_u1, flux_v1 , & 
+       veget,lai,height)
+
+!FCveget,lai,height, &
 
     USE dimphy
@@ -33 +37 @@
     USE surf_land_orchidee_noz0h_mod
 #else
-    ! Compilation with default interface
+#if ORCHIDEE_NOFREIN
+    ! Compilation with cpp key ORCHIDEE_NOFREIN
+    USE surf_land_orchidee_nofrein_mod
+#else
     USE surf_land_orchidee_mod
+#endif
 #endif
 #endif
@@ -47 +55 @@
     INCLUDE "clesphys.h"
 !albedo SB <<<
+!FC 
+   INCLUDE "dimpft.h"
+
 
 ! Input variables  
@@ -96 +107 @@
     REAL, DIMENSION(klon), INTENT(OUT)       :: dflux_s, dflux_l      
     REAL, DIMENSION(klon), INTENT(OUT)       :: flux_u1, flux_v1  ! flux for U and V at first model level
+!FC
+    REAL, DIMENSION(klon,nvm_lmdz), INTENT(OUT)       :: veget,lai
+    REAL, DIMENSION(klon,nvm_lmdz), INTENT(OUT)            :: height
 
 ! Local variables
@@ -150 +164 @@
             evap, fluxsens, fluxlat, &              
             tsol_rad, tsurf_new, alb1_new, alb2_new, &
-            emis_new, z0m, z0h, qsurf)       
+            emis_new, z0m, z0h, qsurf, &
+            veget, lai, height)       
+
+!    print*, " FC SORTIE surf_land_orchidee" ,height(1:100,2)
+!FC
+
 
 !  
@@ -217 +236 @@
 !****************************************************************************************
 !  
+#endif
 END MODULE surf_land_mod
 !