Changeset 799 for LMDZ4/trunk


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • LMDZ4/trunk/libf/phylmd/surf_land_orchidee_mod.F90

    r793 r799  
    366366       IF (knon /=0) THEN
    367367          CALL Init_orchidee_index(knon,orch_comm,knindex,offset,ktindex)
    368          
     368#define ORC_PREPAR
     369#ifdef ORC_PREPAR
     370          call intersurf_main (itime+itau_phy-1, iim, jjm+1, knon, ktindex, dtime, &
     371     & lrestart_read, lrestart_write, lalo, &
     372     & contfrac, neighbours, resolution, date0, &
     373     & zlev,  u1_lay, v1_lay, spechum, temp_air, epot_air, ccanopy, &
     374     & cdrag, petA_orc, peqA_orc, petB_orc, peqB_orc, &
     375     & precip_rain, precip_snow, lwdown, swnet, swdown, ps, &
     376     & evap, fluxsens, fluxlat, coastalflow, riverflow, &
     377     & tsol_rad, tsurf_new, qsurf, albedo_out, emis_new, z0_new, &
     378     & lon_scat, lat_scat)
     379
     380#else         
    369381          CALL intersurf_main (itime+itau_phy-1, iim, jjm+1, offset, knon, ktindex, &
    370382               orch_comm, dtime, lrestart_read, lrestart_write, lalo, &
    … …  
    376388               tsol_rad(1:knon), tsurf_new(1:knon), qsurf(1:knon), albedo_out(1:knon,:), emis_new(1:knon), z0_new(1:knon), &
    377389               lon_scat, lat_scat)
     390#endif
    378391         
    379392       ENDIF
    … …  
    388401    IF (knon /=0) THEN
    389402   
     403#ifdef ORC_PREPAR
     404          call intersurf_main (itime+itau_phy-1, iim, jjm+1, knon, ktindex, dtime, &
     405     & lrestart_read, lrestart_write, lalo, &
     406     & contfrac, neighbours, resolution, date0, &
     407     & zlev,  u1_lay, v1_lay, spechum, temp_air, epot_air, ccanopy, &
     408     & cdrag, petA_orc, peqA_orc, petB_orc, peqB_orc, &
     409     & precip_rain, precip_snow, lwdown, swnet, swdown, ps, &
     410     & evap, fluxsens, fluxlat, coastalflow, riverflow, &
     411     & tsol_rad, tsurf_new, qsurf, albedo_out, emis_new, z0_new, &
     412     & lon_scat, lat_scat)
     413
     414#else
     415
    390416       CALL intersurf_main (itime+itau_phy, iim, jjm+1,offset, knon, ktindex, &
    391417            orch_comm,dtime, lrestart_read, lrestart_write, lalo, &
    … …  
    397423            tsol_rad(1:knon), tsurf_new(1:knon), qsurf(1:knon), albedo_out(1:knon,:), emis_new(1:knon), z0_new(1:knon), &
    398424            lon_scat, lat_scat)
     425#endif
    399426       
    400427    ENDIF
Note: See TracChangeset for help on using the changeset viewer.