Changeset 1067 for LMDZ4/trunk/libf/phylmd/surf_land_orchidee_mod.F90

Timestamp:

Dec 17, 2008, 2:30:13 PM (15 years ago)

Author:

Laurent Fairhead

Message:

• Modifications lie au premier niveau du modele pour la diffusion turbulent

du vent.

• Preparation pour un couplage des courrant oceaniques.

JG

File:

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

LMDZ4/trunk/libf/phylmd/surf_land_orchidee_mod.F90

@@ -1 @@
-!
-! $Header$
 !
 MODULE surf_land_orchidee_mod
@@ -10 +8 @@
 !                              Get_orchidee_communicator
 !                              Init_neighbours
+
+  USE dimphy
 #ifdef CPP_VEGET
-
-  USE dimphy
   USE intersurf     ! module d'ORCHIDEE
+#endif
   USE cpl_mod,      ONLY : cpl_send_land_fields
   USE surface_data, ONLY : type_ocean
@@ -203 +202 @@
   
     IF (debut) THEN
+! Test of coherence between variable ok_veget and cpp key CPP_VEGET
+#ifndef CPP_VEGET
+       abort_message='Pb de coherence: ok_veget = .true. mais CPP_VEGET = .false.'
+       CALL abort_gcm(modname,abort_message,1)
+#endif
+
        CALL Init_surf_para(knon)
        ALLOCATE(ktindex(knon))
@@ -368 +373 @@
        
        IF (knon > 0) THEN
+#ifdef CPP_VEGET
          CALL Init_intersurf(nbp_lon,nbp_lat,knon,ktindex,offset,orch_omp_size,orch_omp_rank,orch_comm)
+#endif
        ENDIF
 
@@ -374 +381 @@
        IF (knon > 0) THEN
 
+#ifdef CPP_VEGET
           CALL intersurf_main (itime+itau_phy-1, iim, jjm+1, knon, ktindex, dtime, &
                lrestart_read, lrestart_write, lalo, &
@@ -383 +391 @@
                tsol_rad, tsurf_new, qsurf, albedo_out, emis_new, z0_new, &
                lon_scat, lat_scat)
-         
+#endif         
        ENDIF
 
@@ -397 +405 @@
 
     IF (knon > 0) THEN
-    
+#ifdef CPP_VEGET    
        CALL intersurf_main (itime+itau_phy, iim, jjm+1, knon, ktindex, dtime,  &
             lrestart_read, lrestart_write, lalo, &
@@ -407 +415 @@
             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
 
@@ -625 +633 @@
 !
 
-#endif
-
 END MODULE surf_land_orchidee_mod