Changeset 3852 for LMDZ6/branches/LMDZ-tracers/libf/dynphy_lonlat

Timestamp:

Feb 22, 2021, 5:28:31 PM (4 years ago)

Author:

dcugnet

Message:

Extension of the tracers management.

The tracers files can be:

1) "traceur.def": old format, with:

• the number of tracers on the first line
• one line for each tracer: <tracer name> <hadv> <vadv> [<parent name>]

2) "tracer.def": new format with one section each model component.
3) "tracer_<name>.def": new format with a single section.

The formats 2 and 3 reading is driven by the "type_trac" key, which can be a

coma-separated list of components.

• Format 2: read the sections from the "tracer.def" file.
• format 3: read one section each "tracer_<section name>.def" file.
• the first line of a section is "&<section name>
• the other lines start with a tracer name followed by <key>=<val> pairs.
• the "default" tracer name is reserved ; the other tracers of the section inherit its <key>=<val>, except for the keys that are redefined locally.

This format helps keeping the tracers files compact, thanks to the "default"
special tracer and the three levels of factorization:

• on the tracers names: a tracer name can be a coma-separated list of tracers => all the tracers of the list have the same <key>=<val> properties
• on the parents names: the value of the "parent" property can be a coma-separated list of tracers => only possible for geographic tagging tracers
• on the phases: the property "phases" is [g](l][s] (gas/liquid/solid)

Read information is stored in the vector "tracers(:)", of derived type "tra".

"isotopes_params.def" is a similar file, with one section each isotopes family.
It contains a database of isotopes properties ; if there are second generation
tracers (isotopes), the corresponding sections are read.

Read information is stored in the vector "isotopes(:)", of derived type "iso".

The "getKey" function helps to get the values of the parameters stored in
"tracers" or "isotopes".

Location:

LMDZ6/branches/LMDZ-tracers/libf/dynphy_lonlat

Files:

• calfis.F (modified) (2 diffs)
• calfis_loc.F (modified) (2 diffs)
• calfis_p.F (modified) (2 diffs)
• phylmd/etat0dyn_netcdf.F90 (modified) (2 diffs)
• phylmd/iniphysiq_mod.F90 (modified) (4 diffs)

LMDZ6/branches/LMDZ-tracers/libf/dynphy_lonlat/calfis.F

@@ -29 +29 @@
 c    Auteur :  P. Le Van, F. Hourdin 
 c   .........
-      USE infotrac, ONLY: nqtot, niadv, tname
+      USE infotrac, ONLY: nqtot, niadv, tracers
       USE control_mod, ONLY: planet_type, nsplit_phys
 #ifdef CPP_PHYS
@@ -481 +481 @@
          lafin_split=lafin.and.isplit==nsplit_phys
 
