Changeset 2410

Timestamp:

Dec 16, 2015, 9:10:00 AM (9 years ago)

Author:

jghattas

Message:

Added the variable yrmu0(cosine of the solar zenith angle) into ORCHIDEE:

Current version of LMDZ can now be used with ORCHIDEE trunk revisions from rev 2961 and newer. For revision 1078-2960 on ORCHIDEE trunk, a small modification (change coszang into sinang) in surf_land_orchidee_mod.f90 is needed. For older versions than ORCHIDEE trunk revision 1078, the interface in surf_land_orchidee_noopenmp_mod.f90 should be used (add cpp key ORCHIDEE_NOOPENMP).

For details see ticket ​https://forge.ipsl.jussieu.fr/orchidee/ticket/217

Location:

LMDZ5/trunk/libf/phylmd

Files:

• pbl_surface_mod.F90 (modified) (1 diff)
• surf_land_mod.F90 (modified) (3 diffs)
• surf_land_orchidee_mod.F90 (modified) (5 diffs)
• surf_land_orchidee_noopenmp_mod.F90 (modified) (3 diffs)

LMDZ5/trunk/libf/phylmd/pbl_surface_mod.F90

@@ -1734 +1734 @@
 !          print*,"DEBUGTS",yts(knon/2),ylwdown(knon/2)
           CALL surf_land(itap, dtime, date0, jour, knon, ni,&
-               rlon, rlat, &
+               rlon, rlat, yrmu0, &
                debut, lafin, ydelp(:,1), r_co2_ppm, ysolsw, ysollw, yalb, &
                yts, ypplay(:,1), ycdragh, ycdragm, yrain_f, ysnow_f, yt(:,1), yq(:,1),&

LMDZ5/trunk/libf/phylmd/surf_land_mod.F90

@@ -9 +9 @@
 !  
   SUBROUTINE surf_land(itime, dtime, date0, jour, knon, knindex, &
-       rlon, rlat, &
+       rlon, rlat, yrmu0, &
        debut, lafin, zlev, ccanopy, swnet, lwnet, albedo, &
        tsurf, p1lay, cdragh, cdragm, precip_rain, precip_snow, temp_air, spechum, &
@@ -45 +45 @@
     REAL, INTENT(IN)                        :: date0
     REAL, DIMENSION(klon), INTENT(IN)       :: rlon, rlat
+    REAL, DIMENSION(klon), INTENT(IN)       :: yrmu0  ! cosine of solar zenith angle
     LOGICAL, INTENT(IN)                     :: debut, lafin
     REAL, INTENT(IN)                        :: dtime
@@ -132 +133 @@
        ! temporary for keeping same results using lwdown_m instead of lwdown
        CALL surf_land_orchidee(itime, dtime, date0, knon, &
-            knindex, rlon, rlat, pctsrf, &
+            knindex, rlon, rlat, yrmu0, pctsrf, &
             debut, lafin, &
             zlev,  u1, v1, gustiness, temp_air, spechum, epot_air, ccanopy, & 

LMDZ5/trunk/libf/phylmd/surf_land_orchidee_mod.F90

@@ -3 +3 @@
 #ifndef ORCHIDEE_NOOPENMP
 !
-! This module controles the interface towards the model ORCHIDEE
+! 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. 
 !
 ! Subroutines in this module : surf_land_orchidee
@@ -31 +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, gustiness, temp_air, spechum, epot_air, ccanopy, & 
@@ -115 +120 @@
     REAL, DIMENSION(klon,nbsrf), INTENT(IN)   :: pctsrf
     REAL, DIMENSION(klon), INTENT(IN)         :: rlon, rlat
+    REAL, DIMENSION(klon), INTENT(IN)         :: yrmu0 ! cosine of solar zenith angle
     REAL, DIMENSION(klon), INTENT(IN)         :: plev
     REAL, DIMENSION(klon), INTENT(IN)         :: u1_lay, v1_lay, gustiness
@@ -405 +411 @@
                evap, fluxsens, fluxlat, coastalflow, riverflow, &
                tsol_rad, tsurf_new, qsurf, albedo_out, emis_new, z0_new, &
-               lon_scat, lat_scat, q2m, t2m)
+               lon_scat, lat_scat, q2m, t2m, coszang=yrmu0)
 #endif         
        ENDIF
@@ -429 +435 @@
             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)
+            lon_scat, lat_scat, q2m, t2m, coszang=yrmu0(1:knon))
 #endif       
     ENDIF

LMDZ5/trunk/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