Changeset 517

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:

• README (modified) (1 diff)
• libf/aeronomars/chimiedata.h (modified) (3 diffs)
• libf/aeronomars/conc.h (modified) (1 diff)
• libf/aeronomars/diffusion.h (added)
• libf/aeronomars/moldiff_red.F90 (added)
• libf/aeronomars/moldiffcoeff_red.F (added)
• libf/aeronomars/thermosphere.F (modified) (1 diff)
• libf/phymars/comdiurn.h (modified) (1 diff)

trunk/LMDZ.MARS/README

@@ -1372 +1372 @@
    building the makefile).
    
+== 07/02/12 == JYC
+>> Adding the new molecular diffusion routines (old "moldiff" and "moldiffcoeff"
+   are kept for now and if further tests are needed):
+   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.

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

@@ -1 @@
-c ------------------------------------
-c ---  Data for chemical routines  ---
-c ------------------------------------
-c
+! ------------------------------------
+! ---  Data for chemical routines  ---
+! ------------------------------------
+!
       integer nd, nozo, nr, nsza, ntemp, ntau
-c
+!
       parameter (nd    = 29)
       parameter (nozo  = 7)
@@ -11 +11 @@
       parameter (ntemp = 4)
       parameter (ntau  = 8)
-c
+!
       real kb
       parameter (kb = 1.3806e-23)
-c
+!
       common/chimiedata/jphot,colairtab,table_ozo
-c
+!
       real jphot(ntemp,nsza,0:200,nozo,ntau,nd)
       real colairtab(0:200)
@@ -22 +22 @@
       real table_ozo(nozo)
       real tautab(ntau)
-c
-      data szatab/0.,  5., 10., 15., 20., 25.,
-     $            30., 35., 40., 45., 50., 55.,
-     $            60., 65., 70., 75., 80., 82.,
-     $            84., 86., 88., 90., 91., 92.,
-     $            93., 94., 95./
-c
+!
+      data szatab/0.,  5., 10., 15., 20., 25.,                          &
+     &            30., 35., 40., 45., 50., 55.,                         &
+     &            60., 65., 70., 75., 80., 82.,                         &
+     &            84., 86., 88., 90., 91., 92.,                         &
+     &            93., 94., 95./
+!
       data tautab/0., 0.2, 0.4, 0.6, 0.8, 1., 2., 4./
-c
+!
       integer       ncomp
       parameter    (ncomp = 15)
       character*10  nomchem(ncomp)
-      data          nomchem/"co2","co","o","o1d","o2","o3","h","h2",
-     $                      "oh","ho2","h2o2", "ch4", "n2", "ar", "h2o"/
-c
+      data          nomchem/"co2","co","o","o1d","o2","o3","h","h2",    &
+     &                      "oh","ho2","h2o2", "ch4", "n2", "ar", "h2o"/
+!
       real mmolchem(ncomp)
-      data mmolchem/44.,28.,16.,16.,32.,48., 1.,
-     $               2.,17.,33.,34.,16.,28.,40.,18./
+      data mmolchem/44.,28.,16.,16.,32.,48., 1.,                        &
+     &               2.,17.,33.,34.,16.,28.,40.,18./

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

@@ -1 @@
-c**********************************************************************
+!**********************************************************************
 
-c       conc.h
+!       conc.h
         
-c**********************************************************************
+!**********************************************************************
 
       integer ncomptot

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

@@ -79 +79 @@
       if (callmoldiff) THEN
         call zerophys(ngridmx*nlayermx*nqmx,zdqmoldiff)
-        call moldiff(pplay,pplev,pt,pdt,pq,pdq,ptimestep,
+        call moldiff_red(pplay,pplev,pt,pdt,pq,pdq,ptimestep,
      &                   zzlay,zdteuv,zdtconduc,zdqmoldiff)
       endif

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

@@ -1 @@
-      COMMON/comdiurn_r/sinlon(ngridmx),coslon(ngridmx),
-     s        sinlat(ngridmx),coslat(ngridmx)
+      COMMON/comdiurn_r/sinlon(ngridmx),coslon(ngridmx),                &
+     &        sinlat(ngridmx),coslat(ngridmx)
       COMMON/comdiurn_l/ldiurn