Ignore:
Timestamp:
Jan 11, 2017, 3:33:51 PM (8 years ago)
Author:
jvatant
Message:

+ Major clean of the new LMDZ.TITAN from too-generic options and routines (water, co2, ocean, surface type ...)
+ From this revision LMDZ.TITAN begins to be really separated from LMDZ.GENERIC
+ Partial desactivation of aerosols, only the dummy case is still enabled to keep the code running ( new aerosol routines to come in followings commits )

JVO

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/LMDZ.TITAN/libf/phytitan/optcv.F90

    r1397 r1647  
    77  use gases_h
    88  use comcstfi_mod, only: g, r, mugaz
    9   use callkeys_mod, only: kastprof,continuum,graybody,H2Ocont_simple,callgasvis
     9  use callkeys_mod, only: continuum,graybody,callgasvis
    1010
    1111  implicit none
     
    106106
    107107     ! if we have continuum opacities, we need dz
    108      if(kastprof)then
    109         dz(k) = dpr(k)*(1000.0d0*8.3145d0/muvar(k))*TMID(K)/(g*PMID(K))
    110         U(k)  = Cmk*DPR(k)*mugaz/muvar(k)
    111      else
    112         dz(k) = dpr(k)*R*TMID(K)/(glat_ig*PMID(K))*mugaz/muvar(k)
    113         U(k)  = Cmk*DPR(k)*mugaz/muvar(k)     ! only Cmk line in optci.F 
    114             !JL13 the mugaz/muvar factor takes into account water meanmolecular weight if water is present
    115      endif
     108
     109      dz(k) = dpr(k)*R*TMID(K)/(glat_ig*PMID(K))*mugaz/muvar(k)
     110      U(k)  = Cmk*DPR(k)*mugaz/muvar(k)     ! only Cmk line in optci.F 
     111          !JL13 the mugaz/muvar factor takes into account water meanmolecular weight if water is present
     112     
    116113
    117114     call tpindex(PMID(K),TMID(K),QVAR(K),pfgasref,tgasref,WREFVAR, &
     
    186183                       indv(nw,igas,jgas) = interm
    187184                       ! should be irrelevant in the visible
    188                     elseif(jgas.eq.igas_He)then
    189                        interm = indv(nw,igas,jgas)
    190                        call interpolateH2He(wn_cont,T_cont,p_cross,p_cont,dtempc,.false.,interm)
    191                        indv(nw,igas,jgas) = interm
    192185                    endif
    193186                    dtemp = dtemp + dtempc
    194187                 enddo
    195 
    196               elseif(igas.eq.igas_H2O.and.T_cont.gt.200.0)then
    197 
    198                  p_air = dble(PMID(k)*scalep) - p_cont ! note assumes background is air!
    199                  if(H2Ocont_simple)then
    200                     call interpolateH2Ocont_PPC(wn_cont,T_cont,p_cont,p_air,dtemp,.false.)
    201                  else
    202                     interm = indv(nw,igas,igas)
    203                     call interpolateH2Ocont_CKD(wn_cont,T_cont,p_cont,p_air,dtemp,.false.,interm)
    204                     indv(nw,igas,igas) = interm
    205                  endif
    206188
    207189              endif
Note: See TracChangeset for help on using the changeset viewer.