Changeset 1279 for LMDZ4/trunk/libf/phylmd/surf_land_orchidee_noopenmp_mod.F90

Timestamp:

Dec 10, 2009, 10:02:56 AM (15 years ago)

Author:

Laurent Fairhead

Message:

Merged LMDZ4-dev branch changes r1241:1278 into the trunk
Running trunk and LMDZ4-dev in LMDZOR configuration on local
machine (sequential) and SX8 (4-proc) yields identical results
(restart and restartphy are identical binarily)
Log history from r1241 to r1278 is available by switching to
source:LMDZ4/branches/LMDZ4-dev-20091210

Location:

LMDZ4/trunk

Files:

• . (modified) (1 prop)
• libf/phylmd/surf_land_orchidee_noopenmp_mod.F90 (modified) (9 diffs)

LMDZ4/trunk/libf/phylmd/surf_land_orchidee_noopenmp_mod.F90

@@ -68 +68 @@
 !   spechum      humidite specifique 1ere couche
 !   epot_air     temp pot de l'air
-!   ccanopy      concentration CO2 canopee
+!   ccanopy      concentration CO2 canopee, correspond au co2_send de 
+!                carbon_cycle_mod ou valeur constant co2_ppm
 !   tq_cdrag     cdrag
 !   petAcoef     coeff. A de la resolution de la CL pour t
@@ -95 +96 @@
 !   qsurf        air moisture at surface
 !
+    USE carbon_cycle_mod, ONLY : carbon_cycle_cpl, fco2_land_inst, fco2_lu_inst
+    IMPLICIT NONE
+
     INCLUDE "indicesol.h"
     INCLUDE "temps.h"
@@ -135 +139 @@
     INTEGER                                   :: error
     REAL, DIMENSION(klon)                     :: swdown_vrai
+    REAL, DIMENSION(klon)                     :: fco2_land_comp  ! sur grille compresse
+    REAL, DIMENSION(klon)                     :: fco2_lu_comp    ! sur grille compresse
     CHARACTER (len = 20)                      :: modname = 'surf_land_orchidee'
     CHARACTER (len = 80)                      :: abort_message
@@ -334 +340 @@
        ENDIF
 
+!
+! Allocate variables needed for carbon_cycle_mod
+!
+       IF (carbon_cycle_cpl) THEN
+          IF (.NOT. ALLOCATED(fco2_land_inst)) THEN
+             ALLOCATE(fco2_land_inst(klon),stat=error)
+             IF (error /= 0)  CALL abort_gcm(modname,'Pb in allocation fco2_land_inst',1)
+             
+             ALLOCATE(fco2_lu_inst(klon),stat=error)
+             IF(error /=0) CALL abort_gcm(modname,'Pb in allocation fco2_lu_inst',1)
+          END IF
+       END IF
+
     ENDIF                          ! (fin debut) 
 
@@ -378 +397 @@
 
 #ifndef CPP_MPI
-#define ORC_PREPAR
-#endif
-
-#ifdef ORC_PREPAR
           ! Interface for ORCHIDEE compiled in sequential mode(without preprocessing flag CPP_MPI)
           CALL intersurf_main (itime+itau_phy-1, iim, jjm+1, knon, ktindex, dtime, &
@@ -394 +409 @@
 
 #else          
-          ! Interface for ORCHIDEE version 1.9 or later compiled in parallel mode(with preprocessing flag CPP_MPI)
+          ! Interface for ORCHIDEE version 1.9 or later(1.9.2, 1.9.3, 1.9.4) compiled in parallel mode(with preprocessing flag CPP_MPI)
           CALL intersurf_main (itime+itau_phy-1, iim, jjm+1, offset, knon, ktindex, & 
                orch_comm, dtime, lrestart_read, lrestart_write, lalo, &
@@ -417 +432 @@
     IF (knon /=0) THEN
     
-#ifdef ORC_PREPAR
+#ifndef CPP_MPI
        ! Interface for ORCHIDEE compiled in sequential mode(without preprocessing flag CPP_MPI)
        CALL intersurf_main (itime+itau_phy, iim, jjm+1, knon, ktindex, dtime, &
@@ -463 +478 @@
 
     IF (debut) lrestart_read = .FALSE.
+
+
+! JG : TEMPORAIRE!!!! Les variables fco2_land_comp et fco2_lu_comp seront plus tard en sortie d'ORCHIDEE
+!      ici mis a valeur quelquonque pour test. Ces variables sont sur la grille compresse avec uniquement des points de terres
+
+    fco2_land_comp(:) = 1.
+    fco2_lu_comp(:)   = 10.
+
+! Decompress variables for the module carbon_cycle_mod
+    IF (carbon_cycle_cpl) THEN
+       fco2_land_inst(:)=0.
+       fco2_lu_inst(:)=0.
+       
+       DO igrid = 1, knon
+          ireal = knindex(igrid)
+          fco2_land_inst(ireal) = fco2_land_comp(igrid)
+          fco2_lu_inst(ireal)   = fco2_lu_comp(igrid)
+       END DO
+    END IF
+
 #endif    
   END SUBROUTINE surf_land_orchidee
@@ -628 +663 @@
           displs(i)=displs(i-1)+knon_nb(i-1)
        ENDDO
-    ENDIF
+   ELSE
+       ALLOCATE(neighbours_g(1,8))
+   ENDIF
     
     ktindex_p(1:knon)=ktindex(1:knon)+klon_mpi_begin-1+iim-1