Changeset 818 for LMDZ4/trunk/libf/phylmd

Timestamp:

Jul 18, 2007, 3:00:51 PM (17 years ago)

Author:

lsce

Message:

AC + JG : Probleme dans l'interfacage avec Orchidee en sequentiel

• 2 variables erronees
• Commentaires actualises

File:

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

LMDZ4/trunk/libf/phylmd/surf_land_orchidee_mod.F90

@@ -371 +371 @@
 #endif
 #ifdef ORC_PREPAR
-          ! Interface for version 1.8 or earlier of ORCHIDEE
+          ! Interface for ORCHIDEE version 1.9 or earlier compiled in sequential mode(without preprocessing flag CPP_PARA)
           CALL intersurf_main (itime+itau_phy-1, iim, jjm+1, knon, ktindex, dtime, &
                lrestart_read, lrestart_write, lalo, &
@@ -383 +383 @@
 
 #else          
+          ! Interface for ORCHIDEE version 1.9 compiled in parallel mode(with preprocessing flag CPP_PARA)
           CALL intersurf_main (itime+itau_phy-1, iim, jjm+1, offset, knon, ktindex, & 
                orch_comm, dtime, lrestart_read, lrestart_write, lalo, &
@@ -406 +407 @@
     
 #ifdef ORC_PREPAR
-       ! Interface for version 1.8 or earlier of ORCHIDEE
-       CALL intersurf_main (itime+itau_phy-1, iim, jjm+1, knon, ktindex, dtime, &
+       ! Interface for ORCHIDEE version 1.9 or earlier compiled in sequential mode(without preprocessing flag CPP_PARA)
+       CALL intersurf_main (itime+itau_phy, 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, &
+            precip_rain, precip_snow, lwdown, swnet, swdown_vrai, ps, &
             evap, fluxsens, fluxlat, coastalflow, riverflow, &
             tsol_rad, tsurf_new, qsurf, albedo_out, emis_new, z0_new, &
@@ -418 +419 @@
        
 #else
-
+       ! Interface for ORCHIDEE version 1.9 compiled in parallel mode(with preprocessing flag CPP_PARA)
        CALL intersurf_main (itime+itau_phy, iim, jjm+1,offset, knon, ktindex, & 
             orch_comm,dtime, lrestart_read, lrestart_write, lalo, &