Changeset 1668 for trunk/LMDZ.TITAN/libf/phytitan

Timestamp:

Feb 17, 2017, 3:44:15 PM (8 years ago)

Author:

jvatant

Message:

Another round of cleaning of dust and dummy tracers
JVO

Location:

trunk/LMDZ.TITAN/libf/phytitan

Files:

• callkeys_mod.F90 (modified) (1 diff)
• convadj.F (modified) (1 diff)
• iniaerosol.F (modified) (1 diff)
• initracer.F (modified) (5 diffs)
• physiq_mod.F90 (modified) (2 diffs)
• tracer_h.F90 (modified) (1 diff)
• vdifc.F (modified) (2 diffs)

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

@@ -45 +45 @@
 !$OMP THREADPRIVATE(iddist,iaervar,iradia,startype)
 
-      real,save :: topdustref
       real,save :: Fat1AU
       real,save :: stelTbb
-!$OMP THREADPRIVATE(topdustref,Fat1AU,stelTbb)
+!$OMP THREADPRIVATE(Fat1AU,stelTbb)
       real,save :: tplanet
       real,save :: obs_tau_col_tropo

trunk/LMDZ.TITAN/libf/phytitan/convadj.F

@@ -312 +312 @@
             print*,'zh2(ig,:)        = ',zh2(i,l)
          end do
-!         do l = 1, nlay
-!            print*,'zq(ig,:,vap)     = ',zq(i,l,igcm_h2o_vap)
-!         end do
-!         do l = 1, nlay
-!            print*,'zq2(ig,:,vap)    = ',zq2(i,l,igcm_h2o_vap)
-!         end do
-!            print*,'zqm(vap)         = ',zqm(igcm_h2o_vap)
-            print*,'jadrs=',jadrs
+         print*,'jadrs=',jadrs
 
             call abort

trunk/LMDZ.TITAN/libf/phytitan/iniaerosol.F

@@ -11 +11 @@
 c   --------
 c   Initialization related to aerosols 
-c   (CO2 aerosols, dust, water, chemical species, ice...)   
+c   (Chemical species, ice...)   
 c
 c   author: Laura Kerber, S. Guerlet

trunk/LMDZ.TITAN/libf/phytitan/initracer.F

@@ -8 +8 @@
 c   --------
 c   Initialization related to tracer 
-c   (transported dust, water, chemical species, ice...)
+c   (chemical species, ice...)
 c
 c   Name of the tracer
@@ -38 +38 @@
 c  alpha_lift(nq)  ! saltation vertical flux/horiz flux ratio (m-1)
 c  alpha_devil(nq) ! lifting coeeficient by dust devil
-c  doubleq           ! if method with mass (iq=1) and number(iq=2) mixing ratio
-c  varian            ! Characteristic variance of log-normal distribution
 c-----------------------------------------------------------------------
 
@@ -53 +51 @@
        ALLOCATE(alpha_devil(nq))
        ALLOCATE(qextrhor(nq))
-       ALLOCATE(igcm_dustbin(nq))
        !! initialization
        alpha_lift(:)=0.
@@ -72 +69 @@
       ! 0. initialize tracer indexes to zero:
       ! NB: igcm_* indexes are commons in 'tracer.h'
-      igcm_co=0
-      igcm_o=0
-      igcm_o1d=0
-      igcm_o2=0
-      igcm_o3=0
-      igcm_h=0
-      igcm_h2=0
-      igcm_oh=0
-      igcm_ho2=0
-      igcm_h2o2=0
       igcm_n2=0
-      igcm_ar=0
-      igcm_ar_n2=0
 
       write(*,*) 'initracer: noms() ', noms
 
 
-      !print*,'Setting dustbin = 0 in initracer.F'
-      !dustbin=0
+      ! 1. find chemistry tracers
+      count = 0.    
 
-      ! 1. find dust tracers
-      count=0
-!      if (dustbin.gt.0) then
-!        do iq=1,nq
-!          txt=" "
-!          write(txt,'(a4,i2.2)')'dust',count+1   
-!          if (noms(iq).eq.txt) then
-!            count=count+1
-!            igcm_dustbin(count)=iq
-!            mmol(iq)=100.
-!          endif
-!        enddo !do iq=1,nq
-!      endif ! of if (dustbin.gt.0)
-
-
-!      if (doubleq) then
-!        do iq=1,nq
-!          if (noms(iq).eq."dust_mass") then
-!            igcm_dust_mass=iq
-!            count=count+1
-!          endif
-!          if (noms(iq).eq."dust_number") then
-!            igcm_dust_number=iq
-!            count=count+1
-!          endif
-!        enddo
-!      endif ! of if (doubleq)
-      ! 2. find chemistry and water tracers
-     
+ 
       ! check that we identified all tracers:
       if (count.ne.nq) then
