Changeset 517 for trunk


Ignore:
Timestamp:
Feb 7, 2012, 12:11:01 PM (13 years ago)
Author:
emillour
Message:

Mars GCM: Adding the new molecular diffusion routines (old "moldiff" and "moldiffcoeff" are kept for now and if further tests are needed) by JYC:
moldiffcoeff_red.F, moldiff_red.F90, diffusion.h
Also updated "phymars/comdiurn.h", "aeronomars/conc.h" and "aeronomars/chimiedata.h" to be fixed/free form compatible.

Location:
trunk/LMDZ.MARS
Files:
3 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LMDZ.MARS/README

    r498 r517  
    13721372   building the makefile).
    13731373   
     1374== 07/02/12 == JYC
     1375>> Adding the new molecular diffusion routines (old "moldiff" and "moldiffcoeff"
     1376   are kept for now and if further tests are needed):
     1377   moldiffcoeff_red.F, moldiff_red.F90, diffusion.h
     1378   Also updated "phymars/comdiurn.h", "aeronomars/conc.h" and
     1379   "aeronomars/chimiedata.h" to be fixed/free form compatible.

  • trunk/LMDZ.MARS/libf/aeronomars/chimiedata.h

    r334 r517  
    1 c ------------------------------------
    2 c ---  Data for chemical routines  ---
    3 c ------------------------------------
    4 c
     1! ------------------------------------
     2! ---  Data for chemical routines  ---
     3! ------------------------------------
     4!
    55      integer nd, nozo, nr, nsza, ntemp, ntau
    6 c
     6!
    77      parameter (nd    = 29)
    88      parameter (nozo  = 7)
    … …  
    1111      parameter (ntemp = 4)
    1212      parameter (ntau  = 8)
    13 c
     13!
    1414      real kb
    1515      parameter (kb = 1.3806e-23)
    16 c
     16!
    1717      common/chimiedata/jphot,colairtab,table_ozo
    18 c
     18!
    1919      real jphot(ntemp,nsza,0:200,nozo,ntau,nd)
    2020      real colairtab(0:200)
    … …  
    2222      real table_ozo(nozo)
    2323      real tautab(ntau)
    24 c
    25       data szatab/0.,  5., 10., 15., 20., 25.,
    26      $            30., 35., 40., 45., 50., 55.,
    27      $            60., 65., 70., 75., 80., 82.,
    28      $            84., 86., 88., 90., 91., 92.,
    29      $            93., 94., 95./
    30 c
     24!
     25      data szatab/0.,  5., 10., 15., 20., 25.,                          &
     26     &            30., 35., 40., 45., 50., 55.,                         &
     27     &            60., 65., 70., 75., 80., 82.,                         &
     28     &            84., 86., 88., 90., 91., 92.,                         &
     29     &            93., 94., 95./
     30!
    3131      data tautab/0., 0.2, 0.4, 0.6, 0.8, 1., 2., 4./
    32 c
     32!
    3333      integer       ncomp
    3434      parameter    (ncomp = 15)
    3535      character*10  nomchem(ncomp)
    36       data          nomchem/"co2","co","o","o1d","o2","o3","h","h2",
    37      $                      "oh","ho2","h2o2", "ch4", "n2", "ar", "h2o"/
    38 c
     36      data          nomchem/"co2","co","o","o1d","o2","o3","h","h2",    &
     37     &                      "oh","ho2","h2o2", "ch4", "n2", "ar", "h2o"/
     38!
    3939      real mmolchem(ncomp)
    40       data mmolchem/44.,28.,16.,16.,32.,48., 1.,
    41      $               2.,17.,33.,34.,16.,28.,40.,18./
     40      data mmolchem/44.,28.,16.,16.,32.,48., 1.,                        &
     41     &               2.,17.,33.,34.,16.,28.,40.,18./

  • trunk/LMDZ.MARS/libf/aeronomars/conc.h

    r38 r517  
    1 c**********************************************************************
     1!**********************************************************************
    22
    3 c       conc.h
     3!       conc.h
    44       
    5 c**********************************************************************
     5!**********************************************************************
    66
    77      integer ncomptot

  • trunk/LMDZ.MARS/libf/aeronomars/thermosphere.F

    r38 r517  
    7979      if (callmoldiff) THEN
    8080        call zerophys(ngridmx*nlayermx*nqmx,zdqmoldiff)
    81         call moldiff(pplay,pplev,pt,pdt,pq,pdq,ptimestep,
     81        call moldiff_red(pplay,pplev,pt,pdt,pq,pdq,ptimestep,
    8282     &                   zzlay,zdteuv,zdtconduc,zdqmoldiff)
    8383      endif

  • trunk/LMDZ.MARS/libf/phymars/comdiurn.h

    r340 r517  
    1       COMMON/comdiurn_r/sinlon(ngridmx),coslon(ngridmx),
    2      s        sinlat(ngridmx),coslat(ngridmx)
     1      COMMON/comdiurn_r/sinlon(ngridmx),coslon(ngridmx),                &
     2     &        sinlat(ngridmx),coslat(ngridmx)
    33      COMMON/comdiurn_l/ldiurn
    44
Note: See TracChangeset for help on using the changeset viewer.