Changeset 1279 for LMDZ4/trunk/libf/dyn3dpar/infotrac.F90

Timestamp:

Dec 10, 2009, 10:02:56 AM (15 years ago)

Author:

Laurent Fairhead

Message:

Merged LMDZ4-dev branch changes r1241:1278 into the trunk
Running trunk and LMDZ4-dev in LMDZOR configuration on local
machine (sequential) and SX8 (4-proc) yields identical results
(restart and restartphy are identical binarily)
Log history from r1241 to r1278 is available by switching to
source:LMDZ4/branches/LMDZ4-dev-20091210

Location:

LMDZ4/trunk

Files:

• . (modified) (1 prop)
• libf/dyn3dpar/infotrac.F90 (modified) (10 diffs)

LMDZ4/trunk/libf/dyn3dpar/infotrac.F90

@@ +1 @@
+! $Id$
+!
 MODULE infotrac
 
 ! nqtot : total number of tracers and higher order of moment, water vapor and liquid included
   INTEGER, SAVE :: nqtot
-!!$OMP THREADPRIVATE(nqtot)   
 
 ! 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 THREADPRIVATE(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
-!!$OMP THREADPRIVATE(tname,ttext)   
 
 ! iadv  : index of trasport schema for each tracer
   INTEGER, ALLOCATABLE, DIMENSION(:), SAVE    :: iadv
-!!$OMP THREADPRIVATE(iadv)   
 
 ! 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 THREADPRIVATE(niadv)   
-
-! Variables for INCA
+
+! 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
-!!$OMP THREADPRIVATE(conv_flg, pbl_flg)   
-
+
+  CHARACTER(len=4),SAVE :: type_trac
+ 
 CONTAINS
 
@@ -57 +56 @@
     INTEGER, ALLOCATABLE, DIMENSION(:) :: vadv  ! index of vertical trasport schema
 
-    CHARACTER(len=8), ALLOCATABLE, DIMENSION(:) :: tnom_0  ! tracer short name
+    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
@@ -84 +83 @@
     descrq(20)='SLP'
     descrq(30)='PRA'
+    
+
+    IF (config_inca=='none') THEN
+       type_trac='lmdz'
+    ELSE
+       type_trac='inca'
+    END IF
 
 !-----------------------------------------------------------------------
@@ -91 +97 @@
 !
 !-----------------------------------------------------------------------
-    IF (config_inca == 'none') THEN
+    IF (type_trac == 'lmdz') THEN
        OPEN(90,file='traceur.def',form='formatted',status='old', iostat=ierr)
        IF(ierr.EQ.0) THEN
@@ -113 +119 @@
     END IF
 !
-! Allocate variables depending on nqtrue
+! Allocate variables depending on nqtrue and nbtr
 !
     ALLOCATE(tnom_0(nqtrue), hadv(nqtrue), vadv(nqtrue))
-
-    IF (config_inca /= 'none') THEN
-       ! Varaibles only needed in case of INCA
-       ALLOCATE(conv_flg(nbtr), pbl_flg(nbtr), tracnam(nbtr))
-    END IF
-       
+    ALLOCATE(conv_flg(nbtr), pbl_flg(nbtr), tracnam(nbtr))
+    conv_flg(:) = 1 ! convection activated for all tracers
+    pbl_flg(:)  = 1 ! boundary layer activated for all tracers
+
 !-----------------------------------------------------------------------
 ! 2)     Choix  des schemas d'advection pour l'eau et les traceurs
@@ -148 +152 @@
 !    Get choice of advection schema from file tracer.def or from INCA
 !---------------------------------------------------------------------
-    IF (config_inca == 'none') THEN
+    IF (type_trac == 'lmdz') THEN
        IF(ierr.EQ.0) THEN
           ! Continue to read tracer.def
@@ -176 +180 @@
        END DO
 
-    ELSE  ! config_inca='aero' ou 'chem'
+    ELSE  ! type_trac=inca : config_inca='aero' ou 'chem'
 ! le module de chimie fournit les noms des traceurs
 ! et les schemas d'advection associes.
@@ -195 +199 @@
        END DO
 
-    END IF ! config_inca
+    END IF ! type_trac
 
 !-----------------------------------------------------------------------
@@ -299 +303 @@
 
 
-    WRITE(lunout,*) 'Information stored in dimtrac :'
+    WRITE(lunout,*) 'Information stored in infotrac :'
     WRITE(lunout,*) 'iadv  niadv tname  ttext :'
     DO iq=1,nqtot
@@ -305 +309 @@
     END DO
 
+!
+! Test for advection schema. 
+! This version of LMDZ only garantees iadv=10 and iadv=14 (14 only for water vapour) .
+!
+    DO iq=1,nqtot
+       IF (iadv(iq)/=10 .AND. iadv(iq)/=14 .AND. iadv(iq)/=0) THEN
+          WRITE(lunout,*)'STOP : The option iadv=',iadv(iq),' is not tested in this version of LMDZ'
+          CALL abort_gcm('infotrac_init','In this version only iadv=10 and iadv=14 is tested!',1)
+       ELSE IF (iadv(iq)==14 .AND. iq/=1) THEN
+          WRITE(lunout,*)'STOP : The option iadv=',iadv(iq),' is not tested in this version of LMDZ'
+          CALL abort_gcm('infotrac_init','In this version iadv=14 is only permitted for water vapour!',1)
+       END IF
+    END DO
+
 !-----------------------------------------------------------------------
 ! Finalize :
 !
     DEALLOCATE(tnom_0, hadv, vadv)
-    IF (config_inca /= 'none') DEALLOCATE(tracnam)
-
-999 FORMAT (i2,1x,i2,1x,a8)
+    DEALLOCATE(tracnam)
+
+999 FORMAT (i2,1x,i2,1x,a15)
 
   END SUBROUTINE infotrac_init