Changeset 552 for trunk/LMDZ.MARS/libf/aeronomars

Timestamp:

Mar 2, 2012, 9:53:27 AM (13 years ago)

Author:

emillour

Message:

Mars GCM:

bug fix in "aeronomars/moldiff_red.F90" (wrong mmol array size in included

subroutine) + adapted extreme limit test for H to altitudes of ~4000km
(compatble with 50 layer model).

bug fix in "nirco2abs.F" index of "co2" and "o" tracers were hard coded as

1 and 3!

updates from FGG of euvheat.F, callkeys.h and inifis.F to have the

"euveff" parameter read from callphys.def

EM

Location:

trunk/LMDZ.MARS/libf/aeronomars

Files:

• euvheat.F (modified) (1 diff)
• inichim_newstart.F (modified) (3 diffs)
• moldiff_red.F90 (modified) (10 diffs)

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

@@ -193 +193 @@
 
         do l=1,nlayermx
-          pdteuv(ig,l)=0.16*jtot(l)/10.
+          pdteuv(ig,l)=euveff*jtot(l)/10.
      &            /(cpnew(ig,l)*pplay(ig,l)/(rnew(ig,l)*zt(ig,l)))
      &                  *(1.52/dist_sol)**2 

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

@@ -72 +72 @@
      &           1.,17.,33.,18.,34.,16.,48./   ! minors
       character*3 tmp ! temporary variable
-      integer ierr,lnblnk
-      external lnblnk
+      integer ierr
 
       logical :: oldnames ! =.true. if old tracer naming convention (q01,...)
@@ -476 +475 @@
 c----------------------------------------------------------------------
       open(210, iostat=ierr,file=
-     & datafile(1:lnblnk(datafile))//'/atmosfera_LMD_may.dat')
+     & trim(datafile)//'/atmosfera_LMD_may.dat')
       if (ierr.ne.0) then
         write(*,*)'Error : cannot open file atmosfera_LMD_may.dat '
         write(*,*)'(in aeronomars/inichim.F)'
-        write(*,*)'It should be in :', datafile(1:lnblnk(datafile)),'/'
-        write(*,*)'1) You can change this directory address in '
-        write(*,*)'   file phymars/datafile.h'
+        write(*,*)'It should be in :', trim(datafile),'/'
+        write(*,*)'1) You can change this path in callphys.def with'
+        write(*,*)'   datadir=/path/to/datafiles/'
         write(*,*)'2) If necessary atmosfera_LMD_may.dat (and others)'
         write(*,*)'   can be obtained online on:'
@@ -489 +488 @@
       endif
       open(220, iostat=ierr,file=
-     & datafile(1:lnblnk(datafile))//'/atmosfera_LMD_min.dat')
+     & trim(datafile)//'/atmosfera_LMD_min.dat')
       if (ierr.ne.0) then
         write(*,*)'Error : cannot open file atmosfera_LMD_min.dat '
         write(*,*)'(in aeronomars/inichim.F)'
-        write(*,*)'It should be in :', datafile(1:lnblnk(datafile)),'/'
-        write(*,*)'1) You can change this directory address in '
-        write(*,*)'   file phymars/datafile.h'
+        write(*,*)'It should be in :', trim(datafile),'/'
+        write(*,*)'1) You can change this path in callphys.def with'
+        write(*,*)'   datadir=/path/to/datafiles/'
         write(*,*)'2) If necessary atmosfera_LMD_min.dat (and others)'
         write(*,*)'   can be obtained online on:'

trunk/LMDZ.MARS/libf/aeronomars/moldiff_red.F90

@@ -314 +314 @@
 
 
-! If Zmax > 2000 km there is a problem / stop 
-
-        if (Zmax .gt. 2000000.) then
+! If Zmax > 4000 km there is a problem / stop 
+
+        if (Zmax .gt. 4000000.) then
         Print*,'Zmax too high',ig,zmax,zmin
         do l=1,nlayermx
@@ -918 +918 @@
         SUBROUTINE QMNEW(Q1,DQ,Q2,dtime,nl,nq,gc,ig)
         IMPLICIT NONE
+#include "dimensions.h"
 
         INTEGER :: nl,nq
         INTEGER :: l,iq,ig
         INTEGER,dimension(nq) :: gc
-        REAL,DIMENSION(nl,nq) :: Q1,DQ
+        REAL,DIMENSION(nl,nqmx) :: Q1,DQ
         REAL*8,DIMENSION(nl,nq) :: Q2
         REAL :: dtime
@@ -951 +952 @@
         SUBROUTINE MMOY(massemoy,mmol,qq,gc,nl,nq)
         IMPLICIT NONE
+#include "dimensions.h"
 
         INTEGER :: nl,nq,l
@@ -956 +958 @@
         REAL*8,DIMENSION(nl,nq) :: qq
         REAL*8,DIMENSION(nl) :: massemoy
-        REAL,DIMENSION(nq) :: MMOL
+        REAL,DIMENSION(nqmx) :: MMOL
 
 
@@ -1034 +1036 @@
      & Nraf,Nrafk,Rraf,Rrafk,il,nl,nq,nlx,ig)
         IMPLICIT NONE
+#include "dimensions.h"
         
         INTEGER :: nl,nq,il,l,i,iq,nlx,iz,ig
@@ -1044 +1047 @@
         REAL*8, DIMENSION(nl,nq) :: Qraf,Rrafk,Nrafk
         REAL*8 :: facZ,dZ,H
-        REAL,DIMENSION(nq) :: mmol
+        REAL,DIMENSION(nqmx) :: mmol
         masseU=1.660538782d-27
         kbolt=1.3806504d-23
@@ -1354 +1357 @@
      &    pp,M,gc,nl,nq,nlx)
         IMPLICIT NONE
+#include "dimensions.h"
         INTEGER :: nl,nq,nlx,il,nn,iP
         INTEGER,DIMENSION(1) :: indP
@@ -1359 +1363 @@
         REAL*8,DIMENSION(nl) :: Z,P,T
         REAL*8,DIMENSION(nl,nq) :: Q,Nk,Rk
-        REAL,DIMENSION(nq) :: M
+        REAL,DIMENSION(nqmx) :: M
         REAL*8,DIMENSION(nq) :: nNew
         REAL*8,DIMENSION(nlx) :: pp,tt,tnew
@@ -1447 +1451 @@
      &   ,pp,M,gc,nl,nq,nlx,facM)
         IMPLICIT NONE
+#include "dimensions.h"
         INTEGER :: nl,nq,nlx,il,nn,iP
         INTEGER,DIMENSION(1) :: indP
@@ -1452 +1457 @@
         REAL*8,DIMENSION(nl) :: Z,P,T
         REAL*8,DIMENSION(nl,nq) :: Q,Nk,Rk
-        REAL,DIMENSION(nq) :: M
+        REAL,DIMENSION(nqmx) :: M
         REAL*8,DIMENSION(nq) :: nNew
         REAL*8,DIMENSION(nlx) :: pp,rhonew,tt,tnew