Changeset 4013 for LMDZ6/branches/Ocean_skin/libf/phylmd/infotrac_phy.F90

Timestamp:

Nov 19, 2021, 4:58:59 PM (3 years ago)

Author:

lguez

Message:

Sync latest trunk changes to Ocean_skin

Location:

LMDZ6/branches/Ocean_skin

Files:

• . (modified) (1 prop)
• libf/phylmd/infotrac_phy.F90 (modified) (10 diffs)

LMDZ6/branches/Ocean_skin/libf/phylmd/infotrac_phy.F90

@@ -20 +20 @@
   INTEGER, SAVE :: nbtr
 !$OMP THREADPRIVATE(nbtr)
+
+  INTEGER, SAVE :: nqtottr
+!$OMP THREADPRIVATE(nqtottr)
+
+! ThL : number of CO2 tracers                   ModThL
+  INTEGER, SAVE :: nqCO2
+!$OMP THREADPRIVATE(nqCO2)
 
 #ifdef CPP_StratAer
@@ -35 +42 @@
 
 ! 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
+  INTEGER,PARAMETER :: tname_lenmax=128 
+  CHARACTER(len=tname_lenmax), ALLOCATABLE, DIMENSION(:), SAVE :: tname ! tracer short name for restart and diagnostics
+  CHARACTER(len=tname_lenmax+3), ALLOCATABLE, DIMENSION(:), SAVE :: ttext ! tracer long name for diagnostics
 !$OMP THREADPRIVATE(tname,ttext)
 
@@ -93 +101 @@
     INTEGER,SAVE :: niso,ntraceurs_zone,ntraciso
 !$OMP THREADPRIVATE(niso,ntraceurs_zone,ntraciso)
+
+    INTEGER, ALLOCATABLE, DIMENSION(:), SAVE ::  itr_indice ! numéro iq entre 1 et nqtot qui correspond au traceur itr entre 1 et nqtottr
+!$OMP THREADPRIVATE(itr_indice)
  
 CONTAINS
 
-  SUBROUTINE init_infotrac_phy(nqtot_,nqo_,nbtr_,tname_,ttext_,type_trac_,&
+  SUBROUTINE init_infotrac_phy(nqtot_,nqo_,nbtr_,nqtottr_,nqCO2_,tname_,ttext_,type_trac_,&
                                niadv_,conv_flg_,pbl_flg_,solsym_,&
                                nqfils_,nqdesc_,nqdesc_tot_,iqfils_,iqpere_,&
@@ -104 +115 @@
                                iso_indnum_,zone_num_,phase_num_,&
                                indnum_fn_num_,index_trac_,&
-                               niso_,ntraceurs_zone_,ntraciso_&
+                               niso_,ntraceurs_zone_,ntraciso_,itr_indice_&
 #ifdef CPP_StratAer
                                ,nbtr_bin_,nbtr_sulgas_&
@@ -118 +129 @@
     INTEGER,INTENT(IN) :: nqo_
     INTEGER,INTENT(IN) :: nbtr_
+    INTEGER,INTENT(IN) :: nqtottr_
+    INTEGER,INTENT(IN) :: nqCO2_
 #ifdef CPP_StratAer
     INTEGER,INTENT(IN) :: nbtr_bin_
@@ -126 +139 @@
     INTEGER,INTENT(IN) :: id_BIN01_strat_
 #endif
-    CHARACTER(len=20),INTENT(IN) :: tname_(nqtot_) ! tracer short name for restart and diagnostics
-    CHARACTER(len=23),INTENT(IN) :: ttext_(nqtot_) ! tracer long name for diagnostics
-    CHARACTER(len=4),INTENT(IN) :: type_trac_
+    CHARACTER(len=*),INTENT(IN) :: tname_(nqtot_) ! tracer short name for restart and diagnostics
+    CHARACTER(len=*),INTENT(IN) :: ttext_(nqtot_) ! tracer long name for diagnostics
+    CHARACTER(len=*),INTENT(IN) :: type_trac_
     INTEGER,INTENT(IN) :: niadv_ (nqtot_) ! equivalent dyn / physique
     INTEGER,INTENT(IN) :: conv_flg_(nbtr_)
     INTEGER,INTENT(IN) :: pbl_flg_(nbtr_)
-    CHARACTER(len=8),INTENT(IN) :: solsym_(nbtr_)
+    CHARACTER(len=*),INTENT(IN) :: solsym_(nbtr_)
     ! Isotopes:
     INTEGER,INTENT(IN) :: nqfils_(nqtot_)
@@ -157 +170 @@
     INTEGER,INTENT(IN) :: ntraceurs_zone_
     INTEGER,INTENT(IN) :: ntraciso_
+    INTEGER,INTENT(IN) :: itr_indice_(nqtottr_)
 
     CHARACTER(LEN=30) :: modname="init_infotrac_phy"
@@ -163 +177 @@
     nqo=nqo_
     nbtr=nbtr_
+    nqCO2=nqCO2_
+    nqtottr=nqtottr_
 #ifdef CPP_StratAer
     nbtr_bin=nbtr_bin_
@@ -184 +200 @@
     ALLOCATE(solsym(nbtr))
     solsym(:)=solsym_(:)
-  
+     
     IF(prt_level.ge.1) THEN
-      write(lunout,*) TRIM(modname)//": nqtot,nqo,nbtr",nqtot,nqo,nbtr
+      write(lunout,*) TRIM(modname)//": nqtot,nqo,nbtr,nqCO2",nqtot,nqo,nbtr,nqCO2
     ENDIF
     
@@ -236 +252 @@
       ALLOCATE(index_trac(ntraceurs_zone,niso))
       index_trac(:,:)=index_trac_(:,:)
+
+      ALLOCATE(itr_indice(nqtottr))
+      itr_indice(:)=itr_indice_(:)
     ENDIF ! of IF(ok_isotopes)