Changeset 2571 for LMDZ5/trunk/libf/phylmd/surf_land_mod.F90

Timestamp:

Jun 14, 2016, 1:51:43 PM (8 years ago)

Author:

jghattas

Message:

Interface LMDZ/ORCHIDEE :

• copied previous default module surf_land_orchidee_mod.f90 into surf_land_orchidee_noz0h.f90. This interface can still be compiled if adding cpp key ORCHIDEE_NOZ0H
• modified default interface by adding z0h as output from ORCHIDEE.
• added comments in each module surf_land_orchidee_xxx of compatiblity with ORCHIDEE.
• all modules surf_land_orchidee_xxx now send back z0h and z0m to surf_land_mod. But note that z0m and zOh are different only in the new default version surf_land_orchidee_mod.f90. In the old interfaces, z0h is a copy of z0m.

cosp : some small changes to be able to compile with gfortran

File:

• LMDZ5/trunk/libf/phylmd/surf_land_mod.F90 (modified) (2 diffs)

LMDZ5/trunk/libf/phylmd/surf_land_mod.F90

@@ -24 +24 @@
     USE surface_data, ONLY    : ok_veget
 
+    ! See comments in each module surf_land_orchidee_xxx for compatiblity with ORCHIDEE
 #ifdef ORCHIDEE_NOOPENMP
+    ! Compilation with cpp key ORCHIDEE NOOPENMP
     USE surf_land_orchidee_noopenmp_mod
 #else
+#if ORCHIDEE_NOZ0H
+    ! Compilation with cpp key ORCHIDEE NOZ0H
+    USE surf_land_orchidee_noz0h_mod
+#else
+    ! Compilation with default interface
     USE surf_land_orchidee_mod
 #endif
+#endif
+
     USE surf_land_bucket_mod
     USE calcul_fluxs_mod
@@ -141 +150 @@
             evap, fluxsens, fluxlat, &              
             tsol_rad, tsurf_new, alb1_new, alb2_new, &
-            emis_new, z0m, qsurf)       
-        z0h(1:knon)=z0m(1:knon) ! En attendant mieux
+            emis_new, z0m, z0h, qsurf)       
 
 !