Changeset 4729 for LMDZ6/trunk/libf

Timestamp:

Oct 22, 2023, 11:07:29 AM (13 months ago)

Author:

fhourdin

Message:

Corrections phydev.

Location:

LMDZ6/trunk/libf/phydev

Files:

• infotrac_phy.F90 (modified) (1 diff)
• iophy.F90 (modified) (1 diff)

LMDZ6/trunk/libf/phydev/infotrac_phy.F90

@@ -5 +5 @@
 
    USE strings_mod, ONLY: maxlen
-   INTEGER,                 SAVE :: nqtot                       !--- Tracers nb in dynamics (incl. higher moments + H2O)
-   CHARACTER(LEN=maxlen),   SAVE :: type_trac                   !--- Keyword for tracers type
-!$OMP THREADPRIVATE(nqtot, type_trac)
+!   PUBLIC :: tracers, type_trac                            !--- Full tracers database, tracers type keyword
+!   PUBLIC :: nqtot,   nbtr,   nqo,   nqCO2,   nqtottr      !--- Main dimensions
+   INTEGER,SAVE :: nqtot,   nbtr,   nqo,   nqCO2,   nqtottr      !--- Main dimensions
+   INTEGER,SAVE :: niso,ntiso
+   CHARACTER(LEN=maxlen), SAVE :: type_trac                     !--- Keyword for tracers type(s)
+
+  TYPE :: keys_type                                        !=== TYPE FOR A SET OF KEYS ASSOCIATED TO AN ELEMENT
+    CHARACTER(LEN=maxlen)              :: name             !--- Tracer name
+    CHARACTER(LEN=maxlen), ALLOCATABLE :: key(:)           !--- Keys string list
+    CHARACTER(LEN=maxlen), ALLOCATABLE :: val(:)           !--- Corresponding values string list
+  END TYPE keys_type
+
+  TYPE :: trac_type                                        !=== TYPE FOR A SINGLE TRACER NAMED "name"
+    CHARACTER(LEN=maxlen) :: name        = ''              !--- Name of the tracer
+    CHARACTER(LEN=maxlen) :: gen0Name    = ''              !--- First generation ancestor name
+    CHARACTER(LEN=maxlen) :: parent      = ''              !--- Parent name
+    CHARACTER(LEN=maxlen) :: longName    = ''              !--- Long name (with advection scheme suffix)
+    CHARACTER(LEN=maxlen) :: type        = 'tracer'        !--- Type  (so far: 'tracer' / 'tag')
+    CHARACTER(LEN=maxlen) :: phase       = 'g'             !--- Phase ('g'as / 'l'iquid / 's'olid)
+    CHARACTER(LEN=maxlen) :: component   = ''              !--- Coma-separated list of components (Ex: lmdz,inca)
+    INTEGER               :: iGeneration = -1              !--- Generation number (>=0)
+    INTEGER               :: iqParent    = 0               !--- Parent index
+    INTEGER,  ALLOCATABLE :: iqDescen(:)                   !--- Descendants index (in growing generation order)
+    INTEGER               :: nqDescen    = 0               !--- Number of descendants (all generations)
+    INTEGER               :: nqChildren  = 0               !--- Number of children  (first generation)
+    TYPE(keys_type)       :: keys                          !--- <key>=<val> pairs vector
+    INTEGER               :: iadv        = 10              !--- Advection scheme used
+    LOGICAL               :: isAdvected  = .FALSE.         !--- "true" tracers: iadv > 0.   COUNT(isAdvected )=nqtrue
+    LOGICAL               :: isInPhysics = .TRUE.          !--- "true" tracers: in tr_seri. COUNT(isInPhysics)=nqtottr
+    INTEGER               :: iso_iGroup  = 0               !--- Isotopes group index in isotopes(:)
+    INTEGER               :: iso_iName   = 0               !--- Isotope  name  index in isotopes(iso_iGroup)%trac(:)
+    INTEGER               :: iso_iZone   = 0               !--- Isotope  zone  index in isotopes(iso_iGroup)%zone(:)
+    INTEGER               :: iso_iPhase  = 0               !--- Isotope  phase index in isotopes(iso_iGroup)%phase
+  END TYPE trac_type
+
+   TYPE(trac_type), ALLOCATABLE, TARGET, SAVE ::  tracers(:)
+
+
+!$OMP THREADPRIVATE(nqtot, nbtr, nqo, nqtottr, nqCO2, type_trac)
+!$OMP THREADPRIVATE(niso,ntiso)
+!$OMP THREADPRIVATE(trac_type,tracers)
+
+
+
 
 CONTAINS

LMDZ6/trunk/libf/phydev/iophy.F90

@@ -129 +129 @@
 
       ! Initialize the XIOS domain coreesponding to this process:
-      CALL wxios_domain_param("dom_glo", is_sequential, nbp_lon, jj_nb, nbp_lon, nbp_lat, &
-                              1, nbp_lon, ii_begin, ii_end, jj_begin, jj_end,             &
-                              klon_mpi+2*(nbp_lon-1), data_ibegin, data_iend,             &
-                              io_lat, io_lon,is_south_pole_dyn,mpi_rank)
+       CALL wxios_domain_param("dom_glo")
+!      CALL wxios_domain_param("dom_glo", is_sequential, nbp_lon, jj_nb, nbp_lon, nbp_lat, &
+!                              1, nbp_lon, ii_begin, ii_end, jj_begin, jj_end,             &
+!                              klon_mpi+2*(nbp_lon-1), data_ibegin, data_iend,             &
+!                              io_lat, io_lon,is_south_pole_dyn,mpi_rank)
     ENDIF
 !$OMP END MASTER