Changeset 2934 for LMDZ5/branches/LMDZ_tree_FC/libf/phylmd/surf_land_orchidee_mod.F90

Timestamp:

Jul 7, 2017, 10:38:35 AM (7 years ago)

Author:

jghattas

Message:

Amelioration/correction pour retro-compatiblite avec different version de ORHCIDEE. Ajoute de test de coherence.

File:

• LMDZ5/branches/LMDZ_tree_FC/libf/phylmd/surf_land_orchidee_mod.F90 (modified) (7 diffs)

LMDZ5/branches/LMDZ_tree_FC/libf/phylmd/surf_land_orchidee_mod.F90

@@ -4 +4 @@
 #ifndef ORCHIDEE_NOZ0H
 #ifndef ORCHIDEE_NOFREIN
-!FC la derniere ligne et la fin
 !
 ! This module controles the interface towards the model ORCHIDEE.
 !
 ! Compatibility with ORCHIDIEE :
-! The current version can be used with ORCHIDEE/trunk from revision 3525.
-! This interface is used if none of the cpp keys ORCHIDEE_NOOPENMP or ORCHIDEE_NOZ0H is set.
+! The current version can be used with ORCHIDEE/trunk from revision 4465.
+! This interface is used if none of the cpp keys ORCHIDEE_NOOPENMP, 
+! ORCHIDEE_NOZ0H or ORCHIDEE_NOFREIN is set.
 !
 ! Subroutines in this module : surf_land_orchidee
@@ -47 +47 @@
        emis_new, z0m_new, z0h_new, qsurf, &
        veget, lai, height )
-!FC
 
 
@@ -113 +112 @@
 !
     INCLUDE "YOMCST.h"
-!FC
     INCLUDE "dimpft.h"
 
@@ -147 +145 @@
     REAL, DIMENSION(klon), INTENT(OUT)        :: alb1_new, alb2_new
     REAL, DIMENSION(klon), INTENT(OUT)        :: emis_new, z0m_new, z0h_new
-!FC
-    REAL, DIMENSION (klon,nvm_lmdz),INTENT(OUT)         :: veget
-    REAL, DIMENSION (klon,nvm_lmdz),INTENT(OUT)         :: lai
-    REAL, DIMENSION (klon,nvm_lmdz) ,INTENT(OUT)        :: height
+    REAL, DIMENSION(klon,nvm_lmdz), INTENT(OUT) :: veget
+    REAL, DIMENSION(klon,nvm_lmdz), INTENT(OUT) :: lai
+    REAL, DIMENSION(klon,nvm_lmdz), INTENT(OUT) :: height
 
 
@@ -230 +227 @@
 ! Test of coherence between variable ok_veget and cpp key CPP_VEGET
 #ifndef CPP_VEGET
-             print* , "nvm_orch FC  ", nvm_orch
-             print* , "nvm_lmdz FC  ", nvm_lmdz
-
        abort_message='Pb de coherence: ok_veget = .true. mais CPP_VEGET = .false.'
        CALL abort_physic(modname,abort_message,1)
@@ -443 +437 @@
     IF (knon > 0) THEN
 #ifdef CPP_VEGET    
-!FC
-           if(nvm_orch .ne.nvm_lmdz ) then
-       abort_message='Pb de dimensiosn PFT: nvm_orch et nvm_lmdz differents.'
-       CALL abort_physic(modname,abort_message,1)
-           endif
-!FC
+       IF (nvm_orch .NE. nvm_lmdz ) THEN
+          abort_message='Pb de dimensiosn PFT: nvm_orch et nvm_lmdz differents.'
+          CALL abort_physic(modname,abort_message,1)
+       ENDIF
 
        CALL intersurf_main_gathered (itime+itau_phy, nbp_lon, nbp_lat, knon, ktindex, dtime,  &
@@ -460 +452 @@
             lon_scat, lat_scat, q2m, t2m, z0h_new(1:knon),&
             veget(1:knon,:),lai(1:knon,:),height(1:knon,:),&
-              coszang=yrmu0(1:knon))
+            coszang=yrmu0(1:knon))
 #endif       
-!FC on doit mettre nvm_orch la ???
     ENDIF