Changeset 1815

Timestamp:

Oct 31, 2017, 12:22:52 PM (7 years ago)

Author:

jvatant

Message:

Adapt modifs related to tracers to newstart and start2archive
+ nqtot in physics -> nqtot_p. Else conflict with nqtot from dyn
TBD : use of nqtot_p everywhere in physics instead of nq ...
--JVO

Location:

trunk/LMDZ.TITAN/libf

Files:

• dynphy_lonlat/phytitan/newstart.F (modified) (2 diffs)
• dynphy_lonlat/phytitan/start2archive.F (modified) (2 diffs)
• phytitan/iostart.F90 (modified) (2 diffs)
• phytitan/tracer_h.F90 (modified) (3 diffs)

trunk/LMDZ.TITAN/libf/dynphy_lonlat/phytitan/newstart.F

@@ -38 +38 @@
       use iniphysiq_mod, only: iniphysiq
       use phyetat0_mod, only: phyetat0
+      use tracer_h
       implicit none
 
@@ -267 +268 @@
 ! Initialize global tracer indexes (stored in tracer.h)
 ! ... this has to be done before phyetat0
-      call initracer(ngridmx,nqtot,tname)
+      call initracer2(nqtot,tname)
 
 ! Take care of arrays in common modules

trunk/LMDZ.TITAN/libf/dynphy_lonlat/phytitan/start2archive.F

@@ -36 +36 @@
       USE iniphysiq_mod, ONLY: iniphysiq
       use phyetat0_mod, only: phyetat0
+      use tracer_h
       implicit none
 
@@ -219 +220 @@
 
 ! Initialize tracer names, indexes and properties
-      CALL initracer(ngridmx,nqtot,tname)
+      CALL initracer2(nqtot,tname)
 
       CALL phyetat0(.true.,ngridmx,llm,fichnom,0,Lmodif,nsoilmx,nqtot,

trunk/LMDZ.TITAN/libf/phytitan/iostart.F90

@@ -466 +466 @@
   USE mod_grid_phy_lmdz, only: klon_glo
   USE dimphy, only: klev, klevp1
-  USE tracer_h, only: nqtot
+  USE tracer_h, only: nqtot_p
   USE comsoil_h, only: nsoilmx
 
@@ -532 +532 @@
       ENDIF
       
-      if (nqtot>0) then
+      if (nqtot_p>0) then
         ! only define a tracer dimension if there are tracers
-        ierr=NF90_DEF_DIM(nid_restart,"number_of_advected_fields",nqtot,idim5)
+        ierr=NF90_DEF_DIM(nid_restart,"number_of_advected_fields",nqtot_p,idim5)
         IF (ierr/=NF90_NOERR) THEN
           write(*,*)'open_restartphy: problem defining number_of_advected_fields dimension '

trunk/LMDZ.TITAN/libf/phytitan/tracer_h.F90

@@ -21 +21 @@
   IMPLICIT NONE
 
-  INTEGER, SAVE :: nqtot  = 0 !! Total number of tracers
+  INTEGER, SAVE :: nqtot_p  = 0 !! Total number of physical tracers
   INTEGER, SAVE :: nmicro = 0 !! Number of microphysics tracers.
   INTEGER, SAVE :: nice   = 0 !! Number of microphysics ice tracers (subset of nmicro).
   INTEGER, SAVE :: nchimi = 0 !! Number of chemical (gaz species) tracers.
-  !$OMP THREADPRIVATE(nqtot,nmicro,nice,nchimi)
+  !$OMP THREADPRIVATE(nqtot_p,nmicro,nice,nchimi)
 
   INTEGER, DIMENSION(:), ALLOCATABLE, SAVE :: chimi_indx  !! Indexes of all chemical species tracers 
@@ -97 +97 @@
     verb = .true. ; IF (PRESENT(talk_to_me)) verb = talk_to_me
 
-    ! nqtot could be used everywhere in the physic :)
-    nqtot=nq
+    ! nqtot_p could be used everywhere in the physic :)
+    nqtot_p=nq
 
     IF (.NOT.ALLOCATED(noms)) ALLOCATE(noms(nq))
@@ -153 +153 @@
     ! Compute number of chemical species:
     !   simply assume that all other tracers ARE chemical species
-    nchimi = nqtot - nmicro
+    nchimi = nqtot_p - nmicro
 
     ! Titan chemistry requires exactly 44 tracers: