Changeset 1843 for trunk/LMDZ.TITAN/libf

Timestamp:

Dec 6, 2017, 4:13:14 PM (7 years ago)

Author:

jvatant

Message:

Enable tracers management in 1D
--JVO

Location:

trunk/LMDZ.TITAN/libf/phytitan

Files:

• dyn1d/rcm1d.F (modified) (2 diffs)
• inifis_mod.F90 (modified) (1 diff)
• physiq_mod.F90 (modified) (6 diffs)
• tracer_h.F90 (modified) (5 diffs)

trunk/LMDZ.TITAN/libf/phytitan/dyn1d/rcm1d.F

@@ -6 +6 @@
       use mod_grid_phy_lmdz, only : regular_lonlat
       use infotrac, only: nqtot, tname
+      use tracer_h, only: initracer2
       use surfdat_h, only: albedodat, phisfi,
      &                     zmea, zstd, zsig, zgam, zthe,
@@ -727 +728 @@
 ! -------------------------------
       tankCH4=2. ! default value for tankCH4
+      
+! Initialize tracers
+! ------------------
+      if(tracer) then
+        call initracer2(nq,tname) ! We need tracers infos in physdem1
+      endif
 
 c  Write a "startfi" file

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

@@ -58 +58 @@
 !   declarations:
 !   -------------
-  use datafile_mod, only: datadir
   use ioipsl_getin_p_mod, only: getin_p
   IMPLICIT NONE

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

@@ -366 +366 @@
       real ctimestep ! Chemistry timestep (s)
  
-      ! Grandeurs en moyennes zonales ------------------------
-      real temp_eq(nlayer), press_eq(nlayer)
-      real zplev(ngrid,nlayer+1),zplay(ngrid,nlayer)
-      real ztemp(ngrid,nlayer)
+      real temp_eq(nlayer), press_eq(nlayer) ! Moyennes planétaires
       
       real , allocatable, dimension(:,:,:),save :: ychim
@@ -599 +596 @@
          endif
 
-         if (ngrid.ne.1) then ! Note : no need to create a restart file in 1d.
+         if (ngrid.ne.1) then
+            ! Note : no need to create a restart file in 1d.
             call physdem0("restartfi.nc",longitude,latitude,nsoilmx,ngrid,nlayer,nq, &
                           ptimestep,pday+nday,time_phys,cell_area,          &
                           albedo_bareground,inertiedat,zmea,zstd,zsig,zgam,zthe)
-         endif
-
-         ! Sanity check for microphysics
-         if ( ((.not.moyzon_mu).and.(callmufi)) ) then
-            print *, "moyzon_mu=",moyzon_mu," and callmufi=",callmufi
-            print *, "Please activate zonal mean to run microphysics (for now) !"
-            stop
-         endif
-
-         ! Sanity check for chemistry
-         if ( (.not.moyzon_ch) .and. (callchim) ) then
-            print *, "moyzon_ch=",moyzon_ch," and callchim=",callchim
-            print *, "Please activate zonal mean to run chemistry !"
-            stop
-         endif
-
+         
+            ! Sanity check for microphysics - useless in 1D
+            if ( ((.not.moyzon_mu).and.(callmufi)) ) then
+               print *, "moyzon_mu=",moyzon_mu," and callmufi=",callmufi
+               print *, "Please activate zonal mean to run microphysics (for now) !"
+               stop
+            endif
+
+            ! Sanity check for chemistry - useless in 1D
+            if ( (.not.moyzon_ch) .and. (callchim) ) then
+               print *, "moyzon_ch=",moyzon_ch," and callchim=",callchim
+               print *, "Please activate zonal mean to run chemistry !"
+               stop
+            endif
+
+        endif ! of ngrid.ne.1
          
          ! XIOS outputs
@@ -705 +703 @@
       enddo     
 
-      ! -------------------------------Taken from old Titan --------------------------
-      ! zonal averages needed
+      ! Zonal averages needed for chemistry and microphysics
+      ! ~~~~~~~~~~~~~ Taken from old Titan ~~~~~~~~~~~~~~~~~
       if (moyzon_ch .or. moyzon_mu) then
          
@@ -1044 +1042 @@
          if (callchim) then
 
-            ! Using zonal mean for calchim
-            zplev(:,:) = zplevbar(:,:)
-            zplay(:,:) = zplaybar(:,:)
-            zzlev(:,:) = zzlevbar(:,:)
-            zzlay(:,:) = zzlaybar(:,:)
-            ztemp(:,:) = ztfibar(:,:)
-
             if (nq.gt.nmicro) then
                do iq = nmicro+1,nq
