Changeset 2805 for trunk/LMDZ.GENERIC/libf

Timestamp:

Oct 19, 2022, 11:24:45 AM (2 years ago)

Author:

aslmd

Message:

Fixed issue with the rebase

In tracer_h.F90, the git conflicts manager directly wrote to the file instead of accepting the changes. It's fixed now.

File:

• trunk/LMDZ.GENERIC/libf/phystd/tracer_h.F90 (modified) (3 diffs)

trunk/LMDZ.GENERIC/libf/phystd/tracer_h.F90

@@ -7 +7 @@
        integer, save :: nesp  ! number of species in the chemistry
        integer, save :: ngt   ! number of generic tracers
-<<<<<<< HEAD
 !$OMP THREADPRIVATE(nqtot,nesp,ngt)
-=======
-       integer, save :: n_rgcs ! number of Radiative Generic Condensable Species
-!$OMP THREADPRIVATE(nqtot,nesp,ngt,n_rgcs)
->>>>>>> d67f7c1... This is the RGCS scheme
 
        logical :: moderntracdef=.false. ! Standard or modern traceur.def
@@ -46 +41 @@
 !$OMP THREADPRIVATE(is_recomb,is_recomb_qset,is_recomb_qotf)
        integer, save, allocatable :: is_condensable(:)      ! 1 if tracer is generic, else 0 (added LT)
-<<<<<<< HEAD
-!$OMP THREADPRIVATE(is_condensable)   !also added by LT
-
-=======
        integer,save,allocatable :: is_rgcs(:)               ! 1 if tracer is a radiative generic condensable specie, else 0 (added LT 2022)
->>>>>>> d67f7c1... This is the RGCS scheme
        ! Lists of constants for condensable tracers
        integer, save, allocatable :: constants_mass(:)                    ! molecular mass of the specie (g/mol)
@@ -64 +54 @@
 !$OMP THREADPRIVATE(constants_RLVTT_generic,constants_metallicity_coeff)
 
-<<<<<<< HEAD
-=======
 !$OMP THREADPRIVATE(is_condensable,is_rgcs)   !also added by LT
->>>>>>> d67f7c1... This is the RGCS scheme
 ! tracer indexes: these are initialized in initracer and should be 0 if the
 !                 corresponding tracer does not exist