Changeset 1047 for trunk/LMDZ.MARS/libf/aeronomars/perosat.F

Timestamp:

Sep 23, 2013, 9:56:47 AM (11 years ago)

Author:

emillour

Message:

Mars GCM:

• IMPORTANT CHANGE: Removed all reference/use of ngridmx (dimphys.h) in routines (necessary prerequisite to using parallel dynamics); in most cases this just means adding 'ngrid' as routine argument, and making local saved variables allocatable (and allocated at first call). In the process, had to convert many *.h files to equivalent modules: yomaer.h => yomaer_h.F90 , surfdat.h => surfdat_h.F90 , comsaison.h => comsaison_h.F90 , yomlw.h => yomlw_h.F90 , comdiurn.h => comdiurn_h.F90 , dimradmars.h => dimradmars_mod.F90 , comgeomfi.h => comgeomfi_h.F90, comsoil.h => comsoil_h.F90 , slope.h => slope_mod.F90
• Also updated EOF routines, everything is now in eofdump_mod.F90
• Removed unused routine lectfux.F (in dyn3d)

EM

File:

• trunk/LMDZ.MARS/libf/aeronomars/perosat.F (modified) (8 diffs)

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

@@ -1 @@
-      SUBROUTINE perosat(ig, ptimestep,
+      SUBROUTINE perosat(ngrid,nlayer,nq,ig, ptimestep,
      $                   pplev, pplay, zt,
      &                   zy, pdqcloud, pdqscloud)
-      use tracer_mod, only: nqmx, igcm_h2o2, mmol
+      
+      use tracer_mod, only: igcm_h2o2, mmol
+      use conc_mod, only: mmean
       IMPLICIT NONE
 
@@ -22 +24 @@
 c   -------------
 
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 #include "comcstfi.h"
-#include "chimiedata.h"
+!#include "chimiedata.h"
 !#include "tracer.h"
-#include "conc.h"
+!#include "conc.h"
 c
 c   arguments:
 c   ----------
 
+      integer,intent(in) :: ngrid   ! number of atmospheric columns
+      integer,intent(in) :: nlayer  ! number of atmospheric layers
+      integer,intent(in) :: nq      ! number of tracers
       INTEGER ig
       REAL ptimestep                ! pas de temps physique (s)
-      REAL pplev(ngridmx,nlayermx+1)! pression aux inter-couches (Pa)
-      REAL pplay(ngridmx,nlayermx)  ! pression au milieu des couches (Pa)
-      REAL zt(nlayermx)             ! temperature au centre des couches (K)
+      REAL pplev(ngrid,nlayer+1)    ! pression aux inter-couches (Pa)
+      REAL pplay(ngrid,nlayer)      ! pression au milieu des couches (Pa)
+      REAL zt(nlayer)               ! temperature au centre des couches (K)
                                     ! deja mise a jour dans calchim
 
 c   Traceurs :
-      real zy(nlayermx,nqmx)        ! traceur (fraction molaire sortie chimie)
-      real pdqcloud(ngridmx,nlayermx,nqmx) ! tendance condensation (kg/kg.s-1)
-      real pdqscloud(ngridmx,nqmx)         ! flux en surface (kg.m-2.s-1)
+      real zy(nlayer,nq)        ! traceur (fraction molaire sortie chimie)
+      real pdqcloud(ngrid,nlayer,nq) ! tendance condensation (kg/kg.s-1)
+      real pdqscloud(ngrid,nq)         ! flux en surface (kg.m-2.s-1)
       
 c   local:
@@ -49 +54 @@
       INTEGER l,iq
 
-      REAL zysat(nlayermx)
-      REAL zynew(nlayermx)             ! mole fraction after condensation
+      REAL zysat(nlayer)
+      REAL zynew(nlayer)               ! mole fraction after condensation
       REAL psat_hg                     ! pression saturante (mm Hg)
       REAL psat_hpa                    ! pression saturante (hPa)
@@ -57 +62 @@
 c     Pour diagnostique :
 c     ~~~~~~~~~~~~~~~~~
-      REAL taucond(ngridmx,nlayermx)   ! taux de condensation (kg/kg/s-1)
+      REAL taucond(ngrid,nlayer)   ! taux de condensation (kg/kg/s-1)
 
 c-----------------------------------------------------------------------
@@ -80 +85 @@
 c       domaine d'application: T < 220 K
 c
-        do l = 1,nlayermx
+        do l = 1,nlayer
 
 c       print *,'ig=',ig,' l=',l,' igcm_h2o2=',igcm_h2o2
@@ -103 +108 @@
 c       (Pour diagnostic seulement !)
 c
-        do l=1, nlayermx
+        do l=1, nlayer
           taucond(ig,l)=max((zy(l,igcm_h2o2)-zysat(l))*mmol(igcm_h2o2)
      $                         /(mmean(ig,l)*ptimestep),0.)
@@ -111 +116 @@
 c       ~~~~~~~~~~~~~~~~~~~~~~~~~~
 c
-        do l=nlayermx,2, -1
+        do l=nlayer,2, -1
            if (zynew(l).gt.zysat(l)) then
               zynew(l-1) =  zynew(l-1) + (zynew(l) - zysat(l))
@@ -135 +140 @@
 c       ~~~~~~~~~~~~~~~
 c
-        do l=1, nlayermx
+        do l=1, nlayer
           pdqcloud(ig,l,igcm_h2o2)=(zynew(l) - zy(l,igcm_h2o2))
      &                     *mmol(igcm_h2o2)/(mmean(ig,l)*ptimestep)