Changeset 2785 for trunk/LMDZ.GENERIC

Timestamp:

Aug 3, 2022, 5:07:41 PM (2 years ago)

Author:

emillour

Message:

Generic PCM:
Further seperation between dynamics and physics concerning tracers:
Tracer names are extracted from traceur.def via initracer.F90 and no
longer transfered from the dynamics to the physics
LT+EM

Location:

trunk/LMDZ.GENERIC

Files:

• README (modified) (1 diff)
• libf/dynphy_lonlat/phystd/callphysiq_mod.F90 (modified) (1 diff)
• libf/dynphy_lonlat/phystd/newstart.F (modified) (1 diff)
• libf/dynphy_lonlat/phystd/start2archive.F (modified) (1 diff)
• libf/phystd/dyn1d/kcm1d.F90 (modified) (1 diff)
• libf/phystd/dyn1d/rcm1d.F (modified) (3 diffs)
• libf/phystd/initracer.F90 (modified) (4 diffs)
• libf/phystd/physiq_mod.F90 (modified) (4 diffs)
• libf/phystd/tracer_h.F90 (modified) (3 diffs)

trunk/LMDZ.GENERIC/README

@@ -1729 +1729 @@
 - remove top level obsolete "patch_large_domains" directory
 - remove unused "watercaptag" field in the physics.
+
+== 03/08/2022 == LT + EM
+Further seperation between dynamics and physics concerning tracers:
+Tracer names are extracted from traceur.def via initracer.F90 and no
+longer transfered from the dynamics to the physics

trunk/LMDZ.GENERIC/libf/dynphy_lonlat/phystd/callphysiq_mod.F90

@@ -70 +70 @@
               llm,            & ! nlayer
               nqtot,          & ! nq
-              tname,          & ! nametrac
               debut_split,    & ! firstcall
               lafin_split,    & ! lastcall

trunk/LMDZ.GENERIC/libf/dynphy_lonlat/phystd/newstart.F

@@ -285 +285 @@
 ! Initialize global tracer indexes (stored in tracer.h)
 ! ... this has to be done before phyetat0
-      call initracer(ngridmx,nqtot,tname)
+! and requires that "datadir" be correctly initialized 
+      call getin_p("datadir",datadir)
+      call initracer(ngridmx,nqtot)
 
 ! Initialize dimphy module (klon,klev,..)

trunk/LMDZ.GENERIC/libf/dynphy_lonlat/phystd/start2archive.F

@@ -236 +236 @@
       
 ! Initialize tracer names, indexes and properties
-      CALL initracer(ngridmx,nqtot,tname)
+      CALL initracer(ngridmx,nqtot)
 
       CALL phyetat0(.true.,ngridmx,llm,fichnom,0,Lmodif,nsoilmx,nqtot,

trunk/LMDZ.GENERIC/libf/phystd/dyn1d/kcm1d.F90

@@ -210 +210 @@
      endif
 
-     call initracer(1,nq,nametrac)
+     call initracer(1,nq)
 
   endif

trunk/LMDZ.GENERIC/libf/phystd/dyn1d/rcm1d.F

@@ -693 +693 @@
      &            form="formatted",iostat=ierr)
                   if (ierr .eq. 0) then 
-                        read(91,*),qsurf(iq)
+                        read(91,*)qsurf(iq)
                         do ilayer=1,nlayer 
                               read(91,*)q(ilayer,iq)
@@ -929 +929 @@
 #ifndef MESOSCALE
       if(tracer.and.photochem) then
-           call initracer(1,nq,tname)
+           call initracer(1,nq)
            allocate(nametmp(nq))
            nametmp(1:nq)=tname(1:nq)
