Changeset 959 for LMDZ4/trunk/libf/phylmd/phys_state_var_mod.F90

Timestamp:

May 27, 2008, 6:42:49 PM (16 years ago)

Author:

lsce

Message:

• Ajoute du parametre config_inca dans conf_gcm.F config_inca='none'(sans INCA, par defaut) config_inca='chem'(avec INCA config chemie) config_inca='aero'(avec INCA config aerosol)
• Menage parmis les cles CPP INCA
• Enleve le calcul d'omega dans calfis.F et active le calcul correspondant dans advtrac.F(avant uniquement pour INCA).

File:

• LMDZ4/trunk/libf/phylmd/phys_state_var_mod.F90 (modified) (6 diffs)

LMDZ4/trunk/libf/phylmd/phys_state_var_mod.F90

@@ -170 +170 @@
 !topswai, solswai : Aerosol indirect effect
       REAL,SAVE,ALLOCATABLE :: topswai(:), solswai(:)
-#ifdef INCA
+      REAL,SAVE,ALLOCATABLE :: tau_ae(:,:,:), piz_ae(:,:,:)
+      REAL,SAVE,ALLOCATABLE :: cg_ae(:,:,:)
+
+! Les variables suivants uniquement pour un configuration avec INCA
 ! topswad_inca, solswad_inca : Aerosol direct effect
       REAL,SAVE,ALLOCATABLE :: topswad_inca(:), solswad_inca(:)
 ! topswad0_inca, solswad0_inca : Aerosol direct effect
       REAL,SAVE,ALLOCATABLE :: topswad0_inca(:), solswad0_inca(:)
-!topswai_inca, solswai_inca : Aerosol indirect effect
+! topswai_inca, solswai_inca : Aerosol indirect effect
       REAL,SAVE,ALLOCATABLE :: topswai_inca(:), solswai_inca(:)
       REAL,SAVE,ALLOCATABLE :: topsw_inca(:,:), solsw_inca(:,:)
@@ -183 +186 @@
       REAL,SAVE,ALLOCATABLE :: cg_inca(:,:,:,:)
       REAL,SAVE,ALLOCATABLE :: ccm(:,:,:)
-#endif
-      REAL,SAVE,ALLOCATABLE :: tau_ae(:,:,:), piz_ae(:,:,:)
-      REAL,SAVE,ALLOCATABLE :: cg_ae(:,:,:)
 
 CONTAINS
@@ -194 +194 @@
 IMPLICIT NONE
 #include "indicesol.h"
-
+#include "control.h"
       ALLOCATE(rlat(klon), rlon(klon))
       ALLOCATE(pctsrf(klon,nbsrf))
@@ -290 +290 @@
       ALLOCATE(topswad(klon), solswad(klon))
       ALLOCATE(topswai(klon), solswai(klon))
-#ifdef INCA
-      ALLOCATE(topswad_inca(klon), solswad_inca(klon))
-      ALLOCATE(topswad0_inca(klon), solswad0_inca(klon))
-      ALLOCATE(topswai_inca(klon), solswai_inca(klon))
-      ALLOCATE(topsw_inca(klon,9), solsw_inca(klon,9))
-      ALLOCATE(topsw0_inca(klon,9), solsw0_inca(klon,9))
+      ALLOCATE(tau_ae(klon,klev,2), piz_ae(klon,klev,2))
+      ALLOCATE(cg_ae(klon,klev,2))
+
+      IF (config_inca /= 'none') THEN
+         ALLOCATE(topswad_inca(klon), solswad_inca(klon))
+         ALLOCATE(topswad0_inca(klon), solswad0_inca(klon))
+         ALLOCATE(topswai_inca(klon), solswai_inca(klon))
+         ALLOCATE(topsw_inca(klon,9), solsw_inca(klon,9))
+         ALLOCATE(topsw0_inca(klon,9), solsw0_inca(klon,9))
+      END IF
+      ! Following 4 variables are needed only by INCA but must be
+      ! allocated as they exist in the phytrac argument list
       ALLOCATE(tau_inca(klon,klev,9,2))
       ALLOCATE(piz_inca(klon,klev,9,2))
       ALLOCATE(cg_inca(klon,klev,9,2))
       ALLOCATE(ccm(klon,klev,2))
-#endif
-      ALLOCATE(tau_ae(klon,klev,2), piz_ae(klon,klev,2))
-      ALLOCATE(cg_ae(klon,klev,2))
 
 END SUBROUTINE phys_state_var_init
@@ -311 +314 @@
 IMPLICIT NONE
 #include "indicesol.h"
+#include "control.h"
 
       deallocate(rlat, rlon, pctsrf, ftsol, falb1, falb2)
@@ -387 +391 @@
       deallocate(topswad, solswad)
       deallocate(topswai, solswai)
-#ifdef INCA
-      deallocate(topswad_inca, solswad_inca)
-      deallocate(topswad0_inca, solswad0_inca)
-      deallocate(topswai_inca, solswai_inca)
-      deallocate(topsw_inca, solsw_inca)
-      deallocate(topsw0_inca, solsw0_inca)
+
+      deallocate(tau_ae, piz_ae)
+      deallocate(cg_ae)
+
+      IF (config_inca /= 'none') THEN
+         deallocate(topswad_inca, solswad_inca)
+         deallocate(topswad0_inca, solswad0_inca)
+         deallocate(topswai_inca, solswai_inca)
+         deallocate(topsw_inca, solsw_inca)
+         deallocate(topsw0_inca, solsw0_inca)
+      END IF
       deallocate(tau_inca)
       deallocate(piz_inca)
       deallocate(cg_inca)
       deallocate(ccm)
-#endif
-      deallocate(tau_ae, piz_ae)
-      deallocate(cg_ae)
- 
+       
 END SUBROUTINE phys_state_var_end