Changeset 2169 for LMDZ5/trunk/libf/dyn3d_common

Timestamp:

Dec 15, 2014, 4:47:34 PM (10 years ago)

Author:

acozic

Message:

1- correct a missing in commit 2146 in infotrac
2- modify the declaration of solsym to use the same variable in differents routines

File:

• LMDZ5/trunk/libf/dyn3d_common/infotrac.F90 (modified) (7 diffs)

LMDZ5/trunk/libf/dyn3d_common/infotrac.F90

@@ -29 +29 @@
 
   CHARACTER(len=4),SAVE :: type_trac
+  CHARACTER(len=8),DIMENSION(:),ALLOCATABLE, SAVE :: solsym
  
 CONTAINS
@@ -62 +63 @@
 
     CHARACTER(len=15), ALLOCATABLE, DIMENSION(:) :: tnom_0  ! tracer short name
-    CHARACTER(len=8), ALLOCATABLE, DIMENSION(:) :: tracnam ! name from INCA
     CHARACTER(len=3), DIMENSION(30) :: descrq
     CHARACTER(len=1), DIMENSION(3)  :: txts
@@ -94 +94 @@
        WRITE(lunout,*) 'You have choosen to couple with INCA chemestry model : type_trac=', &
             type_trac,' config_inca=',config_inca
-       IF (config_inca/='aero' .AND. config_inca/='chem') THEN
+       IF (config_inca/='aero' .AND. config_inca/='aeNP' .AND. config_inca/='chem') THEN
           WRITE(lunout,*) 'Incoherence between type_trac and config_inca. Model stops. Modify run.def'
           CALL abort_gcm('infotrac_init','Incoherence between type_trac and config_inca',1)
@@ -172 +172 @@
 !
     ALLOCATE(tnom_0(nqtrue), hadv(nqtrue), vadv(nqtrue))
-    ALLOCATE(conv_flg(nbtr), pbl_flg(nbtr), tracnam(nbtr))
+    ALLOCATE(conv_flg(nbtr), pbl_flg(nbtr), solsym(nbtr))
     conv_flg(:) = 1 ! convection activated for all tracers
     pbl_flg(:)  = 1 ! boundary layer activated for all tracers
@@ -254 +254 @@
             conv_flg, &
             pbl_flg,  &
-            tracnam)
+            solsym)
 #endif
        tnom_0(1)='H2Ov'
@@ -260 +260 @@
 
        DO iq =3,nqtrue
-          tnom_0(iq)=tracnam(iq-2)
+          tnom_0(iq)=solsym(iq-2)
        END DO
        nqo = 2
@@ -394 +394 @@
 !
     DEALLOCATE(tnom_0, hadv, vadv)
-    DEALLOCATE(tracnam)
+
 
   END SUBROUTINE infotrac_init