Changeset 799 for LMDZ4/trunk/libf/phylmd

Timestamp:

Jun 27, 2007, 12:05:32 PM (17 years ago)

Author:

Laurent Fairhead

Message:

Rajoute la possibilite d'utiliser l'ancienne interface d'ORCHIDEE selon que
la cle CPP ORC_PREPAR est definie (interface pre orchidee_1_9) ou non
(interface post orchide_1_9).
LF

File:

• LMDZ4/trunk/libf/phylmd/surf_land_orchidee_mod.F90 (modified) (4 diffs)

LMDZ4/trunk/libf/phylmd/surf_land_orchidee_mod.F90

@@ -366 +366 @@
        IF (knon /=0) THEN
           CALL Init_orchidee_index(knon,orch_comm,knindex,offset,ktindex)
-          
+#define ORC_PREPAR
+#ifdef ORC_PREPAR
+          call intersurf_main (itime+itau_phy-1, iim, jjm+1, knon, ktindex, dtime, &
+     & lrestart_read, lrestart_write, lalo, &
+     & contfrac, neighbours, resolution, date0, &
+     & zlev,  u1_lay, v1_lay, spechum, temp_air, epot_air, ccanopy, &
+     & 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)
+
+#else          
           CALL intersurf_main (itime+itau_phy-1, iim, jjm+1, offset, knon, ktindex, & 
                orch_comm, dtime, lrestart_read, lrestart_write, lalo, &
@@ -376 +388 @@
                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)
+#endif
           
        ENDIF
@@ -388 +401 @@
     IF (knon /=0) THEN
     
+#ifdef ORC_PREPAR
+          call intersurf_main (itime+itau_phy-1, iim, jjm+1, knon, ktindex, dtime, &
+     & lrestart_read, lrestart_write, lalo, &
+     & contfrac, neighbours, resolution, date0, &
+     & zlev,  u1_lay, v1_lay, spechum, temp_air, epot_air, ccanopy, &
+     & 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)
+
+#else
+
        CALL intersurf_main (itime+itau_phy, iim, jjm+1,offset, knon, ktindex, & 
             orch_comm,dtime, lrestart_read, lrestart_write, lalo, &
@@ -397 +423 @@
             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)
+#endif
        
     ENDIF