Changeset 3677 for LMDZ6/trunk/libf/phylmd/infotrac_phy.F90

Timestamp:

May 6, 2020, 5:18:32 PM (4 years ago)

Author:

oboucher

Message:

Changed the way to initialise nbtr_bin and other dimensions and indices
in the StratAer? module based on infotrac_phy rather than infotrac.

Also added a missing $OMP THREADPRIVATE(nqperes)

File:

• LMDZ6/trunk/libf/phylmd/infotrac_phy.F90 (modified) (4 diffs)

LMDZ6/trunk/libf/phylmd/infotrac_phy.F90

@@ -21 +21 @@
 !$OMP THREADPRIVATE(nbtr)
 
+#ifdef CPP_StratAer
+! nbtr_bin: number of aerosol bins for StratAer model
+! nbtr_sulgas: number of sulfur gases for StratAer model
+  INTEGER, SAVE :: nbtr_bin, nbtr_sulgas
+!$OMP THREADPRIVATE(nbtr_bin,nbtr_sulgas)
+  INTEGER, SAVE :: id_OCS_strat, id_SO2_strat, id_H2SO4_strat, id_BIN01_strat
+!$OMP THREADPRIVATE(id_OCS_strat, id_SO2_strat, id_H2SO4_strat, id_BIN01_strat)
+#endif
+
 ! CRisi: nb traceurs pères= directement advectés par l'air
   INTEGER, SAVE :: nqperes
+!$OMP THREADPRIVATE(nqperes)
 
 ! Name variables
@@ -94 +104 @@
                                iso_indnum_,zone_num_,phase_num_,&
                                indnum_fn_num_,index_trac_,&
-                               niso_,ntraceurs_zone_,ntraciso_)
+                               niso_,ntraceurs_zone_,ntraciso_&
+#ifdef CPP_StratAer
+                               ,nbtr_bin_,nbtr_sulgas_&
+                               ,id_OCS_strat_,id_SO2_strat_,id_H2SO4_strat_,id_BIN01_strat_&
+#endif
+                               )
 
     ! transfer information on tracers from dynamics to physics
@@ -103 +118 @@
     INTEGER,INTENT(IN) :: nqo_
     INTEGER,INTENT(IN) :: nbtr_
+#ifdef CPP_StratAer
+    INTEGER,INTENT(IN) :: nbtr_bin_
+    INTEGER,INTENT(IN) :: nbtr_sulgas_
+    INTEGER,INTENT(IN) :: id_OCS_strat_
+    INTEGER,INTENT(IN) :: id_SO2_strat_
+    INTEGER,INTENT(IN) :: id_H2SO4_strat_
+    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
@@ -140 +163 @@
     nqo=nqo_
     nbtr=nbtr_
+#ifdef CPP_StratAer
+    nbtr_bin=nbtr_bin_
+    nbtr_sulgas=nbtr_sulgas_
+    id_OCS_strat=id_OCS_strat_
+    id_SO2_strat=id_SO2_strat_
+    id_H2SO4_strat=id_H2SO4_strat_
+    id_BIN01_strat=id_BIN01_strat_
+#endif
     ALLOCATE(tname(nqtot))
     tname(:) = tname_(:)