Changeset 3817 for dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phytrac_mod.F90

Timestamp:

Apr 17, 2015, 10:30:37 PM (10 years ago)

Author:

millour

Message:

Further cleanup and removal of references to iniprint.h.
Also added bench testcase 48x36x19.
EM

File:

• dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phytrac_mod.F90 (modified) (5 diffs)

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phytrac_mod.F90

@@ -20 +20 @@
 !=================================================================================
 
-
-  IMPLICIT NONE
-! tracer settings, inherited from the dynamics (see ini_trac_mod)
-! nqtot : total number of tracers and higher order of moment, water vapor and liquid included
-  INTEGER, SAVE :: nqtot
-! nqo: numbre of water tracers
-  INTEGER, SAVE :: nqo
-! nbtr : number of tracers not including higher order of moment or water vapor or liquid
-!        number of tracers used in the physics
-  INTEGER, SAVE :: nbtr
-!$OMP THREADRIVATE(nqtot,nqo,nbtr)
-! Name variables
-  CHARACTER(len=20), ALLOCATABLE, DIMENSION(:), SAVE :: tname ! tracer short name for restart and diagnostics
-  CHARACTER(len=23), ALLOCATABLE, DIMENSION(:), SAVE :: ttext ! tracer long name for diagnostics
-! niadv : vector keeping the coorspondance between all tracers(nqtot) treated in the 
-!         dynamic part of the code and the tracers (nbtr+2) used in the physics part of the code. 
-  INTEGER, ALLOCATABLE, DIMENSION(:), SAVE    :: niadv ! equivalent dyn / physique
-!$OMP THREADRIVATE(tname,ttext,niadv)
-! conv_flg(it)=0 : convection desactivated for tracer number it 
-  INTEGER, ALLOCATABLE, DIMENSION(:), SAVE  :: conv_flg
-! pbl_flg(it)=0  : boundary layer diffusion desactivaded for tracer number it 
-  INTEGER, ALLOCATABLE, DIMENSION(:), SAVE  :: pbl_flg
-  CHARACTER(len=4),SAVE :: type_trac
-  CHARACTER(len=8),DIMENSION(:),ALLOCATABLE, SAVE :: solsym
-!$OMP THREADRIVATE(conv_flg,pbl_flg,type_trac,solsym)
 !
 ! Tracer tendencies, for outputs
@@ -79 +54 @@
 CONTAINS
 
-  SUBROUTINE ini_phytrac_mod(nqtot_dyn,nqo_dyn,nbtr_dyn, &
-                             tname_dyn,ttext_dyn,type_trac_dyn, &
-                             niadv_dyn,conv_flg_dyn,pbl_flg_dyn,solsym_dyn)
-  IMPLICIT NONE
-  
-  INTEGER,INTENT(IN) :: nqtot_dyn
-  INTEGER,INTENT(IN) :: nqo_dyn
-  INTEGER,INTENT(IN) :: nbtr_dyn
-  CHARACTER(len=*),INTENT(IN) :: tname_dyn(nqtot_dyn)
-  CHARACTER(len=*),INTENT(IN) :: ttext_dyn(nqtot_dyn)
-  CHARACTER(len=*),INTENT(IN) :: type_trac_dyn
-  INTEGER,INTENT(IN) :: niadv_dyn(nqtot_dyn)
-  INTEGER,INTENT(IN) :: conv_flg_dyn(nbtr_dyn)
-  INTEGER,INTENT(IN) :: pbl_flg_dyn(nbtr_dyn)
-  CHARACTER(len=*),INTENT(IN) :: solsym_dyn(nbtr_dyn)
-  
-  INTEGER :: i
-  
-  nqtot=nqtot_dyn
-  nqo=nqo_dyn
-  nbtr=nbtr_dyn
-  type_trac=type_trac_dyn
-  
-  allocate(tname(nqtot))
-  allocate(ttext(nqtot))
-  allocate(niadv(nqtot))
-  allocate(conv_flg(nbtr))
-  allocate(pbl_flg(nbtr))
-  allocate(solsym(nbtr))
-  
-  DO i=1,nqtot_dyn
-    tname(i)=tname_dyn(i)
-    ttext(i)=ttext_dyn(i)
-    niadv(i)=niadv_dyn(i)
-  ENDDO
-  DO i=1,nbtr_dyn
-    conv_flg(i)=conv_flg_dyn(i)
-    pbl_flg(i)=pbl_flg_dyn(i)
-    solsym(i)=solsym_dyn(i)
-  ENDDO
-  
-  END SUBROUTINE ini_phytrac_mod
-
   SUBROUTINE phytrac(                                 &
        nstep,     julien,   gmtime,   debutphy,       &
@@ -157 +89 @@
     USE phys_cal_mod, only : hour
     USE dimphy
-    !USE infotrac_phy
+    USE infotrac_phy, ONLY: nbtr, pbl_flg, conv_flg, type_trac, solsym
     USE mod_grid_phy_lmdz
     USE mod_phys_lmdz_para
@@ -165 +97 @@
     USE tracreprobus_mod
     !USE control_phy_mod
-    USE inifis_mod, ONLY: config_inca
+    USE inifis_mod, ONLY: config_inca, lunout
     
     USE indice_sol_mod
@@ -177 +109 @@
     INCLUDE "clesphys.h"
     INCLUDE "thermcell.h"
-    INCLUDE "iniprint.h"
     !==========================================================================
     !                   -- ARGUMENT DESCRIPTION --