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

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

@@ -10 +10 @@
      &                      igcm_dust_number, igcm_ccn_mass,
      &                      igcm_ccn_number
+      use conc_mod, only: mmean
       implicit none
       
@@ -33 +34 @@
 c           A. Spiga, optimization (February 2012)
 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"
 #include "microphys.h"
-#include "conc.h"
+!#include "conc.h"
 c------------------------------------------------------------------
 c     Inputs:
@@ -57 +58 @@
       REAL pdq(ngrid,nlay,nq)    ! tendance avant condensation
                                  !   (kg/kg.s-1)
-      REAL tauscaling(ngridmx)     ! Convertion factor for qdust and Ndust
+      REAL tauscaling(ngrid)     ! Convertion factor for qdust and Ndust
 
 c     Outputs:
@@ -77 +78 @@
       INTEGER ig,l,i
       
-      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 lw                         !Latent heat of sublimation (J.kg-1) 
       REAL cste
@@ -101 +102 @@
       REAL rice(ngrid,nlay)      ! Ice mass mean radius (m)
                                  ! (r_c in montmessin_2004)
-      REAL rhocloud(ngridmx,nlayermx)  ! Cloud density (kg.m-3)
-      REAL rdust(ngridmx,nlayermx) ! Dust geometric mean radius (m)
+      REAL rhocloud(ngrid,nlay)  ! Cloud density (kg.m-3)
+      REAL rdust(ngrid,nlay) ! Dust geometric mean radius (m)
 
       REAL res      ! Resistance growth
@@ -259 +260 @@
       dev2 = 1. / ( sqrt(2.) * sigma_ice )
 
-      call watersat(ngridmx*nlayermx,zt,pplay,zqsat)
+      call watersat(ngrid*nlay,zt,pplay,zqsat)
             
       countcells = 0