-        CALL call_physiq(ngridmx,llm,nqtot,tname,
+        CALL call_physiq(ngridmx,llm,nqtot,tracers(:)%name,
      &                   debut_split,lafin_split,
      &                   jD_cur,jH_cur_split,zdt_split,

LMDZ6/branches/LMDZ-tracers/libf/dynphy_lonlat/calfis_loc.F

@@ -45 +45 @@
       USE Times
 #endif
-      USE infotrac, ONLY: nqtot, niadv, tname
+      USE infotrac, ONLY: nqtot, niadv, tracers
       USE control_mod, ONLY: planet_type, nsplit_phys
 #ifdef CPP_PHYS
@@ -731 +731 @@
          lafin_split=lafin.and.isplit==nsplit_phys
 
-        CALL call_physiq(klon,llm,nqtot,tname,
+        CALL call_physiq(klon,llm,nqtot,tracers(:)%name,
      &                   debut_split,lafin_split,
      &                   jD_cur,jH_cur_split,zdt_split,

LMDZ6/branches/LMDZ-tracers/libf/dynphy_lonlat/calfis_p.F

@@ -42 +42 @@
       USE Times
 #endif
-      USE infotrac, ONLY: nqtot, niadv, tname
+      USE infotrac, ONLY: nqtot, niadv, tracers
       USE control_mod, ONLY: planet_type, nsplit_phys
 #ifdef CPP_PHYS
@@ -697 +697 @@
          lafin_split=lafin.and.isplit==nsplit_phys
 
-        CALL call_physiq(klon,llm,nqtot,tname,
+        CALL call_physiq(klon,llm,nqtot,tracers(:)%name,
      &                   debut_split,lafin_split,
      &                   jD_cur,jH_cur_split,zdt_split,

LMDZ6/branches/LMDZ-tracers/libf/dynphy_lonlat/phylmd/etat0dyn_netcdf.F90

@@ -74 +74 @@
   USE exner_hyb_m,    ONLY: exner_hyb
   USE exner_milieu_m, ONLY: exner_milieu
-  USE infotrac,       ONLY: nqtot, tname
+  USE infotrac,       ONLY: nqtot, tracers
   USE filtreg_mod
   IMPLICIT NONE
@@ -145 +145 @@
 ! Look for ozone tracer:
 #ifndef INCA
-  DO i=1,nqtot; IF(ANY(["O3","o3"]==tname(i))) EXIT; END DO
+  DO i=1,nqtot; IF(ANY(["O3","o3"]==tracers(i)%name)) EXIT; END DO
   IF(i/=nqtot+1) THEN
     CALL regr_lat_time_coefoz

LMDZ6/branches/LMDZ-tracers/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90

@@ -16 +16 @@
   USE mod_phys_lmdz_para, ONLY: klon_omp ! number of columns (on local omp grid)
   USE vertical_layers_mod, ONLY : init_vertical_layers
-  USE infotrac, ONLY: nqtot,nqo,nbtr,tname,ttext,type_trac,&
-                      niadv,conv_flg,pbl_flg,solsym,&
-                      nqfils,nqdesc,nqdesc_tot,iqfils,iqpere,&
-                      ok_isotopes,ok_iso_verif,ok_isotrac,&
-                      ok_init_iso,niso_possibles,tnat,&
-                      alpha_ideal,use_iso,iqiso,iso_num,&
-                      iso_indnum,zone_num,phase_num,&
-                      indnum_fn_num,index_trac,&
-                      niso,ntraceurs_zone,ntraciso
+  USE infotrac, ONLY: tracers, isotopes, type_trac, solsym, nbtr, niadv, pbl_flg, conv_flg
 #ifdef CPP_StratAer
   USE infotrac, ONLY: nbtr_bin, nbtr_sulgas, id_OCS_strat, &
@@ -146 +138 @@
 
   ! Initialize tracer names, numbers, etc. for physics
-  CALL init_infotrac_phy(nqtot,nqo,nbtr,tname,ttext,type_trac,&
-                         niadv,conv_flg,pbl_flg,solsym,&
-                         nqfils,nqdesc,nqdesc_tot,iqfils,iqpere,&
-                         ok_isotopes,ok_iso_verif,ok_isotrac,&
-                         ok_init_iso,niso_possibles,tnat,&
-                         alpha_ideal,use_iso,iqiso,iso_num,&
-                         iso_indnum,zone_num,phase_num,&
-                         indnum_fn_num,index_trac,&
-                         niso,ntraceurs_zone,ntraciso&
+  CALL init_infotrac_phy(tracers, isotopes, type_trac, solsym, nbtr, niadv, pbl_flg, conv_flg &
 #ifdef CPP_StratAer
                          ,nbtr_bin,nbtr_sulgas&
@@ -183 +167 @@
 #endif
   END IF
-  IF (type_trac == 'repr') THEN
-#ifdef REPROBUS
-    call init_reprobus_para( &
-          nbp_lon,nbp_lat,nbp_lev,klon_glo,mpi_size, &
-          distrib_phys,communicator)
-#endif
-  ENDIF
 
 !!$OMP PARALLEL DEFAULT(SHARED) COPYIN(/temps/)
@@ -203 +180 @@
           rlonudyn,rlatudyn,rlonvdyn,rlatvdyn)
 #endif
-    IF (type_trac == 'repr') THEN
-#ifdef REPROBUS
-       CALL Init_chem_rep_phys(klon_omp,nbp_lev)
-#endif
-    END IF
   END IF