Changeset 2571 for LMDZ5/trunk/libf/phylmd/surf_land_orchidee_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_orchidee_mod.F90 (modified) (8 diffs)

LMDZ5/trunk/libf/phylmd/surf_land_orchidee_mod.F90

@@ -2 +2 @@
 MODULE surf_land_orchidee_mod
 #ifndef ORCHIDEE_NOOPENMP
+#ifndef ORCHIDEE_NOZ0H
 !
 ! This module controles the interface towards the model ORCHIDEE.
 !
 ! Compatibility with ORCHIDIEE :
-! The current version can be used with ORCHIDEE/trunk from revision 2961.
-! This interface can also be used with ORCHIDEE/trunk revision 1078-2960 if changing 
-! coszang=yrmu0 into sinang=yrmu0 at 2 places later below in this module. 
+! The current version can be used with ORCHIDEE/trunk from revision 3525.
+! This interface is used if none of the cpp keys ORCHIDEE_NOOPENMP or ORCHIDEE_NOZ0H is set.
 !
 ! Subroutines in this module : surf_land_orchidee
@@ -44 +44 @@
        evap, fluxsens, fluxlat, &              
        tsol_rad, tsurf_new, alb1_new, alb2_new, &
-       emis_new, z0_new, qsurf)
+       emis_new, z0m_new, z0h_new, qsurf)
 
     USE mod_surf_para
@@ -104 +104 @@
 !   alb2_new     albedo in near IR interval
 !   emis_new     emissivite
-!   z0_new       surface roughness
+!   z0m_new      surface roughness for momentum
+!   z0h_new      surface roughness for heat
 !   qsurf        air moisture at surface
 !
@@ -137 +138 @@
     REAL, DIMENSION(klon), INTENT(OUT)        :: tsol_rad, tsurf_new
     REAL, DIMENSION(klon), INTENT(OUT)        :: alb1_new, alb2_new
-    REAL, DIMENSION(klon), INTENT(OUT)        :: emis_new, z0_new
+    REAL, DIMENSION(klon), INTENT(OUT)        :: emis_new, z0m_new, z0h_new
 
 ! Local
@@ -403 +404 @@
 
 #ifdef CPP_VEGET
-          CALL intersurf_main (itime+itau_phy-1, nbp_lon, nbp_lat, knon, ktindex, dtime, &
-               lrestart_read, lrestart_write, lalo, &
-               contfrac, neighbours, resolution, date0, &
-               zlev,  u1_lay, v1_lay, spechum, temp_air, epot_air, ccanopy, &
+         CALL intersurf_initialize_gathered (itime+itau_phy-1, nbp_lon, nbp_lat, knon, ktindex, dtime, &
+               lrestart_read, lrestart_write, lalo, contfrac, neighbours, resolution, date0, &
+               zlev,  u1_lay, v1_lay, spechum, temp_air, epot_air, &
                cdrag, petA_orc, peqA_orc, petB_orc, peqB_orc, &
                precip_rain, precip_snow, lwdown, swnet, swdown, ps, &
                evap, fluxsens, fluxlat, coastalflow, riverflow, &
-               tsol_rad, tsurf_new, qsurf, albedo_out, emis_new, z0_new, &
-               lon_scat, lat_scat, q2m, t2m, coszang=yrmu0)
+               tsol_rad, tsurf_new, qsurf, albedo_out, emis_new, z0m_new, &
+               lon_scat, lat_scat, q2m, t2m, z0h_new)
 #endif         
        ENDIF
@@ -427 +427 @@
     IF (knon > 0) THEN
 #ifdef CPP_VEGET    
-       CALL intersurf_main (itime+itau_phy, nbp_lon, nbp_lat, knon, ktindex, dtime,  &
+       CALL intersurf_main_gathered (itime+itau_phy, nbp_lon, nbp_lat, knon, ktindex, dtime,  &
             lrestart_read, lrestart_write, lalo, &
             contfrac, neighbours, resolution, date0, &
@@ -434 +434 @@
             precip_rain(1:knon), precip_snow(1:knon), lwdown(1:knon), swnet(1:knon), swdown_vrai(1:knon), ps(1:knon), &
             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, q2m, t2m, coszang=yrmu0(1:knon))
+            tsol_rad(1:knon), tsurf_new(1:knon), qsurf(1:knon), albedo_out(1:knon,:), emis_new(1:knon), z0m_new(1:knon), &
+            lon_scat, lat_scat, q2m, t2m, z0h_new(1:knon), coszang=yrmu0(1:knon))
 #endif       
     ENDIF
@@ -664 +664 @@
 !
 #endif
+#endif
 END MODULE surf_land_orchidee_mod