@@ -1005 +1005 @@
 
       CALL physiq (1,llm,nq,
-     .     tname,
      ,     firstcall,lastcall,
      ,     day,time,dtphys,

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

@@ -1 @@
-      SUBROUTINE initracer(ngrid,nq,nametrac)
+      SUBROUTINE initracer(ngrid,nq)
 
       use surfdat_h, ONLY: dryness
@@ -24 +24 @@
 !            Ehouarn Millour (oct. 2008) identify tracers by their names
 !            Y Jaziri & J. Vatant d'Ollone (2020) : Modern traceur.def
+!            L Teinturier (2022): Tracer names are now read here instead of 
+!                                  inside interfaces 
 !=======================================================================
 
       integer,intent(in) :: ngrid,nq
-      character(len=30),intent(in) :: nametrac(nq) ! name of the tracer from dynamics
 
       character(len=500) :: tracline   ! to read traceur.def lines
       ! character(len=30)  :: txt        ! to store some text
+      integer :: blank      !to store the index of 1st blank when reading tracers names
       integer iq,ig,count,ierr
 
@@ -158 +160 @@
 
 
-! Initialization: copy tracer names from dynamics
-        do iq=1,nq
-          noms(iq)=nametrac(iq)
-          write(*,*)"initracer: iq=",iq,"noms(iq)=",trim(noms(iq))
+! Initialization: Read tracers names from traceur.def
+        do iq=1,nq 
+          if (is_master) read(407,'(A)') tracline
+          call bcast(tracline)
+          blank = index(tracline,' ') ! Find position of 1st blank in tracline
+          noms(iq) = tracline(1:blank) !ensure that in Modern-trac case, noms is actually the name and not all properties
         enddo
-
 
 ! Identify tracers by their names: (and set corresponding values of mmol)
@@ -442 +445 @@
       endif
 
-      ! Get data of tracers
+      ! Get data of tracers. Need to rewind traceur.def first
+      if (is_master) then
+       rewind(407)
+       do 
+        read(407,'(A)') tracline
+        if (index(tracline,"#") .ne. 1) then 
+          exit
+        endif
+       enddo
+      endif
       do iq=1,nqtot
         if (is_master) read(407,'(A)') tracline

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

@@ -6 +6 @@
       
       subroutine physiq(ngrid,nlayer,nq,   &
-                  nametrac,                & 
                   firstcall,lastcall,      &
                   pday,ptime,ptimestep,    &
@@ -151 +150 @@
 !    nlayer                Number of vertical layers.
 !    nq                    Number of advected fields.
-!    nametrac              Name of corresponding advected fields.
 !
 !    firstcall             True at the first call.
@@ -221 +219 @@
       integer,intent(in) :: nlayer            ! Number of atmospheric layers.
       integer,intent(in) :: nq                ! Number of tracers.
-      character*30,intent(in) :: nametrac(nq) ! Names of the tracers taken from dynamics.
       
       logical,intent(in) :: firstcall ! Signals first call to physics.
@@ -508 +505 @@
          IF (.NOT.ALLOCATED(noms)) ALLOCATE(noms(nq)) ! (because noms is an argument of physdem1 whether or not tracer is on)
          if (tracer) then
-            call initracer(ngrid,nq,nametrac)
+            call initracer(ngrid,nq)
             if(photochem) then
               call ini_conc_mod(ngrid,nlayer)

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
-!$OMP THREADPRIVATE(nqtot,nesp)
+!$OMP THREADPRIVATE(nqtot,nesp,ngt)
 
        logical :: moderntracdef=.false. ! Standard or modern traceur.def
@@ -41 +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)
+!$OMP THREADPRIVATE(is_condensable)   !also added by LT
 
        ! Lists of constants for condensable tracers
@@ -50 +51 @@
        integer, save, allocatable :: constants_RLVTT_generic(:)                ! Latent heat of vaporization (J/kg)
        integer, save, allocatable :: constants_metallicity_coeff(:)    ! Coefficient to take into account the metallicity
+!$OMP THREADPRIVATE(constants_mass,constants_delta_vapH,constants_Tref)
+!$OMP THREADPRIVATE(constants_Pref,constants_epsi_generic)
+!$OMP THREADPRIVATE(constants_RLVTT_generic,constants_metallicity_coeff)
 
-!$OMP THREADPRIVATE(is_condensable)   !also added by LT
 ! tracer indexes: these are initialized in initracer and should be 0 if the
 !                 corresponding tracer does not exist