@@ -150 +107 @@
       write(*,*) 'alpha_devil = ', alpha_devil
       write(*,*) 'radius  = ', radius
-!      if(doubleq) then
-!        write(*,*) 'reff_lift (um) =  ', reff_lift
-!        write(*,*) 'size distribution variance  = ', varian
-!        write(*,*) 'r3n_q , ref_r0 : ', r3n_q , ref_r0
-!      end if
+      
       write(*,*) 'Qext  = ', qext 
       write(*,*)

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

@@ -23 +23 @@
       USE comgeomfi_h, only: totarea, totarea_planet
       USE tracer_h, only: noms, mmol, radius, qext, &
-                          alpha_lift, alpha_devil, qextrhor, &
-                          igcm_dustbin
+                          alpha_lift, alpha_devil, qextrhor
       use time_phylmdz_mod, only: ecritphy, iphysiq, nday
       use phyredem, only: physdem0, physdem1
@@ -316 +315 @@
 !$OMP THREADPRIVATE(ztprevious,zuprevious)
 
-      real reff(ngrid,nlayer)                       ! Effective dust radius (used if doubleq=T).
       real vmr(ngrid,nlayer)                        ! volume mixing ratio
       real time_phys

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

@@ -17 +17 @@
        real, DIMENSION(:), ALLOCATABLE :: qextrhor ! Intermediate for computing opt. depth from q
 
-      real varian      ! Characteristic variance of log-normal distribution
-      real r3n_q     ! used to compute r0 from number and mass mixing ratio
-      real ref_r0        ! for computing reff=ref_r0*r0 (in log.n. distribution)
-!$OMP THREADPRIVATE(noms,mmol,radius,rho_q,qext,alpha_lift,alpha_devil,qextrhor, &
-        !$OMP varian,r3n_q,ref_r0)
+!$OMP THREADPRIVATE(noms,mmol,radius,rho_q,qext,alpha_lift,alpha_devil,qextrhor)
 
 ! tracer indexes: these are initialized in initracer and should be 0 if the
 !                 corresponding tracer does not exist
-      ! dust
-      integer, DIMENSION(:), ALLOCATABLE :: igcm_dustbin ! for dustbin 'dust' tracers
-      ! dust, special doubleq case
-      integer :: igcm_dust_mass   ! dust mass mixing ratio (for transported dust)
-      integer :: igcm_dust_number ! dust number mixing ratio (transported dust)
       ! chemistry:
-      integer :: igcm_co
-      integer :: igcm_o
-      integer :: igcm_o1d
-      integer :: igcm_o2
-      integer :: igcm_o3
-      integer :: igcm_h
-      integer :: igcm_h2
-      integer :: igcm_oh
-      integer :: igcm_ho2
-      integer :: igcm_h2o2
       integer :: igcm_n2
-      integer :: igcm_ar
-      ! other tracers
-      integer :: igcm_ar_n2 ! for simulations using co2 +neutral gaz
-!$OMP THREADPRIVATE(igcm_dustbin,igcm_dust_mass,igcm_dust_number, &
-        !$OMP igcm_co,igcm_o,igcm_o1d,igcm_o2,igcm_o3,igcm_h,igcm_h2,igcm_oh,       &
-        !$OMP igcm_ho2,igcm_h2o2,igcm_n2,igcm_ar,igcm_ar_n2)
+!$OMP THREADPRIVATE(igcm_n2)
 
        end module tracer_h

trunk/LMDZ.TITAN/libf/phytitan/vdifc.F

@@ -97 +97 @@
 !     variables added for CO2 condensation
 !     ------------------------------------
-      REAL hh                   !, zhcond(ngrid,nlay)
-!     REAL latcond,tcond1mb
-!     REAL acond,bcond
-!     SAVE acond,bcond
-!!$OMP THREADPRIVATE(acond,bcond)
-!     DATA latcond,tcond1mb/5.9e5,136.27/
+      REAL hh
 
 !     Tracers
@@ -127 +122 @@
 
       IF (firstcall) THEN
-!     To compute: Tcond= 1./(bcond-acond*log(.0095*p)) (p in pascal)
-!     bcond=1./tcond1mb
-!     acond=r/latcond
-!     PRINT*,'In vdifc: Tcond(P=1mb)=',tcond1mb,' Lcond=',latcond
-!     PRINT*,'          acond,bcond',acond,bcond
-
          firstcall=.false.
       ENDIF