Changeset 1047 for trunk/LMDZ.MARS/libf/phymars/simpleclouds.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/phymars/simpleclouds.F (modified) (6 diffs)

trunk/LMDZ.MARS/libf/phymars/simpleclouds.F

@@ -29 +29 @@
 c                            of the typical CCN profile, Oct. 2011)
 c------------------------------------------------------------------
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 #include "comcstfi.h"
 #include "callkeys.h"
 !#include "tracer.h"
-#include "comgeomfi.h"
-#include "dimradmars.h"
+!#include "comgeomfi.h"
+!#include "dimradmars.h"
+! naerkind is set in scatterers.h (built when compiling with makegcm -s #)
+#include"scatterers.h"
+
 c------------------------------------------------------------------
 c     Arguments:
@@ -52 +55 @@
       real pdq(ngrid,nlay,nq)    ! tendance avant condensation
                                  !   (kg/kg.s-1)
-      REAL tau(ngridmx,naerkind) ! Column dust optical depth at each point
+      REAL tau(ngrid,naerkind)   ! Column dust optical depth at each point
 
 c     Output:
@@ -65 +68 @@
 c     Local variables:
 
-      LOGICAL firstcall
-      DATA firstcall/.true./
-      SAVE firstcall
-
+      LOGICAL,SAVE :: firstcall = .true.
             
-      REAL rhocloud(ngridmx,nlayermx)  ! Cloud density (kg.m-3)
+      REAL rhocloud(ngrid,nlay)  ! Cloud density (kg.m-3)
 
       INTEGER ig,l
 
-      REAL zq(ngridmx,nlayermx,nq)    ! local value of tracers
-      REAL zq0(ngridmx,nlayermx,nq)   ! local initial value of tracers
-      REAL zt(ngridmx,nlayermx)       ! local value of temperature
-      REAL zqsat(ngridmx,nlayermx)    ! saturation
+      REAL zq(ngrid,nlay,nq)    ! local value of tracers
+      REAL zq0(ngrid,nlay,nq)   ! local initial value of tracers
+      REAL zt(ngrid,nlay)       ! local value of temperature
+      REAL zqsat(ngrid,nlay)    ! saturation
       REAL*8 dzq                      ! masse de glace echangee (kg/kg)
       REAL lw                         !Latent heat of sublimation (J.kg-1) 
       REAL,PARAMETER :: To=273.15     ! reference temperature, T=273.15 K
-      real rdusttyp(ngridmx,nlayermx) ! Typical dust geom. mean radius (m)
-      REAL ccntyp(ngridmx,nlayermx)
+      real rdusttyp(ngrid,nlay) ! Typical dust geom. mean radius (m)
+      REAL ccntyp(ngrid,nlay)
                                       ! Typical dust number density (#/kg)
 c     CCN reduction factor
@@ -120 +120 @@
 c     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-      call watersat(ngridmx*nlayermx,zt,pplay,zqsat)
+      call watersat(ngrid*nlay,zt,pplay,zqsat)
 
 c     taux de condensation (kg/kg/s-1) dans les differentes couches
@@ -147 +147 @@
 c     ~~~~~~~~~~~~~~~
       do l=1, nlay
-        do ig=1,ngridmx
+        do ig=1,ngrid
           pdqcloud(ig,l,igcm_h2o_vap)=(zq(ig,l,igcm_h2o_vap)
      &                            -zq0(ig,l,igcm_h2o_vap))/ptimestep
@@ -159 +159 @@
 c     ice crystal radius
       do l=1, nlay
-        do ig=1,ngridmx
+        do ig=1,ngrid
           call updaterice_typ(zq(ig,l,igcm_h2o_ice),
      &       tau(ig,1),pzlay(ig,l),rice(ig,l))