Changeset 2408 for LMDZ5/branches/testing/libf/phylmd/phytrac_mod.F90

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/phytrac_mod.F90 (modified) (6 diffs)

LMDZ5/branches/testing/libf/phylmd/phytrac_mod.F90

@@ -89 +89 @@
     USE phys_cal_mod, only : hour
     USE dimphy
-    USE infotrac
+    USE infotrac_phy, ONLY: nbtr, type_trac, conv_flg, solsym, pbl_flg
     USE mod_grid_phy_lmdz
     USE mod_phys_lmdz_para
-    USE comgeomphy
     USE iophy
     USE traclmdz_mod
     USE tracinca_mod
     USE tracreprobus_mod
-    USE control_mod
     USE indice_sol_mod
 
     USE mod_phys_lmdz_mpi_data, ONLY :  is_mpi_root
+    USE print_control_mod, ONLY: lunout
+    USE aero_mod, ONLY : naero_grp
 
     IMPLICIT NONE
 
     INCLUDE "YOMCST.h"
-    INCLUDE "dimensions.h"
     INCLUDE "clesphys.h"
-    INCLUDE "temps.h"
-    INCLUDE "paramet.h"
     INCLUDE "thermcell.h"
-    INCLUDE "iniprint.h"
     !==========================================================================
     !                   -- ARGUMENT DESCRIPTION --
@@ -173 +169 @@
     LOGICAL,INTENT(IN)                       :: aerosol_couple
     REAL,DIMENSION(klon,klev),INTENT(IN)     :: flxmass_w
-    REAL,DIMENSION(klon,klev,9,2),INTENT(IN) :: tau_aero
-    REAL,DIMENSION(klon,klev,9,2),INTENT(IN) :: piz_aero
-    REAL,DIMENSION(klon,klev,9,2),INTENT(IN) :: cg_aero
-    CHARACTER(len=4),DIMENSION(9),INTENT(IN) :: rfname 
+    REAL,DIMENSION(klon,klev,naero_grp,2),INTENT(IN) :: tau_aero
+    REAL,DIMENSION(klon,klev,naero_grp,2),INTENT(IN) :: piz_aero
+    REAL,DIMENSION(klon,klev,naero_grp,2),INTENT(IN) :: cg_aero
+    CHARACTER(len=4),DIMENSION(naero_grp),INTENT(IN) :: rfname 
     REAL,DIMENSION(klon,klev,2),INTENT(IN)   :: ccm 
     !... K.Emanuel
@@ -445 +441 @@
        WRITE(*,*) 'FIRST TIME IN PHYTRAC : pdtphys(sec) = ',pdtphys,'ecrit_tra (sec) = ',ecrit_tra
        ALLOCATE( source(klon,nbtr), stat=ierr)
-       IF (ierr /= 0) CALL abort_gcm('phytrac', 'pb in allocation 1',1)
+       IF (ierr /= 0) CALL abort_physic('phytrac', 'pb in allocation 1',1)
 
        ALLOCATE( aerosol(nbtr), stat=ierr)
-       IF (ierr /= 0) CALL abort_gcm('phytrac', 'pb in allocation 2',1)
+       IF (ierr /= 0) CALL abort_physic('phytrac', 'pb in allocation 2',1)
 
 
@@ -503 +499 @@
 !                ELSE 
 !                   WRITE(lunout,*) 'pb it=', it
-!                   CALL abort_gcm('phytrac','pb it scavenging',1)
+!                   CALL abort_physic('phytrac','pb it scavenging',1)
 !                ENDIF
                 !--test OB 
@@ -539 +535 @@
 
        IF (lessivage.AND.config_inca.EQ.'inca') THEN
-          CALL abort_gcm('phytrac', 'lessivage=T config_inca=inca impossible',1)
+          CALL abort_physic('phytrac', 'lessivage=T config_inca=inca impossible',1)
           STOP
        ENDIF
@@ -740 +736 @@
     ELSE
        !
-       CALL abort_gcm('iflag_vdf_trac', 'cas non prevu',1)
+       CALL abort_physic('iflag_vdf_trac', 'cas non prevu',1)
        !
     END IF ! couche limite