Changeset 802

Timestamp:

Jul 3, 2007, 5:11:16 PM (17 years ago)

Author:

Laurent Fairhead

Message:

On laisse la cle CPP ORC_PREPAR non definie pour que la nouvelle interface
orchidee1.9 soit choisie par défaut
LF

File:

• LMDZ4/trunk/libf/phylmd/surf_land_orchidee_mod.F90 (modified) (5 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)
+          ! Interface for version 1.8 or earlier of ORCHIDEE
+          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          
@@ -402 +403 @@
     
 #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)
-
+       ! Interface for version 1.8 or earlier of ORCHIDEE
+       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
 
@@ -482 +484 @@
     INTEGER                               :: mpi_size
     INTEGER                               :: ierr   
-    
+!
+! End definition
+!****************************************************************************************
+
     MyLastPoint=klon_mpi_begin-1+knindex(knon)+iim-1
     
@@ -534 +539 @@
     INTEGER             :: color
     INTEGER             :: ierr
-    
+!
+! End definition
+!****************************************************************************************
+
     IF (knon==0) THEN 
        color = 0
@@ -557 +565 @@
 #endif    
 
-
+! Input arguments
+!****************************************************************************************
     INTEGER, INTENT(IN)                     :: knon
-    INTEGER, DIMENSION(knon,8), INTENT(OUT) :: neighbours
     INTEGER, DIMENSION(klon), INTENT(IN)    :: ktindex
     REAL, DIMENSION(klon), INTENT(IN)       :: pctsrf
     
-    INTEGER :: knon_nb(0:mpi_size-1)
-    INTEGER,DIMENSION(0:mpi_size-1) :: displs
-    INTEGER,ALLOCATABLE :: ktindex_g(:)
-    REAL*8  :: pctsrf_g(klon_glo)
-    INTEGER,ALLOCATABLE ::neighbours_g(:,:)
-    INTEGER :: knon_g
-    REAL*8 :: correspond(iim,jjm+1)
-    INTEGER :: i,igrid,jj,ij,iglob,ierr,ireal,index
-    INTEGER, DIMENSION(8,3) :: off_ini
-    INTEGER, DIMENSION(8)   :: offset  
-    INTEGER :: ktindex_p(knon)
-    
+! Output arguments
+!****************************************************************************************
+    INTEGER, DIMENSION(knon,8), INTENT(OUT) :: neighbours
+
+! Local variables
+!****************************************************************************************
+    INTEGER                              :: knon_g
+    INTEGER                              :: i, igrid, jj, ij, iglob
+    INTEGER                              :: ierr, ireal, index
+    INTEGER, DIMENSION(0:mpi_size-1)     :: knon_nb
+    INTEGER, DIMENSION(0:mpi_size-1)     :: displs
+    INTEGER, DIMENSION(8,3)              :: off_ini
+    INTEGER, DIMENSION(8)                :: offset  
+    INTEGER, DIMENSION(knon)             :: ktindex_p
+    INTEGER, DIMENSION(iim,jjm+1)        :: correspond
+    INTEGER, ALLOCATABLE, DIMENSION(:)   :: ktindex_g
+    INTEGER, ALLOCATABLE, DIMENSION(:,:) :: neighbours_g
+    REAL, DIMENSION(klon_glo)            :: pctsrf_g
+    
+!
+! End definition
+!****************************************************************************************
+
     IF (is_sequential) THEN
        knon_nb(:)=knon