@@ -1073 +1064 @@
                
                print *, "We enter in the chemistry ..."
-               call calchim(ngrid,nq-nmicro,ychim,nomqy,declin,zls,ctimestep, &
-                           ztemp,zplay,zplev,zzlay,zzlev,dycchi,nlayer+70)
-
-            ! JVO 2017 : NLEV = nlayer+70, en accord avec le C. Quid si nlay=/ 55 ?
-               
+
+               if (ngrid.eq.1) then ! We obviously don't have access to (and don't need) zonal means in 1D
+                 call calchim(ngrid,nq-nmicro,ychim,nomqy,declin,zls,ctimestep, &
+                           pt,pplay,pplev,zzlay,zzlev,dycchi,nlayer+70)
+               else
+                 call calchim(ngrid,nq-nmicro,ychim,nomqy,declin,zls,ctimestep, &
+                           ztfibar,zplaybar,zplevbar,zzlaybar,zzlevbar,dycchi,nlayer+70)
+                 ! JVO 2017 : NLEV = nlayer+70, en accord avec le C. Quid si nlay=/ 55 ?
+               endif
+
             endif
             
@@ -1104 +1100 @@
          if (callmufi) then
 
-            ! Using zonal mean for microphysics
-            zplev(:,:) = zplevbar(:,:)
-            zplay(:,:) = zplaybar(:,:)
-            zzlev(:,:) = zzlevbar(:,:)
-            zzlay(:,:) = zzlaybar(:,:)
-            ztemp(:,:) = ztfibar(:,:)
-
             ! Inside this routine we will split 2D->1D, intensive->extensive and separate different types of tracers
             ! Should be put in phytrac
 
-            call calmufi(zplev,zzlev,zplay,zzlay,ztemp,pq,zdqmufi)
+               if (ngrid.eq.1) then ! We obviously don't have access to (and don't need) zonal means in 1D
+                  call calmufi(pplev,zzlev,pplay,zzlay,pt,pq,zdqmufi)
+               else
+                  call calmufi(zplevbar,zzlevbar,zplaybar,zzlaybar,ztfibar,pq,zdqmufi)
+               endif
 
             pdq(1:ngrid,1:nlayer,1:nq) = pdq(1:ngrid,1:nlayer,1:nq) + zdqmufi(1:ngrid,1:nlayer,1:nq)   

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

@@ -103 +103 @@
     noms(:)=nametrac(:)
 
-    ALLOCATE(rho_q(nq)) ! Defined for all tracers, currently initialized to 0.0
+    IF (.NOT.ALLOCATED(rho_q)) ALLOCATE(rho_q(nq)) ! Defined for all tracers, currently initialized to 0.0
     rho_q(:) = 0.0
 
-    ALLOCATE(mmol(nq),rat_mmol(nq))  ! Defined for all tracers, (actually) initialized only for chemical tracers
+    ! Defined for all tracers, (actually) initialized only for chemical tracers
+    IF (.NOT.ALLOCATED(mmol)) ALLOCATE(mmol(nq))
+    IF (.NOT.ALLOCATED(rat_mmol)) ALLOCATE(rat_mmol(nq))
     mmol(:)  = 0.0
     rat_mmol(:) = 1.0
@@ -138 +140 @@
       ENDIF
       ! microphysics indexes share the same values than original tracname.
-      ALLOCATE(micro_indx(nmicro))
+      IF (.NOT.ALLOCATED(micro_indx)) ALLOCATE(micro_indx(nmicro))
       j = 1
       DO i=1,nq
@@ -148 +150 @@
       ENDDO
     ELSE
-      ALLOCATE(micro_indx(nmicro))
+      IF (.NOT.ALLOCATED(micro_indx)) ALLOCATE(micro_indx(nmicro))
     ENDIF
 
@@ -163 +165 @@
         CALL abort_gcm("initracer2", "inconsistent number of tracers", 42)
       ENDIF
-      ALLOCATE(chimi_indx(nchimi))
+      IF (.NOT.ALLOCATED(chimi_indx)) ALLOCATE(chimi_indx(nchimi))
       n = 0 ! counter on chimi_indx 
       DO j=1,SIZE(cnames)
@@ -186 +188 @@
       ENDIF
     ELSE
-      ALLOCATE(chimi_indx(0))
+      IF (.NOT.ALLOCATED(chimi_indx)) ALLOCATE(chimi_indx(0))
     ENDIF
     IF (verb) THEN