Changeset 4056 for LMDZ6/trunk/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90

Timestamp:

Jan 12, 2022, 10:54:09 PM (2 years ago)

Author:

dcugnet

Message:

Most of the changes are intended to help to eventually remove the constraints about the tracers assumptions, in particular water tracers.

• Remove index tables itr_indice and niadv, replaced by tracers(:)%isAdvected and tracers(:)%isH2OFamily. Most of the loops are now from 1 to nqtot:
  • DO iq=nqo+1,nqtot loops are replaced with: DO iq=1,nqtot

IF(tracers(iq)%isH2Ofamily) CYCLE

• DO it=1,nbtr; iq=niadv(it+nqo)

and DO it=1,nqtottr; iq=itr_indice(it) loops are replaced with:

it = 0
DO iq = 1, nqtot

IF(.NOT.tracers(iq)%isAdvected .OR. tracers(iq)%isH2Ofamily) CYCLE
it = it+1

• Move some StratAer? related code from infotrac to infotrac_phy
• Remove "nqperes" variable:

DO iq=1,nqpere loops are replaced with:
DO iq=1,nqtot

IF(tracers(iq)%parent/='air') CYCLE

• Cosmetic changes (justification, SELECT CASE instead of multiple IF...) mostly in advtrac* routines.

File:

• LMDZ6/trunk/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90 (modified) (2 diffs)

LMDZ6/trunk/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90

@@ -17 +17 @@
   USE vertical_layers_mod, ONLY : init_vertical_layers
   USE infotrac, ONLY: nqtot,nqo,nbtr,nqCO2,tracers,type_trac,&
-                      niadv,conv_flg,pbl_flg,solsym,&
+                      conv_flg,pbl_flg,solsym,&
                       ok_isotopes,ok_iso_verif,ok_isotrac,&
                       ok_init_iso,niso_possibles,tnat,&
                       alpha_ideal,use_iso,iqiso,iso_indnum,&
                       indnum_fn_num,index_trac,&
-                      niso,ntraceurs_zone,ntraciso,nqtottr,itr_indice
+                      niso,ntraceurs_zone,ntraciso,nqtottr
 #ifdef CPP_StratAer
-  USE infotrac, ONLY: nbtr_bin, nbtr_sulgas, id_OCS_strat, &
+  USE infotrac_phy, ONLY: nbtr_bin, nbtr_sulgas, id_OCS_strat, &
                       id_SO2_strat, id_H2SO4_strat, id_BIN01_strat
 
@@ -145 +145 @@
   ! Initialize tracer names, numbers, etc. for physics
   CALL init_infotrac_phy(nqtot,nqo,nbtr,nqtottr,nqCO2,tracers,type_trac,&
-                         niadv,conv_flg,pbl_flg,solsym,&
+                         conv_flg,pbl_flg,solsym,&
                          ok_isotopes,ok_iso_verif,ok_isotrac,&
                          ok_init_iso,niso_possibles,tnat,&
                          alpha_ideal,use_iso,iqiso,iso_indnum,&
                          indnum_fn_num,index_trac,&
-                         niso,ntraceurs_zone,ntraciso,itr_indice &
-#ifdef CPP_StratAer
-                         ,nbtr_bin,nbtr_sulgas&
-                         ,id_OCS_strat,id_SO2_strat,id_H2SO4_strat,id_BIN01_strat&
-#endif
-                         )
+                         niso,ntraceurs_zone,ntraciso)
 
   ! Initializations for Reprobus