Changeset 1047 for trunk/LMDZ.MARS/libf

Timestamp:

Sep 23, 2013, 9:56:47 AM (12 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

Location:

trunk/LMDZ.MARS/libf

Files:

• aeronomars/calchim.F90 (modified) (15 diffs)
• aeronomars/chemthermos.F90 (modified) (1 diff)
• aeronomars/conc.h (deleted)
• aeronomars/conc_mod.F90 (added)
• aeronomars/concentrations.F (modified) (9 diffs)
• aeronomars/conduction.F (modified) (11 diffs)
• aeronomars/deposition.F (modified) (2 diffs)
• aeronomars/euvheat.F90 (modified) (10 diffs)
• aeronomars/inichim_newstart.F90 (modified) (8 diffs)
• aeronomars/jthermcalc.F (modified) (2 diffs)
• aeronomars/moldiff.F (modified) (5 diffs)
• aeronomars/moldiff_red.F90 (modified) (22 diffs)
• aeronomars/moldiffcoeff.F (modified) (1 diff)
• aeronomars/moldiffcoeff_red.F (modified) (1 diff)
• aeronomars/molvis.F (modified) (4 diffs)
• aeronomars/perosat.F (modified) (8 diffs)
• aeronomars/surfacearea.F (modified) (2 diffs)
• aeronomars/thermosphere.F (modified) (2 diffs)
• dyn3d/ini_archive.F (modified) (2 diffs)
• dyn3d/lect_start_archive.F (modified) (14 diffs)
• dyn3d/lectflux.F (deleted)
• dyn3d/newstart.F (modified) (5 diffs)
• dyn3d/start2archive.F (modified) (5 diffs)
• dyn3d/write_archive.F (modified) (1 diff)
• phymars/aerkind.h (modified) (1 diff)
• phymars/aeropacity.F (modified) (17 diffs)
• phymars/aeroptproperties.F (modified) (11 diffs)
• phymars/albedocaps.F90 (modified) (2 diffs)
• phymars/blendrad.F (modified) (1 diff)
• phymars/calldrag_noro.F (modified) (6 diffs)
• phymars/callradite.F (modified) (17 diffs)
• phymars/callsedim.F (modified) (3 diffs)
• phymars/co2snow.F (modified) (2 diffs)
• phymars/comdiurn.h (deleted)
• phymars/comdiurn_h.F90 (added)
• phymars/comgeomfi.h (deleted)
• phymars/comgeomfi_h.F90 (added)
• phymars/comsaison.h (deleted)
• phymars/comsaison_h.F90 (added)
• phymars/comsoil.h (deleted)
• phymars/comsoil_h.F90 (added)
• phymars/convadj.F (modified) (5 diffs)
• phymars/dimphys.h (modified) (1 diff)
• phymars/dimradmars.h (deleted)
• phymars/dimradmars_mod.F90 (added)
• phymars/drag_noro.F (modified) (3 diffs)
• phymars/dustdevil.F (modified) (8 diffs)
• phymars/dustlift.F (modified) (2 diffs)
• phymars/eofdump.F (deleted)
• phymars/eofdump.h (deleted)
• phymars/eofdump_mod.F90 (added)
• phymars/flusv.F (modified) (4 diffs)
• phymars/getslopes.F90 (modified) (3 diffs)
• phymars/gwprofil.F (modified) (2 diffs)
• phymars/gwstress.F (modified) (1 diff)
• phymars/improvedclouds.F (modified) (6 diffs)
• phymars/ineofdump.F (deleted)
• phymars/inifis.F (modified) (5 diffs)
• phymars/initracer.F (modified) (2 diffs)
• phymars/iniwrite.F (modified) (3 diffs)
• phymars/iniwritesoil.F90 (modified) (5 diffs)
• phymars/lwb.F (modified) (1 diff)
• phymars/lwdiff.F (modified) (1 diff)
• phymars/lwflux.F (modified) (4 diffs)
• phymars/lwi.F (modified) (1 diff)
• phymars/lwmain.F (modified) (4 diffs)
• phymars/lwtt.F (modified) (1 diff)
• phymars/lwu.F (modified) (2 diffs)
• phymars/lwxb.F (modified) (1 diff)
• phymars/lwxd.F (modified) (3 diffs)
• phymars/lwxn.F (modified) (1 diff)
• phymars/newcondens.F (modified) (9 diffs)
• phymars/newsedim.F (modified) (5 diffs)
• phymars/nirco2abs.F (modified) (5 diffs)
• phymars/nlte_tcool.F (modified) (2 diffs)
• phymars/nltecool.F (modified) (2 diffs)
• phymars/nlthermeq.F (modified) (2 diffs)
• phymars/orodrag.F (modified) (3 diffs)
• phymars/orosetup.F (modified) (2 diffs)
• phymars/phyetat0.F (modified) (20 diffs)
• phymars/physdem.F (modified) (18 diffs)
• phymars/physiq.F (modified) (55 diffs)
• phymars/read_dust_scenario.F90 (modified) (1 diff)
• phymars/simpleclouds.F (modified) (6 diffs)
• phymars/slope.h (deleted)
• phymars/slope_mod.F90 (added)
• phymars/soil.F (modified) (5 diffs)
• phymars/soil_settings.F (modified) (5 diffs)
• phymars/soil_tifeedback.F (modified) (3 diffs)
• phymars/suaer.F90 (modified) (6 diffs)
• phymars/sulw.F (deleted)
• phymars/surfdat.h (deleted)
• phymars/surfdat_h.F90 (added)
• phymars/surfini.F (modified) (13 diffs)
• phymars/swmain.F (modified) (3 diffs)
• phymars/swr_fouquart.F (modified) (3 diffs)
• phymars/swr_toon.F (modified) (2 diffs)
• phymars/tabfi.F (modified) (4 diffs)
• phymars/testphys1d.F (modified) (7 diffs)
• phymars/updatereffrad.F (modified) (4 diffs)
• phymars/vdif_kc.F (modified) (11 diffs)
• phymars/vdifc.F (modified) (10 diffs)
• phymars/vlz_fi.F (modified) (12 diffs)
• phymars/watercloud.F (modified) (5 diffs)
• phymars/writediagfi.F (modified) (3 diffs)
• phymars/writediagsoil.F90 (modified) (3 diffs)
• phymars/yomaer.h (deleted)
• phymars/yomaer_h.F90 (added)
• phymars/yomlw.h (deleted)
• phymars/yomlw_h.F90 (added)

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

@@ -1 @@
-      subroutine calchim(nq,                                                &
+      subroutine calchim(ngrid,nlayer,nq,                                   &
                          ptimestep,pplay,pplev,pt,pdt,dist_sol,mu0,         &
                          zzlev,zzlay,zday,pq,pdq,dqchim,dqschim,dqcloud,    &
@@ -13 +13 @@
                             igcm_noplus, igcm_n2plus, igcm_hplus,         &
                             igcm_hco2plus, igcm_elec, mmol
+      use conc_mod, only: mmean ! mean molecular mass of the atmosphere
+
       implicit none
 
@@ -38 +40 @@
 !
 !    ptimestep                  timestep (s)
-!    pplay(ngridmx,nlayermx)    Pressure at the middle of the layers (Pa)
-!    pplev(ngridmx,nlayermx+1)  Intermediate pressure levels (Pa)
-!    pt(ngridmx,nlayermx)       Temperature (K)
-!    pdt(ngridmx,nlayermx)      Temperature tendency (K)
-!    pu(ngridmx,nlayermx)       u component of the wind (ms-1)
-!    pdu(ngridmx,nlayermx)      u component tendency (K)
-!    pv(ngridmx,nlayermx)       v component of the wind (ms-1)
-!    pdv(ngridmx,nlayermx)      v component tendency (K)
+!    pplay(ngrid,nlayer)    Pressure at the middle of the layers (Pa)
+!    pplev(ngrid,nlayer+1)  Intermediate pressure levels (Pa)
+!    pt(ngrid,nlayer)       Temperature (K)
+!    pdt(ngrid,nlayer)      Temperature tendency (K)
+!    pu(ngrid,nlayer)       u component of the wind (ms-1)
+!    pdu(ngrid,nlayer)      u component tendency (K)
+!    pv(ngrid,nlayer)       v component of the wind (ms-1)
+!    pdv(ngrid,nlayer)      v component tendency (K)
 !    dist_sol                   distance of the sun (AU)
-!    mu0(ngridmx)               cos of solar zenith angle (=1 when sun at zenith)
-!    pq(ngridmx,nlayermx,nqmx)  Advected fields, ie chemical species here
-!    pdq(ngridmx,nlayermx,nqmx) Previous tendencies on pq
-!    tauref(ngridmx)            Optical depth at 7 hPa
-!    co2ice(ngridmx)            co2 ice surface layer (kg.m-2)
-!    surfdust(ngridmx,nlayermx) dust surface area (m2/m3)
-!    surfice(ngridmx,nlayermx)  ice surface area (m2/m3)
+!    mu0(ngrid)               cos of solar zenith angle (=1 when sun at zenith)
+!    pq(ngrid,nlayer,nq)  Advected fields, ie chemical species here
+!    pdq(ngrid,nlayer,nq) Previous tendencies on pq
+!    tauref(ngrid)            Optical depth at 7 hPa
+!    co2ice(ngrid)            co2 ice surface layer (kg.m-2)
+!    surfdust(ngrid,nlayer) dust surface area (m2/m3)
+!    surfice(ngrid,nlayer)  ice surface area (m2/m3)
 !
 !  Output:
 !
-!    dqchim(ngridmx,nlayermx,nqmx) ! tendencies on pq due to chemistry
-!    dqschim(ngridmx,nqmx)         ! tendencies on qsurf 
-!
-!=======================================================================
-
-#include "dimensions.h"
-#include "dimphys.h"
+!    dqchim(ngrid,nlayer,nq) ! tendencies on pq due to chemistry
+!    dqschim(ngrid,nq)         ! tendencies on qsurf 
+!
+!=======================================================================
+
+!#include "dimensions.h"
+!#include "dimphys.h"
 #include "chimiedata.h"
 !#include "tracer.h"
 #include "comcstfi.h"
 #include "callkeys.h"
-#include "conc.h"
+!#include "conc.h"
 
 !     input:
 
+      integer,intent(in) :: ngrid ! number of atmospheric columns
+      integer,intent(in) :: nlayer ! number of atmospheric layers
       integer,intent(in) :: nq ! number of tracers
       real :: ptimestep
-      real :: pplay(ngridmx,nlayermx)    ! pressure at the middle of the layers
-      real :: zzlay(ngridmx,nlayermx)    ! pressure at the middle of the layers
-      real :: pplev(ngridmx,nlayermx+1)  ! intermediate pressure levels
-      real :: zzlev(ngridmx,nlayermx+1)  ! altitude at layer boundaries
-      real :: pt(ngridmx,nlayermx)       ! temperature
-      real :: pdt(ngridmx,nlayermx)      ! temperature tendency
-      real :: pu(ngridmx,nlayermx)       ! u component of the wind (m.s-1)
-      real :: pdu(ngridmx,nlayermx)      ! u component tendency
-      real :: pv(ngridmx,nlayermx)       ! v component of the wind (m.s-1)
-      real :: pdv(ngridmx,nlayermx)      ! v component tendency
+      real :: pplay(ngrid,nlayer)    ! pressure at the middle of the layers
+      real :: zzlay(ngrid,nlayer)    ! pressure at the middle of the layers
+      real :: pplev(ngrid,nlayer+1)  ! intermediate pressure levels
+      real :: zzlev(ngrid,nlayer+1)  ! altitude at layer boundaries
+      real :: pt(ngrid,nlayer)       ! temperature
+      real :: pdt(ngrid,nlayer)      ! temperature tendency
+      real :: pu(ngrid,nlayer)       ! u component of the wind (m.s-1)
+      real :: pdu(ngrid,nlayer)      ! u component tendency
+      real :: pv(ngrid,nlayer)       ! v component of the wind (m.s-1)
+      real :: pdv(ngrid,nlayer)      ! v component tendency
       real :: dist_sol                   ! distance of the sun (AU)
-      real :: mu0(ngridmx)               ! cos of solar zenith angle (=1 when sun at zenith)
-      real :: pq(ngridmx,nlayermx,nq)  ! tracers mass mixing ratio
-      real :: pdq(ngridmx,nlayermx,nq) ! previous tendencies
+      real :: mu0(ngrid)               ! cos of solar zenith angle (=1 when sun at zenith)
+      real :: pq(ngrid,nlayer,nq)  ! tracers mass mixing ratio
+      real :: pdq(ngrid,nlayer,nq) ! previous tendencies
       real :: zday                       ! date (time since Ls=0, in martian days)
-      real :: tauref(ngridmx)            ! optical depth at 7 hPa
-      real :: co2ice(ngridmx)            ! co2 ice surface layer (kg.m-2)
-      real :: surfdust(ngridmx,nlayermx) ! dust surface area (m2/m3)
-      real :: surfice(ngridmx,nlayermx)  !  ice surface area (m2/m3)
+      real :: tauref(ngrid)            ! optical depth at 7 hPa
+      real :: co2ice(ngrid)            ! co2 ice surface layer (kg.m-2)
+      real :: surfdust(ngrid,nlayer) ! dust surface area (m2/m3)
+      real :: surfice(ngrid,nlayer)  !  ice surface area (m2/m3)
 
 !     output:
 
-      real :: dqchim(ngridmx,nlayermx,nq) ! tendencies on pq due to chemistry
-      real :: dqschim(ngridmx,nq)         ! tendencies on qsurf 
-      real :: dqcloud(ngridmx,nlayermx,nq)! tendencies on pq due to condensation
-      real :: dqscloud(ngridmx,nq)        ! tendencies on qsurf 
+      real :: dqchim(ngrid,nlayer,nq) ! tendencies on pq due to chemistry
+      real :: dqschim(ngrid,nq)         ! tendencies on qsurf 
+      real :: dqcloud(ngrid,nlayer,nq)! tendencies on pq due to condensation
+      real :: dqscloud(ngrid,nq)        ! tendencies on qsurf 
 
 !     local variables:
@@ -143 +147 @@
 
       real    :: latvl1, lonvl1
-      real    :: zq(ngridmx,nlayermx,nq) ! pq+pdq*ptimestep before chemistry
+      real    :: zq(ngrid,nlayer,nq) ! pq+pdq*ptimestep before chemistry
                                            ! new mole fraction after
-      real    :: zt(ngridmx,nlayermx)      ! temperature
-      real    :: zu(ngridmx,nlayermx)      ! u component of the wind
-      real    :: zv(ngridmx,nlayermx)      ! v component of the wind
+      real    :: zt(ngrid,nlayer)      ! temperature
+      real    :: zu(ngrid,nlayer)      ! u component of the wind
+      real    :: zv(ngrid,nlayer)      ! v component of the wind
       real    :: taucol                    ! optical depth at 7 hPa
 
@@ -155 +159 @@
 !     for each column of atmosphere:
 
-      real :: zpress(nlayermx)       !  Pressure (mbar)
-      real :: zdens(nlayermx)        !  Density  (cm-3)
-      real :: ztemp(nlayermx)        !  Temperature (K)
-      real :: zlocal(nlayermx)       !  Altitude (km)
-      real :: zycol(nlayermx,nq)   !  Composition (mole fractions)
+      real :: zpress(nlayer)       !  Pressure (mbar)
+      real :: zdens(nlayer)        !  Density  (cm-3)
+      real :: ztemp(nlayer)        !  Temperature (K)
+      real :: zlocal(nlayer)       !  Altitude (km)
+      real :: zycol(nlayer,nq)   !  Composition (mole fractions)
       real :: szacol                 !  Solar zenith angle
-      real :: surfice1d(nlayermx)    !  Ice surface area (cm2/cm3)
-      real :: surfdust1d(nlayermx)   !  Dust surface area (cm2/cm3)
-      real :: jo3(nlayermx)          !  Photodissociation rate O3->O1D (s-1)
+      real :: surfice1d(nlayer)    !  Ice surface area (cm2/cm3)
+      real :: surfdust1d(nlayer)   !  Dust surface area (cm2/cm3)
+      real :: jo3(nlayer)          !  Photodissociation rate O3->O1D (s-1)
 
 !     for output:
@@ -169 +173 @@
       logical :: output                 ! to issue calls to writediagfi and stats
       parameter (output = .true.)
-      real :: jo3_3d(ngridmx,nlayermx)  ! Photodissociation rate O3->O1D (s-1)
+      real :: jo3_3d(ngrid,nlayer)  ! Photodissociation rate O3->O1D (s-1)
 
 !=======================================================================
@@ -592 +596 @@
 !=======================================================================
 
-      do ig = 1,ngridmx
+      do ig = 1,ngrid
          
          foundswitch = 0
-         do l = 1,nlayermx
+         do l = 1,nlayer
             do i = 1,nbq
                iq = niq(i) ! get tracer index
@@ -626 +630 @@
             end if
             if (.not. thermochem) then
-               lswitch = min(50,nlayermx+1)
+               lswitch = min(50,nlayer+1)
             end if
 
-         end do ! of do l=1,nlayermx
+         end do ! of do l=1,nlayer
 
          szacol = acos(mu0(ig))*180./pi
@@ -647 +651 @@
 !        ozone photolysis, for output
 
-            do l = 1,nlayermx
+            do l = 1,nlayer
                jo3_3d(ig,l) = jo3(l)
             end do
@@ -653 +657 @@
 !        condensation of h2o2
 
-            call perosat(ig,ptimestep,pplev,pplay,                 &
+            call perosat(ngrid, nlayer, nq,                        &
+                         ig,ptimestep,pplev,pplay,                 &
                          ztemp,zycol,dqcloud,dqscloud)
          end if
@@ -667 +672 @@
 
          if (depos) then
-            call deposition(ig, ig_vl1, pplay, pplev, zzlay, zzlev,& 
+            call deposition(ngrid, nlayer, nq,                      &
+                            ig, ig_vl1, pplay, pplev, zzlay, zzlev, & 
                             zu, zv, zt, zycol, ptimestep, co2ice)
          end if
@@ -679 +685 @@
 
 !     tendency for the most abundant species = - sum of others
-         do l = 1,nlayermx
+         do l = 1,nlayer
             iloc=maxloc(zycol(l,:))
             iqmax=iloc(1)
@@ -691 +697 @@
                end if
             end do
-         end do ! of do l = 1,nlayermx
+         end do ! of do l = 1,nlayer
 
 !=======================================================================
@@ -697 +703 @@
 !=======================================================================
 
-      end do ! of do ig=1,ngridmx
+      end do ! of do ig=1,ngrid
 
 !=======================================================================
@@ -707 +713 @@
 
       if (photochem .and. output) then
-         if (ngridmx > 1) then
-            call writediagfi(ngridmx,'jo3','j o3->o1d',    &
+         if (ngrid > 1) then
+            call writediagfi(ngrid,'jo3','j o3->o1d',    &
                              's-1',3,jo3_3d(1,1))
            if (callstats) then
-              call wstats(ngridmx,'jo3','j o3->o1d',       &
+              call wstats(ngrid,'jo3','j o3->o1d',       &
                           's-1',3,jo3_3d(1,1))
            endif
-         end if ! of if (ngridmx.gt.1)
+         end if ! of if (ngrid.gt.1)
       end if ! of if (output)
 

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

@@ -33 +33 @@
 #include "comcstfi.h"
 #include "callkeys.h"
-#include "comdiurn.h"
+!#include "comdiurn.h"
 #include "param.h"
 #include "param_v4.h"

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

@@ -1 @@
-      SUBROUTINE concentrations(nq,pplay,pt,pdt,pq,pdq,ptimestep)
+      SUBROUTINE concentrations(ngrid,nlayer,nq,
+     &                          pplay,pt,pdt,pq,pdq,ptimestep)
                                              
       use tracer_mod, only: igcm_co2, igcm_co, igcm_o, igcm_o1d,
@@ -9 +10 @@
      &                      igcm_nplus, igcm_noplus, igcm_n2plus,
      &                      igcm_hplus, igcm_hco2plus, mmol
+      use conc_mod, only: mmean, Akknew, rnew, cpnew
+                         
       implicit none
 
@@ -14 +17 @@
 ! CALCULATION OF MEAN MOLECULAR MASS, Cp, Akk and R
 !
-! mmean(ngridmx,nlayermx)       amu
-! cpnew(ngridmx,nlayermx)       J/kg/K
-! rnew(ngridmx,nlayermx)        J/kg/K
-! akknew(ngridmx,nlayermx)      coefficient of thermal concduction
+! mmean(ngrid,nlayer)   amu
+! cpnew(ngrid,nlayer)   J/kg/K
+! rnew(ngrid,nlayer)    J/kg/K
+! akknew(ngrid,nlayer)  coefficient of thermal concduction
 !
 ! version: April 2012 - Franck Lefevre
@@ -24 +27 @@
 !     declarations
  
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 #include "comcstfi.h"
 #include "callkeys.h"
-#include "comdiurn.h"
+!#include "comdiurn.h"
 #include "chimiedata.h"
 !#include "tracer.h"
-#include "conc.h"
+!#include "conc.h"
 
 !     input/output
 
+      integer,intent(in) :: ngrid ! number of atmospheric columns
+      integer,intent(in) :: nlayer ! number of atmospheric layers
       integer,intent(in) :: nq ! number of tracers
-      real,intent(in) :: pplay(ngridmx,nlayermx)
-      real,intent(in) :: pt(ngridmx,nlayermx)
-      real,intent(in) :: pdt(ngridmx,nlayermx)
-      real,intent(in) :: pq(ngridmx,nlayermx,nq)
-      real,intent(in) :: pdq(ngridmx,nlayermx,nq)
+      real,intent(in) :: pplay(ngrid,nlayer)
+      real,intent(in) :: pt(ngrid,nlayer)
+      real,intent(in) :: pdt(ngrid,nlayer)
+      real,intent(in) :: pq(ngrid,nlayer,nq)
+      real,intent(in) :: pdq(ngrid,nlayer,nq)
       real,intent(in) :: ptimestep
 
@@ -49 +54 @@
       integer,allocatable,save :: niq(:)
       real          :: ni(nq), ntot
-      real          :: zq(ngridmx, nlayermx, nq)
-      real          :: zt(ngridmx, nlayermx)
+      real          :: zq(ngrid, nlayer, nq)
+      real          :: zt(ngrid, nlayer)
       real,allocatable,save    :: aki(:)
       real,allocatable,save    :: cpi(:)
@@ -243 +248 @@
 !     update temperature
 
-      do l = 1,nlayermx
-         do ig = 1,ngridmx
+      do l = 1,nlayer
+         do ig = 1,ngrid
             zt(ig,l) = pt(ig,l) + pdt(ig,l)*ptimestep
          end do
@@ -251 +256 @@
 !     update tracers
 
-      do l = 1,nlayermx
-         do ig = 1,ngridmx
+      do l = 1,nlayer
+         do ig = 1,ngrid
             do i = 1,nbq
                iq = niq(i) 
@@ -266 +271 @@
       mmean(:,:)  = 0.
 
-      do l = 1,nlayermx
-         do ig = 1,ngridmx
+      do l = 1,nlayer
+         do ig = 1,ngrid
             do i = 1,nbq
                iq = niq(i) 
@@ -283 +288 @@
       akknew(:,:) = 0.
 
-      do l = 1,nlayermx
-         do ig = 1,ngridmx
+      do l = 1,nlayer
+         do ig = 1,ngrid
             ntot = pplay(ig,l)/(1.381e-23*zt(ig,l))*1.e-6  ! in #/cm3
             do i = 1,nbq

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

@@ -1 @@
-       SUBROUTINE conduction(ptimestep,pplay,pplev,pt,pdt,
+       SUBROUTINE conduction(ngrid,nlayer,ptimestep,pplay,pplev,pt,pdt,
      $                   tsurf,zzlev,zzlay,zdtconduc)
 
+      use conc_mod, only: Akknew, rnew, cpnew
       IMPLICIT NONE
 
@@ -16 +17 @@
 c-----------------------------------------------------------------------
 
-#include "dimensions.h"
-#include "dimphys.h"
-#include "comcstfi.h"
-#include "surfdat.h"
-#include "chimiedata.h"
-#include "conc.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
+!#include "comcstfi.h"
+!#include "surfdat.h"
+!#include "chimiedata.h"
+!#include "conc.h"
 
 c   arguments:
 c   ----------
 
-      REAL ptimestep
-      REAL pplay(ngridmx,nlayermx)
-      real pplev(ngridmx,nlayermx+1)
-      REAL zzlay(ngridmx,nlayermx)
-      real zzlev(ngridmx,nlayermx+1)
-      REAL pt(ngridmx,nlayermx)
-      real pdt(ngridmx,nlayermx)
-      real tsurf(ngridmx)
+      integer,intent(in) :: ngrid ! number of atmospheric columns
+      integer,intent(in) :: nlayer ! number of atmospheric layers
+      real,intent(in) :: ptimestep
+      REAL,intent(in) :: pplay(ngrid,nlayer)
+      real,intent(in) :: pplev(ngrid,nlayer+1)
+      REAL,intent(in) :: zzlay(ngrid,nlayer)
+      real,intent(in) :: zzlev(ngrid,nlayer+1)
+      REAL,intent(in) :: pt(ngrid,nlayer)
+      real,intent(in) :: pdt(ngrid,nlayer)
+      real,intent(in) :: tsurf(ngrid)
 
-      real zdtconduc(ngridmx,nlayermx)
+      real,intent(out) :: zdtconduc(ngrid,nlayer)
 
 c   local:
@@ -41 +44 @@
 
       INTEGER i,ig,l
-      INTEGER,SAVE :: ngrid, nz
       real Akk
       real,save :: phitop
       real m,tmean
-      REAL alpha(nlayermx)
-      real zt(nlayermx)
-      REAL lambda(nlayermx)
-      real muvol(nlayermx)
-      REAL C(nlayermx)
-      real D(nlayermx)
-      real den(nlayermx)
-      REAL pdtc(nlayermx)
-      real zlay(nlayermx)
-      real zlev(nlayermx+1)
+      REAL alpha(nlayer)
+      real zt(nlayer)
+      REAL lambda(nlayer)
+      real muvol(nlayer)
+      REAL C(nlayer)
+      real D(nlayer)
+      real den(nlayer)
+      REAL pdtc(nlayer)
+      real zlay(nlayer)
+      real zlev(nlayer+1)
 
 c   constants used locally
@@ -78 +80 @@
 ! Initialize phitop
         phitop=0.0
-! Initialize ngrid and nz
-        ngrid=ngridmx
-        nz=nlayermx
         
         firstcall = .false.
@@ -93 +92 @@
         zlev(1)=zzlev(ig,1)
       
-        do i=2,nz
+        do i=2,nlayer
 
           zt(i)=pt(ig,i)+pdt(ig,i)*ptimestep 
@@ -107 +106 @@
         enddo
         
-c        zlev(nz+1)= zlev(nz)
-c     &         -log(max(pplev(ig,nz+1),1.e-30)/pplev(ig,nz))
-c     &           *Rnew(ig,nz)*tmean/g
-c        if(pplev(ig,nz+1).eq.0.) 
-c     &     zlev(nz+1)=zlev(nz)+(zlay(nz)-zlay(nz-1))
+c        zlev(nlayer+1)= zlev(nlayer)
+c     &         -log(max(pplev(ig,nlayer+1),1.e-30)/pplev(ig,nlayer))
+c     &           *Rnew(ig,nlayer)*tmean/g
+c        if(pplev(ig,nlayer+1).eq.0.) 
+c     &     zlev(nlayer+1)=zlev(nlayer)+(zlay(nlayer)-zlay(nlayer-1))
       
-        zlev(nz+1)= zlev(nz)+10000.
+        zlev(nlayer+1)= zlev(nlayer)+10000.
 
         Akk=Akknew(ig,1) 
         lambda(1) = Akk*tsurf(ig)**skk/zlay(1)   
 
-        DO i = 2 , nz
+        DO i = 2 , nlayer
           Akk=Akknew(ig,i) 
           lambda(i)=Akk*zt(i)**skk/(zlay(i)-zlay(i-1)) 
         ENDDO
-        DO i=1,nz-1
+        DO i=1,nlayer-1
           muvol(i)=pplay(ig,i)/(rnew(ig,i)*zt(i)) 
           alpha(i)=cpnew(ig,i)*(muvol(i)/ptimestep)
@@ -128 +127 @@
         ENDDO
 
-        muvol(nz)=pplay(ig,nz)/(rnew(ig,nz)*zt(nz)) 
-        alpha(nz)=cpnew(ig,i)*(muvol(nz)/ptimestep)
-     $                       *(zlev(nz+1)-zlev(nz))
+        muvol(nlayer)=pplay(ig,nlayer)/(rnew(ig,nlayer)*zt(nlayer)) 
+        alpha(nlayer)=cpnew(ig,i)*(muvol(nlayer)/ptimestep)
+     $                       *(zlev(nlayer+1)-zlev(nlayer))
 
 c--------------------------------------------------------------------
@@ -143 +142 @@
         D(1)=lambda(2)/den(1)           
    
-        DO i = 2,nz-1
+        DO i = 2,nlayer-1
           den(i)=alpha(i)+lambda(i+1)
           den(i)=den(i)+lambda(i)*(1-D(i-1))
@@ -154 +153 @@
         ENDDO 
 
-        den(nz)=alpha(nz) + lambda(nz) * (1-D(nz-1))
-        C(nz)=C(nz-1)+zt(nz-1)-zt(nz) 
-        C(nz)=(C(nz)*lambda(nz)+phitop) / den(nz) 
+        den(nlayer)=alpha(nlayer) + lambda(nlayer) * (1-D(nlayer-1))
+        C(nlayer)=C(nlayer-1)+zt(nlayer-1)-zt(nlayer) 
+        C(nlayer)=(C(nlayer)*lambda(nlayer)+phitop) / den(nlayer) 
                 
 c----------------------------------------------------------------------
@@ -164 +163 @@
 c----------------------------------------------------------------------
 
-        DO i=1,nz
+        DO i=1,nlayer
           pdtc(i)=0.
         ENDDO
-        pdtc(nz)=C(nz)
-        DO i=nz-1,1,-1
+        pdtc(nlayer)=C(nlayer)
+        DO i=nlayer-1,1,-1
           pdtc(i)=C(i)+D(i)*pdtc(i+1)
         ENDDO 
@@ -177 +176 @@
 c-----------------------------------------------------------------------
     
-        DO i=1,nz
+        DO i=1,nlayer
           zdtconduc(ig,i)=pdtc(i)/ptimestep
         ENDDO

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

@@ -1 @@
-      subroutine deposition(ig, ig_vl1, pplay, pplev, zzlay, zzlev,
+      subroutine deposition(ngrid, nlayer, nq,
+     &                      ig, ig_vl1, pplay, pplev, zzlay, zzlev,
      $                      zu, zv, zt, zycol, ptimestep, co2ice)
 cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
@@ -7 +8 @@
 cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
 c
-      use tracer_mod, only: nqmx
+      use surfdat_h, only: z0 ! surface roughness
+      use conc_mod, only: rnew ! specific gas constant
       implicit none
 c
-#include "dimensions.h"
-#include "dimphys.h"
-#include "planete.h"
-#include "chimiedata.h"
-#include "conc.h"
-#include "surfdat.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
+!#include "planete.h"
+!#include "chimiedata.h"
+!#include "conc.h"
+!#include "surfdat.h"
 c
 c     input
 c 
-      integer ig                         ! grid point index
-      integer ig_vl1                     ! viking 1 grid point
-      real    pplay(ngridmx,nlayermx)    ! pressure at the middle of the layers (pa)
-      real    pplev(ngridmx,nlayermx+1)  ! pressure at layer boundaries (pa)
-      real    zzlay(ngridmx,nlayermx)    ! altitude at the middle of the layers (m)
-      real    zzlev(ngridmx,nlayermx+1)  ! altitude at layer boundaries (m)
-      real    zu(ngridmx,nlayermx)       ! u component of the wind (m.s-1)
-      real    zv(ngridmx,nlayermx)       ! v component of the wind (m.s-1)
-      real    zt(ngridmx,nlayermx)       ! temperature (k)
-      real    zycol(nlayermx,nqmx)       ! composition (volume mixing ratio)
-      real    ptimestep                  ! physical timestep (s)
-      real    co2ice(ngridmx)            ! co2 ice surface layer (kg.m-2)
+      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                     ! grid point index
+      integer ig_vl1                 ! viking 1 grid point
+      real    pplay(ngrid,nlayer)    ! pressure at the middle of the layers (pa)
+      real    pplev(ngrid,nlayer+1)  ! pressure at layer boundaries (pa)
+      real    zzlay(ngrid,nlayer)    ! altitude at the middle of the layers (m)
+      real    zzlev(ngrid,nlayer+1)  ! altitude at layer boundaries (m)
+      real    zu(ngrid,nlayer)       ! u component of the wind (m.s-1)
+      real    zv(ngrid,nlayer)       ! v component of the wind (m.s-1)
+      real    zt(ngrid,nlayer)       ! temperature (k)
+      real    zycol(nlayer,nq)       ! composition (volume mixing ratio)
+      real    ptimestep              ! physical timestep (s)
+      real    co2ice(ngrid)          ! co2 ice surface layer (kg.m-2)
 c
 c     local

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

@@ -1 @@
-      SUBROUTINE euvheat(pt,pdt,pplev,pplay,zzlay, &
+      SUBROUTINE euvheat(ngrid,nlayer,nq,pt,pdt,pplev,pplay,zzlay, &
            mu0,ptimestep,ptime,zday,pq,pdq,pdteuv)
 
-      use tracer_mod, only: nqmx, igcm_co2, igcm_co, igcm_o, igcm_o1d,  &
-                            igcm_o2, igcm_h, igcm_h2, igcm_oh, igcm_ho2,&
-                            igcm_h2o2, igcm_h2o_vap, igcm_o3, igcm_n2,  &
+      use tracer_mod, only: igcm_co2, igcm_co, igcm_o, igcm_o1d,         &
+                            igcm_o2, igcm_h, igcm_h2, igcm_oh, igcm_ho2, &
+                            igcm_h2o2, igcm_h2o_vap, igcm_o3, igcm_n2,   &
                             igcm_n, igcm_no, igcm_no2, igcm_n2d, mmol
+      use conc_mod, only: rnew, cpnew
       IMPLICIT NONE
 !=======================================================================
@@ -17 +18 @@
 !   input:
 !   ----- 
-!   mu0(ngridmx)           
+!   mu0(ngrid)           
 !   pplay(ngrid,nlayer)   pressure at middle of layers (Pa)
 !
@@ -30 +31 @@
 !    ------------------
 !
-#include "dimensions.h"
-#include "dimphys.h"
-#include "comcstfi.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
+!#include "comcstfi.h"
 #include "callkeys.h"
-#include "comdiurn.h"
-#include "param.h"
-#include "param_v4.h"
-#include "chimiedata.h"
+!#include "comdiurn.h"
+!#include "param.h"
+!#include "param_v4.h"
+!#include "chimiedata.h"
 !#include "tracer.h"
-#include "conc.h"
+!#include "conc.h"
 !-----------------------------------------------------------------------
 !    Input/Output
 !    ------------
 
-      real :: pt(ngridmx,nlayermx)
-      real :: pdt(ngridmx,nlayermx)
-      real :: pplev(ngridmx,nlayermx+1)
-      real :: pplay(ngridmx,nlayermx)
-      real :: zzlay(ngridmx,nlayermx)
-      real :: mu0(ngridmx)
+      integer,intent(in) :: ngrid ! number of atmospheric columns
+      integer,intent(in) :: nlayer ! number of atmospheric layers
+      integer,intent(in) :: nq ! number of advected tracers
+      real :: pt(ngrid,nlayer)
+      real :: pdt(ngrid,nlayer)
+      real :: pplev(ngrid,nlayer+1)
+      real :: pplay(ngrid,nlayer)
+      real :: zzlay(ngrid,nlayer)
+      real :: mu0(ngrid)
       real :: ptimestep,ptime
       real :: zday
-      real :: pq(ngridmx,nlayermx,nqmx)
-      real :: pdq(ngridmx,nlayermx,nqmx)
-
-      real :: pdteuv(ngridmx,nlayermx)
+      real :: pq(ngrid,nlayer,nq)
+      real :: pdq(ngrid,nlayer,nq)
+
+      real :: pdteuv(ngrid,nlayer)
 !
 !    Local variables :
@@ -63 +67 @@
       INTEGER :: l,ig,n
       integer,save :: euvmod
-      real, allocatable :: rm(:,:)   ! number density (cm-3)
-      real :: zq(ngridmx,nlayermx,nqmx) ! local updated tracer quantity
-      real :: zt(ngridmx,nlayermx)      ! local updated atmospheric temperature
-      real :: zlocal(nlayermx)
+      real, allocatable, save :: rm(:,:)   ! number density (cm-3)
+      real :: zq(ngrid,nlayer,nq) ! local updated tracer quantity
+      real :: zt(ngrid,nlayer)      ! local updated atmospheric temperature
+      real :: zlocal(nlayer)
       real :: zenit
-      real :: jtot(nlayermx)
+      real :: jtot(nlayer)
       real :: dens                                              ! amu/cm-3
-      real :: tx(nlayermx)
+      real :: tx(nlayer)
 !      real euveff     !UV heating efficiency
       
@@ -326 +330 @@
          end select
         
+         !Allocate density vector
+         allocate(rm(nlayer,nespeuv))
+
          firstcall= .false.
       endif                     ! of if (firstcall)
@@ -331 +338 @@
 !cccccccccccccccccccccccccccccccccccccccccccccccccccccccc
 
-      !Number of species if not firstcall
-
-
-      !Allocate density vector
-      allocate(rm(nlayermx,nespeuv))
+
       ! build local updated values of tracers and temperature
-      do l=1,nlayermx
-        do ig=1,ngridmx
+      do l=1,nlayer
+        do ig=1,ngrid
           ! chemical species
           zq(ig,l,g_co2)=pq(ig,l,g_co2)+pdq(ig,l,g_co2)*ptimestep
@@ -374 +377 @@
                                          ! set
       
-      do ig=1,ngridmx
+      do ig=1,ngrid
          zenit=acos(mu0(ig))*180./acos(-1.)
          
-         do l=1,nlayermx
+         do l=1,nlayer
             !Conversion to number density
             dens=pplay(ig,l)/(rnew(ig,l)*zt(ig,l)) / 1.66e-21
@@ -406 +409 @@
          tx(1)=zt(ig,1)
 
-         do l=2,nlayermx
+         do l=2,nlayer
             tx(l)=zt(ig,l)
             zlocal(l)=zzlay(ig,l)/1000.
@@ -419 +422 @@
                        !Gonzalez-Galindo et al. JGR 2009) for details
         !Calculates the UV heating from the total photoabsorption coefficient
-        do l=1,nlayermx
+        do l=1,nlayer
           pdteuv(ig,l)=euveff*jtot(l)/10.                  &
                /(cpnew(ig,l)*pplay(ig,l)/(rnew(ig,l)*zt(ig,l)))
@@ -426 +429 @@
                                               !the actual Mars-Sun distance
         enddo   
-      enddo  ! of do ig=1,ngridmx
+      enddo  ! of do ig=1,ngrid
       !Deallocations
-      deallocate(rm)
+!      deallocate(rm)
 
       return

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

@@ -1 @@
-      subroutine inichim_newstart(nq, pq, qsurf, ps, flagh2o, flagthermo)
+      subroutine inichim_newstart(ngrid, nq, pq, qsurf, ps, &
+                                  flagh2o, flagthermo)
 
       use tracer_mod
@@ -25 +26 @@
 !
 !  pq(iip1,jjp1,llm,nq)  Advected fields, ie chemical species here
-!  qsurf(ngridmx,nq)     Amount of tracer on the surface (kg/m2)
+!  qsurf(ngrid,nq)     Amount of tracer on the surface (kg/m2)
 !  ps(iip1,jjp1)           Surface pressure (Pa)
 !  flagh2o                 flag for initialisation of h2o (1: yes / 0: no)
@@ -33 +34 @@
 
 #include "dimensions.h"
-#include "dimphys.h"
+!#include "dimphys.h"
 #include "paramet.h"
 !#include "tracer.h"
@@ -42 +43 @@
 ! inputs :
 
+      integer,intent(in) :: ngrid         ! number of atmospheric columns in the physics
       integer,intent(in) :: nq                    ! number of tracers
       real,intent(in) :: ps(iip1,jjp1)            ! surface pressure in the gcm (Pa)   
@@ -50 +52 @@
 
       real,intent(out) :: pq(iip1,jjp1,llm,nq)  ! advected fields, ie chemical species
-      real,intent(out) :: qsurf(ngridmx,nq)     ! surface values (kg/m2) of tracers
+      real,intent(out) :: qsurf(ngrid,nq)     ! surface values (kg/m2) of tracers
 
 ! local :
@@ -586 +588 @@
          do n = 1,nspe
             iq = niq(n)
-            qsurf(1:ngridmx,iq) = 0.
+            qsurf(1:ngrid,iq) = 0.
          end do
       end if
@@ -604 +606 @@
          end do
          ! set surface value to zero
-         qsurf(1:ngridmx,igcm_ch4) = 0.
+         qsurf(1:ngrid,igcm_ch4) = 0.
       end if
 
@@ -644 +646 @@
          ! surface value to 0
 
-         qsurf(1:ngridmx,igcm_co2plus)  = 0.
-         qsurf(1:ngridmx,igcm_o2plus)   = 0.
-         qsurf(1:ngridmx,igcm_oplus)    = 0.
-         qsurf(1:ngridmx,igcm_coplus)   = 0.
-         qsurf(1:ngridmx,igcm_cplus)    = 0.
-         qsurf(1:ngridmx,igcm_nplus)    = 0.
-         qsurf(1:ngridmx,igcm_noplus)   = 0.
-         qsurf(1:ngridmx,igcm_n2plus)   = 0.
-         qsurf(1:ngridmx,igcm_hplus)    = 0.
-         qsurf(1:ngridmx,igcm_hco2plus) = 0.
-         qsurf(1:ngridmx,igcm_elec)     = 0.
+         qsurf(1:ngrid,igcm_co2plus)  = 0.
+         qsurf(1:ngrid,igcm_o2plus)   = 0.
+         qsurf(1:ngrid,igcm_oplus)    = 0.
+         qsurf(1:ngrid,igcm_coplus)   = 0.
+         qsurf(1:ngrid,igcm_cplus)    = 0.
+         qsurf(1:ngrid,igcm_nplus)    = 0.
+         qsurf(1:ngrid,igcm_noplus)   = 0.
+         qsurf(1:ngrid,igcm_n2plus)   = 0.
+         qsurf(1:ngrid,igcm_hplus)    = 0.
+         qsurf(1:ngrid,igcm_hco2plus) = 0.
+         qsurf(1:ngrid,igcm_elec)     = 0.
 
       else

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

@@ -1680 +1680 @@
 !c***************************************************
 
+      use comsaison_h, only: dist_sol
       implicit none
 
@@ -1686 +1687 @@
       include "dimensions.h"
       include "dimphys.h"
-      include "comsaison.h"
+!      include "comsaison.h"
       include 'param.h'
       include 'param_v4.h'

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

@@ -1 @@
-      subroutine moldiff(pplay,pplev,pt,pdt,pq,pdq,ptimestep,
+      subroutine moldiff(ngrid,nlayer,nq,
+     &                   pplay,pplev,pt,pdt,pq,pdq,ptimestep,
      &                   zzlay,pdteuv,pdtconduc,pdqdiff)
 
-      use tracer_mod, only: nqmx, igcm_co2, igcm_co, igcm_o, igcm_o1d,
+      use tracer_mod, only: igcm_co2, igcm_co, igcm_o, igcm_o1d,
      &                      igcm_o2, igcm_o3, igcm_h, igcm_h2, igcm_oh,
      &                      igcm_ho2, igcm_h2o2, igcm_n2, igcm_ar,
      &                      igcm_h2o_vap, mmol
+      use conc_mod, only: rnew, mmean
       implicit none
 
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 #include "comcstfi.h"
-#include "callkeys.h"
-#include "comdiurn.h"
-#include "chimiedata.h"
+!#include "callkeys.h"
+!#include "comdiurn.h"
+!#include "chimiedata.h"
 !#include "tracer.h"
-#include "conc.h"
+!#include "conc.h"
 
 
@@ -21 +23 @@
 c Input/Output
 c
+      integer,intent(in) :: ngrid ! number of atmospheric columns
+      integer,intent(in) :: nlayer ! number of atmospheric layers
+      integer,intent(in) :: nq ! number of advected tracers
       real ptimestep
-      real pplay(ngridmx,nlayermx)
-      real zzlay(ngridmx,nlayermx)
-      real pplev(ngridmx,nlayermx+1)
-      real pq(ngridmx,nlayermx,nqmx)
-      real pdq(ngridmx,nlayermx,nqmx)
-      real pt(ngridmx,nlayermx)
-      real pdt(ngridmx,nlayermx)
-      real pdteuv(ngridmx,nlayermx)
-      real pdtconduc(ngridmx,nlayermx)
-      real pdqdiff(ngridmx,nlayermx,nqmx)
+      real pplay(ngrid,nlayer)
+      real zzlay(ngrid,nlayer)
+      real pplev(ngrid,nlayer+1)
+      real pq(ngrid,nlayer,nq)
+      real pdq(ngrid,nlayer,nq)
+      real pt(ngrid,nlayer)
+      real pdt(ngrid,nlayer)
+      real pdteuv(ngrid,nlayer)
+      real pdtconduc(ngrid,nlayer)
+      real pdqdiff(ngrid,nlayer,nq)
 c
 c Local
@@ -42 +47 @@
       real del1,del2, tmean ,dalfinvdz, d
       real hh,dcoef,dcoef1,ptfac, ntot, dens, dens2, dens3
-      real hp(nlayermx)
-      real tt(nlayermx)
-      real qq(nlayermx,ncompmoldiff)
-      real dmmeandz(nlayermx)
-      real qnew(nlayermx,ncompmoldiff)
-      real zlocal(nlayermx)
+      real hp(nlayer)
+      real tt(nlayer)
+      real qq(nlayer,ncompmoldiff)
+      real dmmeandz(nlayer)
+      real qnew(nlayer,ncompmoldiff)
+      real zlocal(nlayer)
       real alf(ncompmoldiff-1,ncompmoldiff-1)
-      real alfinv(nlayermx,ncompmoldiff-1,ncompmoldiff-1)
+      real alfinv(nlayer,ncompmoldiff-1,ncompmoldiff-1)
       real indx(ncompmoldiff-1)
-      real b(nlayermx,ncompmoldiff-1)
+      real b(nlayer,ncompmoldiff-1)
       real y(ncompmoldiff-1,ncompmoldiff-1)
-      real aa(nlayermx,ncompmoldiff-1,ncompmoldiff-1)
-      real bb(nlayermx,ncompmoldiff-1,ncompmoldiff-1)
-      real cc(nlayermx,ncompmoldiff-1,ncompmoldiff-1)
-      real atri(nlayermx-2)
-      real btri(nlayermx-2)
-      real ctri(nlayermx-2)
-      real rtri(nlayermx-2)
-      real qtri(nlayermx-2)
+      real aa(nlayer,ncompmoldiff-1,ncompmoldiff-1)
+      real bb(nlayer,ncompmoldiff-1,ncompmoldiff-1)
+      real cc(nlayer,ncompmoldiff-1,ncompmoldiff-1)
+      real atri(nlayer-2)
+      real btri(nlayer-2)
+      real ctri(nlayer-2)
+      real rtri(nlayer-2)
+      real qtri(nlayer-2)
       real alfdiag(ncompmoldiff-1)
       real wi(ncompmoldiff), flux(ncompmoldiff), pote
@@ -211 +216 @@
 cccccccccccccccccccccccccccccccccccccccccccccccccccccccc
 
-      nz=nlayermx
-
-      do ig=1,ngridmx
+      nz=nlayer
+
+      do ig=1,ngrid
 
         do l=2,nz-1
@@ -291 +296 @@
             write(*,*) 'ig, l=',ig, l
             write(*,*) 'No molecular diffusion this time !'
-            call zerophys(ngridmx*nlayermx*nqmx,pdqdiff)
+            pdqdiff(1:ngrid,1:nlayer,1:nq)=0
             return
 c           stop

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

@@ -1 @@
-subroutine moldiff_red(pplay,pplev,pt,pdt,pq,pdq,ptimestep,zzlay,pdteuv,pdtconduc,pdqdiff)
-
-use tracer_mod, only: nqmx, noms, mmol
+subroutine moldiff_red(ngrid,nlayer,nq,pplay,pplev,pt,pdt,pq,pdq,&
+                       ptimestep,zzlay,pdteuv,pdtconduc,pdqdiff)
+
+use tracer_mod, only: noms, mmol
 
 implicit none
 
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 #include "comcstfi.h"
-#include "callkeys.h"
-#include "comdiurn.h"
-#include "chimiedata.h"
+!#include "callkeys.h"
+!#include "comdiurn.h"
+!#include "chimiedata.h"
 !#include "tracer.h"
-#include "conc.h"
+!#include "conc.h"
 #include "diffusion.h"
 
@@ -19 +20 @@
 ! Input/Output
 !
+      integer,intent(in) :: ngrid ! number of atmospheric columns
+      integer,intent(in) :: nlayer ! number of atmospheric layers
+      integer,intent(in) :: nq ! number of advected tracers
       real ptimestep
-      real pplay(ngridmx,nlayermx)
-      real zzlay(ngridmx,nlayermx)
-      real pplev(ngridmx,nlayermx+1)
-      real pq(ngridmx,nlayermx,nqmx)
-      real pdq(ngridmx,nlayermx,nqmx)
-      real pt(ngridmx,nlayermx)
-      real pdt(ngridmx,nlayermx)
-      real pdteuv(ngridmx,nlayermx)
-      real pdtconduc(ngridmx,nlayermx)
-      real pdqdiff(ngridmx,nlayermx,nqmx)
+      real pplay(ngrid,nlayer)
+      real zzlay(ngrid,nlayer)
+      real pplev(ngrid,nlayer+1)
+      real pq(ngrid,nlayer,nq)
+      real pdq(ngrid,nlayer,nq)
+      real pt(ngrid,nlayer)
+      real pdt(ngrid,nlayer)
+      real pdteuv(ngrid,nlayer)
+      real pdtconduc(ngrid,nlayer)
+      real pdqdiff(ngrid,nlayer,nq)
 !
 ! Local
@@ -37 +41 @@
 !      real hco2(ncompdiff),ho
 
-      integer,dimension(nqmx) :: indic_diff
+      integer,dimension(nq) :: indic_diff
       integer ig,iq,nz,l,k,n,nn,p,ij0
       integer istep,il,gcn,ntime,nlraf
@@ -44 +48 @@
       real*8 rho0,D0,T0,H0,time0,dZ,time,dZraf,tdiff,Zmin,Zmax
       real*8 FacEsc,invsgmu
-      real*8 hp(nlayermx)
-      real*8 pp(nlayermx)
-      real*8 pint(nlayermx)
-      real*8 tt(nlayermx),tnew(nlayermx),tint(nlayermx)
-      real*8 zz(nlayermx)
+      real*8 hp(nlayer)
+      real*8 pp(nlayer)
+      real*8 pint(nlayer)
+      real*8 tt(nlayer),tnew(nlayer),tint(nlayer)
+      real*8 zz(nlayer)
       real*8,dimension(:,:),allocatable,save :: qq,qnew,qint,FacMass
       real*8,dimension(:,:),allocatable,save :: rhoK,rhokinit
-      real*8 rhoT(nlayermx)
-      real*8 dmmeandz(nlayermx)
-      real*8 massemoy(nlayermx)
+      real*8 rhoT(nlayer)
+      real*8 dmmeandz(nlayer)
+      real*8 massemoy(nlayer)
       real*8,dimension(:),allocatable :: Praf,Traf,Rraf,Mraf,Nraf,Draf,Hraf,Wraf
       real*8,dimension(:),allocatable :: Zraf,Tdiffraf
@@ -130 +134 @@
 
         ncompdiff=0
-        indic_diff(1:nqmx)=0
+        indic_diff(1:nq)=0
         
-        do nn=1,nqmx
+        do nn=1,nq
         do n=1,14
         if (ListeDiff(n) .eq. noms(nn)) then
@@ -151 +155 @@
 ! Store gcm indexes in gcmind
         n=0
-        do nn=1,nqmx
+        do nn=1,nq
         if (indic_diff(nn) .eq. 1) then
         n=n+1
@@ -162 +166 @@
 ! find vertical index above which diffusion is computed
 
-        do l=1,nlayermx
+        do l=1,nlayer
         if (pplay(1,l) .gt. Pdiff) then
         il0=l
@@ -176 +180 @@
 
 ! allocatation des tableaux dependants du nombre d especes diffusees
-        allocate(qq(nlayermx,ncompdiff))
-        allocate(qnew(nlayermx,ncompdiff))
-        allocate(qint(nlayermx,ncompdiff))
-        allocate(FacMass(nlayermx,ncompdiff))
-        allocate(rhok(nlayermx,ncompdiff))
-        allocate(rhokinit(nlayermx,ncompdiff))
+        allocate(qq(nlayer,ncompdiff))
+        allocate(qnew(nlayer,ncompdiff))
+        allocate(qint(nlayer,ncompdiff))
+        allocate(FacMass(nlayer,ncompdiff))
+        allocate(rhok(nlayer,ncompdiff))
+        allocate(rhokinit(nlayer,ncompdiff))
 
         allocate(wi(ncompdiff))
@@ -212 +216 @@
         
 !       print*,'moldiff',i_h2,i_h,ncompdiff
-      do ig=1,ngridmx
+      do ig=1,ngrid
         pp=dble(pplay(ig,:))
 
@@ -218 +222 @@
 
 !       CALL TMNEW(pt(ig,:),pdt(ig,:),pdtconduc(ig,:),pdteuv(ig,:)      & 
-!     &  ,tt,ptimestep,nlayermx,ig)
-        do l=1,nlayermx
+!     &  ,tt,ptimestep,nlayer,ig)
+        do l=1,nlayer
           tt(l)=pt(ig,l)*1D0+(pdt(ig,l)*dble(ptimestep)+                &
                               pdtconduc(ig,l)*dble(ptimestep)+          &
@@ -228 +232 @@
               pdt(ig,l),pdtconduc(ig,l),pdteuv(ig,l),dble(ptimestep)
           endif
-        enddo ! of do l=1,nlayermx
+        enddo ! of do l=1,nlayer
 
 ! Update the mass mixing ratios modified by other processes
 
-!       CALL QMNEW(pq(ig,:,:),pdq(ig,:,:),qq,ptimestep,nlayermx,        &
+!       CALL QMNEW(pq(ig,:,:),pdq(ig,:,:),qq,ptimestep,nlayer,        &
 !     &  ncompdiff,gcmind,ig)
         do iq=1,ncompdiff
-         do l=1,nlayermx
+         do l=1,nlayer
           qq(l,iq)=pq(ig,l,gcmind(iq))*1D0+(                            &
                            pdq(ig,l,gcmind(iq))*dble(ptimestep))
           qq(l,iq)=max(qq(l,iq),1d-30)
-         enddo ! of do l=1,nlayermx
+         enddo ! of do l=1,nlayer
         enddo ! of do iq=1,ncompdiff
 
 ! Compute the Pressure scale height
 
-        CALL HSCALE(pp,hp,nlayermx)
+        CALL HSCALE(pp,hp,nlayer)
 
 ! Compute the atmospheric mass (in Dalton)
 
-        CALL MMOY(massemoy,mmol,qq,gcmind,nlayermx,ncompdiff)
+        CALL MMOY(massemoy,mmol,qq,gcmind,nlayer,ncompdiff)
 
 ! Compute the vertical gradient of atmospheric mass
 
-        CALL DMMOY(massemoy,hp,dmmeandz,nlayermx)
+        CALL DMMOY(massemoy,hp,dmmeandz,nlayer)
 
 ! Compute the altitude of each layer
 
-        CALL ZVERT(pp,tt,massemoy,zz,nlayermx,ig)
+        CALL ZVERT(pp,tt,massemoy,zz,nlayer,ig)
 
 ! Compute the total mass density (kg/m3)
         
-        CALL RHOTOT(pp,tt,massemoy,qq,RHOT,RHOK,nlayermx,ncompdiff)
+        CALL RHOTOT(pp,tt,massemoy,qq,RHOT,RHOK,nlayer,ncompdiff)
         RHOKINIT=RHOK
 
@@ -271 +275 @@
         Mtot1(1:ncompdiff)=0d0
 
-        do l=il0,nlayermx
+        do l=il0,nlayer
         do nn=1,ncompdiff
         Mtot1(nn)=Mtot1(nn)+1d0/g*qq(l,nn)*                             &
@@ -279 +283 @@
 
         Zmin=zz(il0)
-        Zmax=zz(nlayermx)
+        Zmax=zz(nlayer)
 
 
@@ -286 +290 @@
         if (Zmax .gt. 4000000.) then
         Print*,'Zmax too high',ig,zmax,zmin
-        do l=1,nlayermx
+        do l=1,nlayer
         print*,'old',zz(l),pt(ig,l),pdteuv(ig,l),pdq(ig,l,:)
         print*,'l',l,rhot(l),tt(l),pp(l),massemoy(l),qq(l,:)
@@ -321 +325 @@
         CALL UPPER_RESOL(pp,tt,zz,massemoy,RHOT,RHOK,                   &
      &  qq,mmol,gcmind,Praf,Traf,Qraf,Mraf,Zraf,                        &
-     &  Nraf,Nrafk,Rraf,Rrafk,il0,nlraf,ncompdiff,nlayermx,ig)
+     &  Nraf,Nrafk,Rraf,Rrafk,il0,nlraf,ncompdiff,nlayer,ig)
 
         Prafold=Praf
@@ -330 +334 @@
 
         CALL GCMGRID_P(Zraf,Praf,Qraf,Traf,Nrafk,Rrafk,qq,qint,tt,tint  &
-     &    ,pp,mmol,gcmind,nlraf,ncompdiff,nlayermx,ig)
+     &    ,pp,mmol,gcmind,nlraf,ncompdiff,nlayer,ig)
 
 ! We compute the mass correction factor of each specie at each pressure level
 
-        CALL CORRMASS(qq,qint,FacMass,nlayermx,ncompdiff)
+        CALL CORRMASS(qq,qint,FacMass,nlayer,ncompdiff)
 
 ! Altitude step
@@ -367 +371 @@
 !       enddo
 
-!       do l=1,nlayermx
+!       do l=1,nlayer
 !       print*,'l',l,zz(l),pp(l),tt(l),sum(qq(l,:)),massemoy(l)
 !       enddo
@@ -374 +378 @@
 ! No change below il0
         
-        do l=1,nlayermx
+        do l=1,nlayer
          qnew(l,:)=qq(l,:) ! No effet below il0
        enddo
@@ -527 +531 @@
         print*,'Mraf',Mraf
         stop
-!       pdqdiff(1:ngridmx,1:nlayermx,1:nqmx)=0.
+!       pdqdiff(1:ngrid,1:nlayer,1:nq)=0.
 !       return
 !       Rrafk(l,nn)=1D-30*Rraf(l)
@@ -572 +576 @@
 
         CALL GCMGRID_P2(Zraf,Praf,Qraf,Traf,Nrafk,Rrafk,qq,qnew,tt,tnew,&
-     &   pp,mmol,gcmind,nlraf,ncompdiff,nlayermx,FacMass,ig)
-
-        CALL RHOTOT(pp,tt,massemoy,qnew,RHOT,RHOK,nlayermx,ncompdiff)
+     &   pp,mmol,gcmind,nlraf,ncompdiff,nlayer,FacMass,ig)
+
+        CALL RHOTOT(pp,tt,massemoy,qnew,RHOT,RHOK,nlayer,ncompdiff)
 
         if (ig .eq. ij0) then 
-        do l=il0,nlayermx
+        do l=il0,nlayer
         write(*,'(i2,1x,19(e12.4,1x))') l,zz(l),tt(l),RHOK(l,1)/sum(RHOK(l,:)),RHOKINIT(l,1)/sum(RHOKINIT(l,:)),&
      &  RHOK(l,2)/sum(RHOK(l,:)),RHOKINIT(l,2)/sum(RHOKINIT(l,:)),&
@@ -590 +594 @@
         Mtot2(1:ncompdiff)=0d0
 
-        do l=il0,nlayermx
+        do l=il0,nlayer
         do nn=1,ncompdiff
         Mtot2(nn)=Mtot2(nn)+1d0/g*qnew(l,nn)*                           &
@@ -600 +604 @@
 
 !       do nn=1,ncompdiff
-!       CALL CheckMass2(qq,qnew,pplev(ig,:),il0,nlayermx,nn,ncompdiff)
+!       CALL CheckMass2(qq,qnew,pplev(ig,:),il0,nlayer,nn,ncompdiff)
 !       enddo
 
 ! Compute the diffusion trends du to diffusion
 
-        do l=1,nlayermx
+        do l=1,nlayer
         do nn=1,ncompdiff
         pdqdiff(ig,l,gcmind(nn))=(qnew(l,nn)-qq(l,nn))/ptimestep

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

@@ -19 +19 @@
 #include "dimphys.h"
 #include "callkeys.h"
-#include "comdiurn.h"
+!#include "comdiurn.h"
 #include "chimiedata.h"
 !#include "tracer.h"
-#include "conc.h"
+!#include "conc.h"
 
 c-----------------------------------------------------------------------

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

@@ -15 +15 @@
 #include "dimphys.h"
 #include "callkeys.h"
-#include "comdiurn.h"
+!#include "comdiurn.h"
 #include "chimiedata.h"
 !#include "tracer.h"
-#include "conc.h"
+!#include "conc.h"
 #include "diffusion.h"
 

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

@@ -1 @@
-       SUBROUTINE molvis(ptimestep,pplay,pplev,pt,pdteuv,pdtconduc
+       SUBROUTINE molvis(ngrid,nlayer,ptimestep,
+     &            pplay,pplev,pt,pdteuv,pdtconduc
      $           ,pvel,tsurf,zzlev,zzlay,zdvelmolvis)
+      
+      use conc_mod, only: cpnew, Akknew, rnew
       IMPLICIT NONE
 
@@ -17 +20 @@
 c-----------------------------------------------------------------------
 
-#include "dimensions.h"
-#include "dimphys.h"
-#include "comcstfi.h"
-#include "surfdat.h"
-#include "chimiedata.h"
-#include "conc.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
+!#include "comcstfi.h"
+!#include "surfdat.h"
+!#include "chimiedata.h"
+!#include "conc.h"
 
 c   arguments:
 c   ----------
 
+      integer,intent(in) :: ngrid ! number of atmospheric columns
+      integer,intent(in) :: nlayer ! number of atmospheric layers
       REAL ptimestep
-      REAL pplay(ngridmx,nlayermx)
-      REAL pplev(ngridmx,nlayermx+1)
-      REAL zzlay(ngridmx,nlayermx)
-      REAL zzlev(ngridmx,nlayermx+1)
-      real pt(ngridmx,nlayermx)
-      real tsurf(ngridmx)
-      REAL pvel(ngridmx,nlayermx)
-      REAL pdvel(ngridmx,nlayermx)
-      real pdteuv(ngridmx,nlayermx)
-      real pdtconduc(ngridmx,nlayermx)
+      REAL pplay(ngrid,nlayer)
+      REAL pplev(ngrid,nlayer+1)
+      REAL zzlay(ngrid,nlayer)
+      REAL zzlev(ngrid,nlayer+1)
+      real pt(ngrid,nlayer)
+      real tsurf(ngrid)
+      REAL pvel(ngrid,nlayer)
+      REAL pdvel(ngrid,nlayer)
+      real pdteuv(ngrid,nlayer)
+      real pdtconduc(ngrid,nlayer)
 
-      real zdvelmolvis(ngridmx,nlayermx)
+      real zdvelmolvis(ngrid,nlayer)
 
 c   local:
 c   ------
 
-      INTEGER l,ig, ngrid,nz
-      real Akk,skk,phitop,velsurf,fac, m, tmean
-      REAL zvel(nlayermx)
-      real zt(nlayermx)
-      REAL alpha(nlayermx)
-      REAL lambda(nlayermx)
-      real muvol(nlayermx)
-      REAL C(nlayermx)
-      real D(nlayermx)
-      real den(nlayermx)
-      REAL pdvelm(nlayermx)
-      REAL zlay(nlayermx)
-      real zlev(nlayermx+1)
+      INTEGER l,ig, nz
+      real Akk,phitop,fac, m, tmean
+      REAL zvel(nlayer)
+      real zt(nlayer)
+      REAL alpha(nlayer)
+      REAL lambda(nlayer)
+      real muvol(nlayer)
+      REAL C(nlayer)
+      real D(nlayer)
+      real den(nlayer)
+      REAL pdvelm(nlayer)
+      REAL zlay(nlayer)
+      real zlev(nlayer+1)
 
 c   constants used locally
@@ -67 +72 @@
 
 
-      PARAMETER (skk=0.69)
+      REAL,PARAMETER :: skk=0.69
 
-      PARAMETER (velsurf =0.0)
+      REAL,PARAMETER :: velsurf =0.0
       
-      logical firstcall
-      save firstcall
-      data firstcall /.true./
+      logical,save :: firstcall=.true.
+
 c-----------------------------------------------------------------------
 c   calcul des coefficients alpha et lambda
@@ -90 +94 @@
       phitop=0.0
 
-      ngrid=ngridmx
-      nz=nlayermx
+      nz=nlayer
 
       do ig=1,ngrid

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) 

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

@@ -7 +7 @@
       use tracer_mod, only: nuice_sed, igcm_dust_number,
      &                      igcm_ccn_number, varian, ccn_factor
+      use conc_mod, only: rnew
       implicit none
 
@@ -18 +19 @@
 
 #include "dimensions.h"
-#include "dimphys.h"
+!#include "dimphys.h"
 #include "comcstfi.h"
 #include "callkeys.h"
 !#include "tracer.h"
-#include "dimradmars.h"
+!#include "dimradmars.h"
+! naerkind is set in scatterers.h (built when compiling with makegcm -s #)
+#include"scatterers.h"
 #include "chimiedata.h"
-#include "conc.h"
+!#include "conc.h"
 
 ! input

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

@@ -1 @@
-      subroutine thermosphere(pplev,pplay,dist_sol,
+      subroutine thermosphere(ngrid,nlayer,nq,
+     &     pplev,pplay,dist_sol,
      $     mu0,ptimestep,ptime,zday,tsurf,zzlev,zzlay,
      &     pt,pq,pu,pv,pdt,pdq,
      $     zdteuv,zdtconduc,zdumolvis,zdvmolvis,zdqmoldiff)
 
-      use tracer_mod, only: nqmx ! number of advecter tracers
+      use conc_mod, only: rnew, cpnew
       implicit none
 
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 #include "comcstfi.h"
 #include "callkeys.h"
-#include "comdiurn.h"
-#include "param.h"
-#include "param_v4.h"
-#include "chimiedata.h"
-#include "conc.h"
+!#include "comdiurn.h"
+!#include "param.h"
+!#include "param_v4.h"
+!#include "chimiedata.h"
+!#include "conc.h"
 
 
-      INTEGER l,ig
-
-      REAL pplay(ngridmx,nlayermx)
-      real pplev(ngridmx,nlayermx+1)
-      REAL zzlay(ngridmx,nlayermx)
-      real zzlev(ngridmx,nlayermx+1)
-      REAL pt(ngridmx,nlayermx)
+      integer,intent(in) :: ngrid ! number of atmospheric columns
+      integer,intent(in) :: nlayer ! number of atmospheric layers
+      integer,intent(in) :: nq ! number of advected tracers
+      REAL pplay(ngrid,nlayer)
+      real pplev(ngrid,nlayer+1)
+      REAL zzlay(ngrid,nlayer)
+      real zzlev(ngrid,nlayer+1)
+      REAL pt(ngrid,nlayer)
       real zday
       REAL dist_sol
-      real mu0(ngridmx)
-      real pq(ngridmx,nlayermx,nqmx)
+      real mu0(ngrid)
+      real pq(ngrid,nlayer,nq)
       real ptimestep
       real ptime
-      real tsurf(ngridmx)
-      REAL pu(ngridmx,nlayermx),pv(ngridmx,nlayermx)
-      REAL pdt(ngridmx,nlayermx),pdq(ngridmx,nlayermx,nqmx)
+      real tsurf(ngrid)
+      REAL pu(ngrid,nlayer),pv(ngrid,nlayer)
+      REAL pdt(ngrid,nlayer),pdq(ngrid,nlayer,nq)
 
-      REAL zdteuv(ngridmx,nlayermx)
-      REAL zdtconduc(ngridmx,nlayermx)
-      REAL zdumolvis(ngridmx,nlayermx)
-      REAL zdvmolvis(ngridmx,nlayermx)
-      real zdqmoldiff(ngridmx,nlayermx,nqmx)
+      REAL zdteuv(ngrid,nlayer)
+      REAL zdtconduc(ngrid,nlayer)
+      REAL zdumolvis(ngrid,nlayer)
+      REAL zdvmolvis(ngrid,nlayer)
+      real zdqmoldiff(ngrid,nlayer,nq)
 
-      logical firstcall
-      save firstcall
-      data firstcall /.true./
+      INTEGER l,ig
+      logical,save :: firstcall=.true.
 
       if (firstcall) then
         if (.not. tracer) then
-          do l=1,nlayermx
-            do ig=1,ngridmx
+          do l=1,nlayer
+            do ig=1,ngrid
               rnew(ig,l)=r
               cpnew(ig,l)=cpp
@@ -58 +59 @@
 
       if (calleuv) then
-        call zerophys(ngridmx*nlayermx,zdteuv)
-        call euvheat(pt,pdt,pplev,pplay,zzlay,
+        zdteuv(1:ngrid,1:nlayer)=0
+        call euvheat(ngrid,nlayer,nq,pt,pdt,pplev,pplay,zzlay,
      $               mu0,ptimestep,ptime,zday,pq,pdq,zdteuv)
       endif
 
       if (callconduct) THEN
-        call zerophys(ngridmx*nlayermx,zdtconduc)
-        call conduction(ptimestep,pplay,pplev,pt,zdteuv,
+        zdtconduc(1:ngrid,1:nlayer)=0
+        call conduction(ngrid,nlayer,ptimestep,pplay,pplev,pt,zdteuv,
      $                   tsurf,zzlev,zzlay,zdtconduc)
       endif
 
       if (callmolvis) THEN
-        call zerophys(ngridmx*nlayermx,zdumolvis)
-        call molvis(ptimestep,pplay,pplev,pt,zdteuv,zdtconduc,pu,
+        zdumolvis(1:ngrid,1:nlayer)=0
+        call molvis(ngrid,nlayer,ptimestep,pplay,pplev,pt,
+     &                zdteuv,zdtconduc,pu,
      $                   tsurf,zzlev,zzlay,zdumolvis)
-        call zerophys(ngridmx*nlayermx,zdvmolvis)
-        call molvis(ptimestep,pplay,pplev,pt,zdteuv,zdtconduc,pv,
+        zdvmolvis(1:ngrid,1:nlayer)=0
+        call molvis(ngrid,nlayer,ptimestep,pplay,pplev,pt,
+     &                zdteuv,zdtconduc,pv,
      $                   tsurf,zzlev,zzlay,zdvmolvis)
       endif
 
       if (callmoldiff) THEN
-        call zerophys(ngridmx*nlayermx*nqmx,zdqmoldiff)
-        call moldiff_red(pplay,pplev,pt,pdt,pq,pdq,ptimestep,
+        zdqmoldiff(1:ngrid,1:nlayer,1:nq)=0
+        call moldiff_red(ngrid,nlayer,nq,
+     &                   pplay,pplev,pt,pdt,pq,pdq,ptimestep,
      &                   zzlay,zdteuv,zdtconduc,zdqmoldiff)
       endif

trunk/LMDZ.MARS/libf/dyn3d/ini_archive.F

@@ -34 +34 @@
 c=======================================================================
  
+      use comsoil_h, only: nsoilmx, mlayer
       implicit none
 
@@ -48 +49 @@
 #include "serre.h"
 #include "control.h"
-#include"comsoil.h"
+!#include"comsoil.h"
 
 #include "netcdf.inc"

trunk/LMDZ.MARS/libf/dyn3d/lect_start_archive.F

@@ -1 @@
-      SUBROUTINE lect_start_archive(nqtot,date,tsurf,tsoil,emis,q2,
+      SUBROUTINE lect_start_archive(ngrid,nlayer,nqtot,
+     &     date,tsurf,tsoil,emis,q2,
      &     t,ucov,vcov,ps,co2ice,h,phisold_newgrid,
      &     q,qsurf,surfith,nid)
@@ -17 +18 @@
 c=======================================================================
       use infotrac, only: tnom
+      use comsoil_h, only: nsoilmx, layer, mlayer, volcapa, inertiedat
       implicit none
 
 #include "dimensions.h"
-#include "dimphys.h"
-#include "surfdat.h"
-#include "comsoil.h"
-#include "dimradmars.h"
-#include "yomaer.h"
+!#include "dimphys.h"
+!#include "surfdat.h"
+!#include "comsoil.h"
+!#include "dimradmars.h"
+!#include "yomaer.h"
 #include "planete.h"
 #include "paramet.h"
@@ -49 +51 @@
 c et autres:
 c----------
+      integer,intent(in) :: ngrid ! number of atmospheric columns
+                                  ! on new physics grid
+      integer,intent(in) :: nlayer ! number of atmospheric layers
+                                   ! on new grid
       integer,intent(in) :: nqtot ! number of advected tracers
 
@@ -98 +104 @@
 c variable physique
 c------------------
-      REAL tsurf(ngridmx) ! surface temperature
-      REAL tsoil(ngridmx,nsoilmx) ! soil temperature
-      REAL co2ice(ngridmx) ! CO2 ice layer
-      REAL emis(ngridmx)
-      REAL q2(ngridmx,nlayermx+1),qsurf(ngridmx,nqtot)
-c     REAL phisfi(ngridmx)
+      REAL tsurf(ngrid) ! surface temperature
+      REAL tsoil(ngrid,nsoilmx) ! soil temperature
+      REAL co2ice(ngrid) ! CO2 ice layer
+      REAL emis(ngrid)
+      REAL q2(ngrid,nlayer+1),qsurf(ngrid,nqtot)
+c     REAL phisfi(ngrid)
 
       INTEGER i,j,l
@@ -176 +182 @@
 
       real surfith(iip1,jjp1) ! surface thermal inertia
-!      real surfithfi(ngridmx)
+!      real surfithfi(ngrid)
       ! surface thermal inertia at old horizontal grid resolution
       real, dimension(:,:), allocatable :: surfithold 
@@ -335 +341 @@
       allocate(varp1 (imold+1,jmold+1,llm+1))
 
-      write(*,*) 'q2',ngridmx,nlayermx+1
+      write(*,*) 'q2',ngrid,nlayer+1
       write(*,*) 'q2S',iip1,jjp1,llm+1
       write(*,*) 'q2old',imold+1,jmold+1,lmold+1
@@ -1000 +1006 @@
       call interp_horiz (tsurfold,tsurfs,imold,jmold,iim,jjm,1,
      &                   rlonuold,rlatvold,rlonu,rlatv)
-      call gr_dyn_fi (1,iim+1,jjm+1,ngridmx,tsurfs,tsurf)
+      call gr_dyn_fi (1,iim+1,jjm+1,ngrid,tsurfs,tsurf)
 c     write(44,*) 'tsurf', tsurf
 
@@ -1007 +1013 @@
 !     &                  imold,jmold,iim,jjm,nsoilmx,
 !     &                   rlonuold,rlatvold,rlonu,rlatv)
-!      call gr_dyn_fi (nsoilmx,iim+1,jjm+1,ngridmx,tsoils,tsoil)
+!      call gr_dyn_fi (nsoilmx,iim+1,jjm+1,ngrid,tsoils,tsoil)
 c     write(45,*) 'tsoil',tsoil
 
@@ -1013 +1019 @@
       call interp_horiz (emisold,emiss,imold,jmold,iim,jjm,1,
      &                   rlonuold,rlatvold,rlonu,rlatv)
-      call gr_dyn_fi (1,iim+1,jjm+1,ngridmx,emiss,emis)
+      call gr_dyn_fi (1,iim+1,jjm+1,ngrid,emiss,emis)
 c     write(46,*) 'emis',emis
 c-----------------------------------------------------------------------
@@ -1130 +1136 @@
 
       ! Reshape inertiedatS to scalar grid as inertiedat
-      call gr_dyn_fi (nsoilmx,iim+1,jjm+1,ngridmx,
+      call gr_dyn_fi (nsoilmx,iim+1,jjm+1,ngrid,
      &                  inertiedatS,inertiedat)
       
@@ -1203 +1209 @@
 
       ! Reshape tsoilS to scalar grid as tsoil
-       call gr_dyn_fi (nsoilmx,iim+1,jjm+1,ngridmx,tsoilS,tsoil)
+       call gr_dyn_fi (nsoilmx,iim+1,jjm+1,ngrid,tsoilS,tsoil)
 
 
@@ -1229 +1235 @@
      &                   rlonuold,rlatvold,rlonu,rlatv)
       write (*,*) 'lect_start_archive: q2s ', q2s (1,2,1)  ! INFO
-      call gr_dyn_fi (llm+1,iim+1,jjm+1,ngridmx,q2s,q2)
+      call gr_dyn_fi (llm+1,iim+1,jjm+1,ngrid,q2s,q2)
       write (*,*) 'lect_start_archive: q2 ', q2 (1,2)  ! INFO
 c     write(47,*) 'q2',q2
@@ -1278 +1284 @@
       enddo
 
-      call gr_dyn_fi (nqtot,iim+1,jjm+1,ngridmx,qsurfs,qsurf)
+      call gr_dyn_fi (nqtot,iim+1,jjm+1,ngrid,qsurfs,qsurf)
 
 c traceurs 3D
@@ -1329 +1335 @@
       enddo
       
-      call gr_dyn_fi (1,iim+1,jjm+1,ngridmx,co2ices,co2ice)
+      call gr_dyn_fi (1,iim+1,jjm+1,ngrid,co2ices,co2ice)
 
 c-----------------------------------------------------------------------

trunk/LMDZ.MARS/libf/dyn3d/newstart.F

@@ -19 +19 @@
       use infotrac, only: iniadvtrac, nqtot, tnom
       use tracer_mod, only: noms, igcm_h2o_vap, igcm_h2o_ice
+      use surfdat_h, only: phisfi, z0, zmea, zstd, zsig, zgam, zthe,
+     &                     albedodat, z0_default
+      use comsoil_h, only: inertiedat, layer, mlayer, nsoilmx
       implicit none
 
 #include "dimensions.h"
+      integer, parameter :: ngridmx = (2+(jjm-1)*iim - 1/jjm) 
 #include "dimphys.h"
-#include "surfdat.h"
-#include "comsoil.h"
-#include "dimradmars.h"
-#include "yomaer.h"
+!#include "surfdat.h"
+!#include "comsoil.h"
+!#include "dimradmars.h"
+!#include "yomaer.h"
 #include "planete.h"
 #include "paramet.h"
@@ -404 +408 @@
 
         write(*,*) 'Reading file START_ARCHIVE'
-        CALL lect_start_archive(nqtot,date,tsurf,tsoil,emis,q2,
-     .   t,ucov,vcov,ps,co2ice,teta,phisold_newgrid,q,qsurf,
+        CALL lect_start_archive(ngridmx,llm,nqtot,
+     &   date,tsurf,tsoil,emis,q2,
+     &   t,ucov,vcov,ps,co2ice,teta,phisold_newgrid,q,qsurf,
      &   surfith,nid)
         write(*,*) "OK, read start_archive file"
@@ -425 +430 @@
         write(*,*) 'Reading file STARTFI'
         fichnom = 'startfi.nc'
-        CALL phyetat0 (fichnom,tab0,Lmodif,nsoilmx,nqtot,
+        CALL phyetat0 (fichnom,tab0,Lmodif,nsoilmx,ngridmx,llm,nqtot,
      .        day_ini,time,
      .        tsurf,tsoil,emis,q2,qsurf,co2ice)
@@ -858 +863 @@
           endif
           
-          call inichim_newstart(nq, q, qsurf, ps, flagh2o, flagthermo)
+          call inichim_newstart(ngridmx, nq, q, qsurf, ps, 
+     &                          flagh2o, flagthermo)
 
          ! We want to have the very same value at lon -180 and lon 180
@@ -1472 +1478 @@
 C
 
-      call physdem0("restartfi.nc",lonfi,latfi,nsoilmx,nqtot,
-     .              dtphys,real(day_ini),0.0,
+      call physdem0("restartfi.nc",lonfi,latfi,nsoilmx,ngridmx,llm,
+     .              nqtot,dtphys,real(day_ini),0.0,
      .              airefi,albfi,ithfi,zmea,zstd,zsig,zgam,zthe)
-      call physdem1("restartfi.nc",nsoilmx,nqtot,
+      call physdem1("restartfi.nc",nsoilmx,ngridmx,llm,nqtot,
      .              dtphys,hour_ini,
      .              tsurf,tsoil,co2ice,emis,q2,qsurf)

trunk/LMDZ.MARS/libf/dyn3d/start2archive.F

@@ -20 +20 @@
 
       use infotrac, only: iniadvtrac, nqtot, tnom
+      use comsoil_h, only: nsoilmx, inertiedat
+      use surfdat_h, only: ini_surfdat_h
+      use comsoil_h, only: ini_comsoil_h
       implicit none
 
 #include "dimensions.h"
+      integer, parameter :: ngridmx = (2+(jjm-1)*iim - 1/jjm) 
 #include "paramet.h"
 #include "comconst.h"
@@ -34 +38 @@
 #include "description.h"
 
-#include "dimphys.h"
-#include "comsoil.h"
+!#include "dimphys.h"
+!#include "comsoil.h"
 !#include"advtrac.h"
 #include "netcdf.inc"
@@ -62 +66 @@
       REAL tsoil(ngridmx,nsoilmx) ! Soil temperature
       REAL co2ice(ngridmx)      ! CO2 ice layer
-      REAL q2(ngridmx,nlayermx+1)
+      REAL q2(ngridmx,llm+1)
       REAL,ALLOCATABLE :: qsurf(:,:)
       REAL emis(ngridmx)
@@ -126 +130 @@
       allocate(qsurf(ngridmx,nqtot))
       allocate(qsurfS(ip1jmp1,nqtot))
+      call ini_surfdat_h(ngridmx)
+      call ini_comsoil_h(ngridmx)
+      
 
       fichnom = 'start.nc'
@@ -135 +142 @@
       Lmodif=0
 
-      CALL phyetat0 (fichnom,0,Lmodif,nsoilmx,nqtot,day_ini_fi,timefi,
-     .      tsurf,tsoil,emis,q2,qsurf,co2ice)
+      CALL phyetat0 (fichnom,0,Lmodif,nsoilmx,ngridmx,llm,nqtot,
+     &      day_ini_fi,timefi,tsurf,tsoil,emis,q2,qsurf,co2ice)
 
        ierr = NF_OPEN (fichnom, NF_NOWRITE,nid1)

trunk/LMDZ.MARS/libf/dyn3d/write_archive.F

@@ -32 +32 @@
 c=======================================================================
 
+      use comsoil_h, only: nsoilmx
       implicit none
 

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

@@ -4 +4 @@
 !------------------------------------------------------------------
 
-!     Don't forget to set up the right number of scatterer
-!       (naerkind) in dimradmars.h!
+!     Don't forget that naerkind is set in scatterers.h 
+!       (built when compiling with makegcm -s #)
+
       character*20  name_iaer(naerkind)  ! name of the scatterers
 !     Scatterer: DUST

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

@@ -7 +7 @@
       use tracer_mod, only: noms, igcm_h2o_ice, igcm_dust_mass,
      &                      igcm_dust_submicron, rho_dust, rho_ice
+      use comgeomfi_h, only: lati ! grid point latitudes (rad)
+      use yomaer_h, only: tauvis
        IMPLICIT NONE
 c=======================================================================
@@ -34 +36 @@
 c   pq                Dust mixing ratio (used if tracer =T and active=T).
 c   reffrad(ngrid,nlayer,naerkind)  Aerosol effective radius
-c   QREFvis3d(ngridmx,nlayermx,naerkind) \ 3d extinction coefficients
-c   QREFir3d(ngridmx,nlayermx,naerkind)  / at reference wavelengths;
-c   omegaREFvis3d(ngridmx,nlayermx,naerkind) \ 3d single scat. albedo
-c   omegaREFir3d(ngridmx,nlayermx,naerkind)  / at reference wavelengths;
+c   QREFvis3d(ngrid,nlayer,naerkind) \ 3d extinction coefficients
+c   QREFir3d(ngrid,nlayer,naerkind)  / at reference wavelengths;
+c   omegaREFvis3d(ngrid,nlayer,naerkind) \ 3d single scat. albedo
+c   omegaREFir3d(ngrid,nlayer,naerkind)  / at reference wavelengths;
 c
 c   output:
@@ -48 +50 @@
 c
 c=======================================================================
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 #include "callkeys.h"
 #include "comcstfi.h"
-#include "comgeomfi.h"
-#include "dimradmars.h"
-#include "yomaer.h"
+!#include "comgeomfi.h"
+!#include "dimradmars.h"
+!#include "yomaer.h"
 !#include "tracer.h"
+! naerkind is set in scatterers.h (built when compiling with makegcm -s #)
+#include"scatterers.h"
 #include "planete.h"
 #include "aerkind.h"
@@ -73 +77 @@
       REAL tauref(ngrid), tau(ngrid,naerkind)
       REAL aerosol(ngrid,nlayer,naerkind)
-      REAL dsodust(ngridmx,nlayermx)
+      REAL dsodust(ngrid,nlayer)
       REAL reffrad(ngrid,nlayer,naerkind)
       REAL nueffrad(ngrid,nlayer,naerkind)
-      REAL QREFvis3d(ngridmx,nlayermx,naerkind)
-      REAL QREFir3d(ngridmx,nlayermx,naerkind)
-      REAL omegaREFvis3d(ngridmx,nlayermx,naerkind)
-      REAL omegaREFir3d(ngridmx,nlayermx,naerkind)
+      REAL QREFvis3d(ngrid,nlayer,naerkind)
+      REAL QREFir3d(ngrid,nlayer,naerkind)
+      REAL omegaREFvis3d(ngrid,nlayer,naerkind)
+      REAL omegaREFir3d(ngrid,nlayer,naerkind)
 c
 c    Local variables :
@@ -85 +89 @@
       INTEGER l,ig,iq,i,j
       INTEGER iaer           ! Aerosol index
-      real topdust(ngridmx)
+      real topdust(ngrid)
       real zlsconst, zp
       real taueq,tauS,tauN
 c     Mean Qext(vis)/Qext(ir) profile
-      real msolsir(nlayermx,naerkind)
+      real msolsir(nlayer,naerkind)
 c     Mean Qext(ir)/Qabs(ir) profile
-      real mqextsqabs(nlayermx,naerkind)
+      real mqextsqabs(nlayer,naerkind)
 c     Variables used when multiple particle sizes are used
 c       for dust or water ice particles in the radiative transfer
 c       (see callradite.F for more information).
-      REAL taudusttmp(ngridmx)! Temporary dust opacity
+      REAL taudusttmp(ngrid)! Temporary dust opacity
                                !   used before scaling
-      REAL tauscaling(ngridmx) ! Scaling factor for qdust and Ndust
-      REAL taudustvis(ngridmx) ! Dust opacity after scaling
-      REAL taudusttes(ngridmx) ! Dust opacity at IR ref. wav. as
+      REAL tauscaling(ngrid) ! Scaling factor for qdust and Ndust
+      REAL taudustvis(ngrid) ! Dust opacity after scaling
+      REAL taudusttes(ngrid) ! Dust opacity at IR ref. wav. as
                                !   "seen" by the GCM.
-      REAL taucloudvis(ngridmx)! Cloud opacity at visible
+      REAL taucloudvis(ngrid)! Cloud opacity at visible
                                !   reference wavelength
-      REAL taucloudtes(ngridmx)! Cloud opacity at infrared
+      REAL taucloudtes(ngrid)! Cloud opacity at infrared
                                !   reference wavelength using
                                !   Qabs instead of Qext
@@ -111 +115 @@
 c   ---------------------
 
-      REAL topdust0(ngridmx) 
-      SAVE topdust0
+      REAL,SAVE,ALLOCATABLE :: topdust0(:) 
+
 c     Level under which the dust mixing ratio is held constant
 c       when computing the dust opacity in each layer
@@ -135 +139 @@
 
       IF (firstcall) THEN
+        ! allocate local saved arrays
+        allocate(nqdust(nq))
+        allocate(topdust0(ngrid))
+        
         ! identify scatterers that are dust
         naerdust=0
@@ -145 +153 @@
         ENDDO
         ! identify tracers which are dust
-        allocate(nqdust(nq))
         i=0
         DO iq=1,nq
@@ -174 +181 @@
           WRITE(*,*) "Aerosol # ",iaer
           DO l=1,nlayer
-            DO ig=1,ngridmx
+            DO ig=1,ngrid
               msolsir(l,iaer)=msolsir(l,iaer)+
      &              QREFvis3d(ig,l,iaer)/
@@ -181 +188 @@
      &              (1.E0-omegaREFir3d(ig,l,iaer))**(-1)
             ENDDO
-            msolsir(l,iaer)=msolsir(l,iaer)/REAL(ngridmx)
-            mqextsqabs(l,iaer)=mqextsqabs(l,iaer)/REAL(ngridmx)
+            msolsir(l,iaer)=msolsir(l,iaer)/REAL(ngrid)
+            mqextsqabs(l,iaer)=mqextsqabs(l,iaer)/REAL(ngrid)
           ENDDO
           WRITE(*,*) "solsir: ",msolsir(:,iaer)
@@ -199 +206 @@
 c     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
       IF(iaervar.eq.1) THEN 
-         do ig=1, ngridmx
+         do ig=1, ngrid
           tauref(ig)=max(tauvis,1.e-9) ! tauvis=cste (set in callphys.def
                                        ! or read in starfi
@@ -220 +227 @@
 c            taueq= 0.2 +(0.5-0.2) *(cos(0.5*(ls+pi-4.363)))**14
 c           endif
-        do ig=1,ngrid/2  ! Northern hemisphere
-          tauref(ig)= tauN +
-     &    (taueq-tauN)*0.5*(1+tanh((45-lati(ig)*180./pi)*6/60))
-        end do
-        do ig=ngrid/2+1, ngridmx  ! Southern hemisphere
-          tauref(ig)= tauS +
-     &    (taueq-tauS)*0.5*(1+tanh((45+lati(ig)*180./pi)*6/60))
-        end do
+        do ig=1,ngrid
+          if (lati(ig).ge.0) then
+          ! Northern hemisphere
+            tauref(ig)= tauN +
+     &      (taueq-tauN)*0.5*(1+tanh((45-lati(ig)*180./pi)*6/60))
+          else
+          ! Southern hemisphere
+            tauref(ig)= tauS +
+     &      (taueq-tauS)*0.5*(1+tanh((45+lati(ig)*180./pi)*6/60))
+          endif
+        enddo ! of do ig=1,ngrid
       ELSE IF (iaervar.eq.5) THEN   ! << Escalier Scenario>>
 c         tauref(1) = 0.2
@@ -397 +407 @@
 c       3. Outputs -- Now done in physiq.F
 !        IF (ngrid.NE.1) THEN
-!          CALL WRITEDIAGFI(ngridmx,'tauVIS','tauext VIS refwvl',
+!          CALL WRITEDIAGFI(ngrid,'tauVIS','tauext VIS refwvl',
 !     &      ' ',2,taucloudvis)
-!          CALL WRITEDIAGFI(ngridmx,'tauTES','tauabs IR refwvl',
+!          CALL WRITEDIAGFI(ngrid,'tauTES','tauabs IR refwvl',
 !     &      ' ',2,taucloudtes)
 !          IF (callstats) THEN
-!            CALL wstats(ngridmx,'tauVIS','tauext VIS refwvl',
+!            CALL wstats(ngrid,'tauVIS','tauext VIS refwvl',
 !     &        ' ',2,taucloudvis)
-!            CALL wstats(ngridmx,'tauTES','tauabs IR refwvl',
+!            CALL wstats(ngrid,'tauTES','tauabs IR refwvl',
 !     &        ' ',2,taucloudtes)
 !          ENDIF
@@ -452 +462 @@
 c output for debug
 c        IF (ngrid.NE.1) THEN
-c             CALL WRITEDIAGFI(ngridmx,'taudusttmp','virtual tau dust',
+c             CALL WRITEDIAGFI(ngrid,'taudusttmp','virtual tau dust',
 c     &      '#',2,taudusttmp)
-c             CALL WRITEDIAGFI(ngridmx,'tausca','tauscaling',
+c             CALL WRITEDIAGFI(ngrid,'tausca','tauscaling',
 c     &      '#',2,tauscaling)
 c        ELSE
-c             CALL WRITEDIAGFI(ngridmx,'taudusttmp','virtual tau dust',
+c             CALL WRITEDIAGFI(ngrid,'taudusttmp','virtual tau dust',
 c     &      '#',0,taudusttmp)
-c             CALL WRITEDIAGFI(ngridmx,'tausca','tauscaling',
+c             CALL WRITEDIAGFI(ngrid,'tausca','tauscaling',
 c     &      '#',0,tauscaling)
 c        ENDIF
@@ -477 +487 @@
 c      dsodust(1:ngrid,1:nlayer) = 0.
 c      DO iaer=1,naerdust
-c        DO l=1,nlayermx
+c        DO l=1,nlayer
 c          DO ig=1,ngrid
 c            dsodust(ig,l) = dsodust(ig,l) +
@@ -486 +496 @@
 c        IF (ngrid.NE.1) THEN
 c          write(txt2,'(i1.1)') iaer
-c          call WRITEDIAGFI(ngridmx,'taudust'//txt2,
+c          call WRITEDIAGFI(ngrid,'taudust'//txt2,
 c     &                    'Dust col opacity',
 c     &                    ' ',2,tau(1,iaerdust(iaer)))
 c          IF (callstats) THEN
-c            CALL wstats(ngridmx,'taudust'//txt2,
+c            CALL wstats(ngrid,'taudust'//txt2,
 c     &                 'Dust col opacity',
 c     &                 ' ',2,tau(1,iaerdust(iaer)))
@@ -498 +508 @@
 
 c      IF (ngrid.NE.1) THEN
-c       CALL WRITEDIAGFI(ngridmx,'dsodust','tau*g/dp',
+c       CALL WRITEDIAGFI(ngrid,'dsodust','tau*g/dp',
 c    &                    'm2.kg-1',3,dsodust)
 c        IF (callstats) THEN
-c          CALL wstats(ngridmx,'dsodust',
+c          CALL wstats(ngrid,'dsodust',
 c     &               'tau*g/dp',
 c     &               'm2.kg-1',3,dsodust)

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

@@ -4 +4 @@
      &                            QREFvis3d,QREFir3d,
      &                            omegaREFvis3d,omegaREFir3d)
+      use dimradmars_mod, only: nir, nsun
+      use yomaer_h, only: radiustab, nsize, QVISsQREF, omegavis, gvis,
+     &                    QIRsQREF, omegaIR, gIR, QREFvis, QREFir,
+     &                    omegaREFvis, omegaREFir
       IMPLICIT NONE
 c     =============================================================
@@ -26 +30 @@
 #include "dimphys.h"
 #include "callkeys.h"
-#include "dimradmars.h"
-#include "yomaer.h"
+!#include "dimradmars.h"
+!#include "yomaer.h"
+! naerkind is set in scatterers.h (built when compiling with makegcm -s #)
+#include"scatterers.h"
 
 c     Local variables 
@@ -49 +55 @@
       INTEGER :: grid_i,grid_j
 c     Intermediate variable
-      REAL :: var_tmp,var3d_tmp(ngridmx,nlayermx)
+      REAL :: var_tmp,var3d_tmp(ngrid,nlayer)
 c     Bilinear interpolation factors
       REAL :: kx,ky,k1,k2,k3,k4
@@ -87 +93 @@
 
 c     Radius axis of the interpolation grid
-      REAL,SAVE :: refftab(refftabsize,naerkind,2)
+      REAL,SAVE,ALLOCATABLE :: refftab(:,:,:)
 c     Variance axis of the interpolation grid
-      REAL,SAVE :: nuefftab(nuefftabsize,naerkind,2)
+      REAL,SAVE,ALLOCATABLE :: nuefftab(:,:,:)
 c     Volume ratio of the grid
       REAL,SAVE :: logvratgrid(naerkind,2)
@@ -96 +102 @@
      &                = .false.
 c     Optical properties of the grid (VISIBLE)
-      REAL,SAVE :: qsqrefVISgrid(refftabsize,nuefftabsize,nsun,naerkind)
-      REAL,SAVE :: qextVISgrid(refftabsize,nuefftabsize,nsun,naerkind)
-      REAL,SAVE :: qscatVISgrid(refftabsize,nuefftabsize,nsun,naerkind)
-      REAL,SAVE :: omegVISgrid(refftabsize,nuefftabsize,nsun,naerkind)
-      REAL,SAVE :: gVISgrid(refftabsize,nuefftabsize,nsun,naerkind)
+      REAL,SAVE,ALLOCATABLE :: qsqrefVISgrid(:,:,:,:)
+      REAL,SAVE,ALLOCATABLE :: qextVISgrid(:,:,:,:)
+      REAL,SAVE,ALLOCATABLE :: qscatVISgrid(:,:,:,:)
+      REAL,SAVE,ALLOCATABLE :: omegVISgrid(:,:,:,:)
+      REAL,SAVE,ALLOCATABLE :: gVISgrid(:,:,:,:)
 c     Optical properties of the grid (INFRARED)
-      REAL,SAVE :: qsqrefIRgrid(refftabsize,nuefftabsize,nir,naerkind)
-      REAL,SAVE :: qextIRgrid(refftabsize,nuefftabsize,nir,naerkind)
-      REAL,SAVE :: qscatIRgrid(refftabsize,nuefftabsize,nir,naerkind)
-      REAL,SAVE :: omegIRgrid(refftabsize,nuefftabsize,nir,naerkind)
-      REAL,SAVE :: gIRgrid(refftabsize,nuefftabsize,nir,naerkind)
+      REAL,SAVE,ALLOCATABLE :: qsqrefIRgrid(:,:,:,:)
+      REAL,SAVE,ALLOCATABLE :: qextIRgrid(:,:,:,:)
+      REAL,SAVE,ALLOCATABLE :: qscatIRgrid(:,:,:,:)
+      REAL,SAVE,ALLOCATABLE :: omegIRgrid(:,:,:,:)
+      REAL,SAVE,ALLOCATABLE :: gIRgrid(:,:,:,:)
 c     Optical properties of the grid (REFERENCE WAVELENGTHS)
       REAL,SAVE :: qrefVISgrid(refftabsize,nuefftabsize,naerkind)
@@ -124 +130 @@
       REAL,SAVE :: radGAUSb(ngau,naerkind,2)
 
-      REAL,SAVE :: qsqrefVISa(nsun,ngau,naerkind)
-      REAL,SAVE :: qrefVISa(ngau,naerkind)
-      REAL,SAVE :: qsqrefVISb(nsun,ngau,naerkind)
-      REAL,SAVE :: qrefVISb(ngau,naerkind)
-      REAL,SAVE :: omegVISa(nsun,ngau,naerkind)
-      REAL,SAVE :: omegrefVISa(ngau,naerkind)
-      REAL,SAVE :: omegVISb(nsun,ngau,naerkind)
-      REAL,SAVE :: omegrefVISb(ngau,naerkind)
-      REAL,SAVE :: gVISa(nsun,ngau,naerkind)
-      REAL,SAVE :: gVISb(nsun,ngau,naerkind)
-
-      REAL,SAVE :: qsqrefIRa(nir,ngau,naerkind)
-      REAL,SAVE :: qrefIRa(ngau,naerkind)
-      REAL,SAVE :: qsqrefIRb(nir,ngau,naerkind)
-      REAL,SAVE :: qrefIRb(ngau,naerkind)
-      REAL,SAVE :: omegIRa(nir,ngau,naerkind)
-      REAL,SAVE :: omegrefIRa(ngau,naerkind)
-      REAL,SAVE :: omegIRb(nir,ngau,naerkind)
-      REAL,SAVE :: omegrefIRb(ngau,naerkind)
-      REAL,SAVE :: gIRa(nir,ngau,naerkind)
-      REAL,SAVE :: gIRb(nir,ngau,naerkind)
+      REAL,SAVE,ALLOCATABLE :: qsqrefVISa(:,:,:)
+      REAL,SAVE,ALLOCATABLE :: qrefVISa(:,:)
+      REAL,SAVE,ALLOCATABLE :: qsqrefVISb(:,:,:)
+      REAL,SAVE,ALLOCATABLE :: qrefVISb(:,:)
+      REAL,SAVE,ALLOCATABLE :: omegVISa(:,:,:)
+      REAL,SAVE,ALLOCATABLE :: omegrefVISa(:,:)
+      REAL,SAVE,ALLOCATABLE :: omegVISb(:,:,:)
+      REAL,SAVE,ALLOCATABLE :: omegrefVISb(:,:)
+      REAL,SAVE,ALLOCATABLE :: gVISa(:,:,:)
+      REAL,SAVE,ALLOCATABLE :: gVISb(:,:,:)
+
+      REAL,SAVE,ALLOCATABLE :: qsqrefIRa(:,:,:)
+      REAL,SAVE,ALLOCATABLE :: qrefIRa(:,:)
+      REAL,SAVE,ALLOCATABLE :: qsqrefIRb(:,:,:)
+      REAL,SAVE,ALLOCATABLE :: qrefIRb(:,:)
+      REAL,SAVE,ALLOCATABLE :: omegIRa(:,:,:)
+      REAL,SAVE,ALLOCATABLE :: omegrefIRa(:,:)
+      REAL,SAVE,ALLOCATABLE :: omegIRb(:,:,:)
+      REAL,SAVE,ALLOCATABLE :: omegrefIRb(:,:)
+      REAL,SAVE,ALLOCATABLE :: gIRa(:,:,:)
+      REAL,SAVE,ALLOCATABLE :: gIRb(:,:,:)
 
       REAL :: radiusm
@@ -152 +158 @@
 c     ------
 
-      INTEGER :: ngrid,nlayer
+      INTEGER,INTENT(IN) :: ngrid,nlayer
 c     Aerosol effective radius used for radiative transfer (meter)
-      REAL :: reffrad(ngridmx,nlayermx,naerkind)
+      REAL,INTENT(IN) :: reffrad(ngrid,nlayer,naerkind)
 c     Aerosol effective variance used for radiative transfer (n.u.)
-      REAL :: nueffrad(ngridmx,nlayermx,naerkind)
+      REAL,INTENT(IN) :: nueffrad(ngrid,nlayer,naerkind)
 
 c     Outputs
 c     -------
 
-      REAL :: QVISsQREF3d(ngridmx,nlayermx,nsun,naerkind)
-      REAL :: omegaVIS3d(ngridmx,nlayermx,nsun,naerkind)
-      REAL :: gVIS3d(ngridmx,nlayermx,nsun,naerkind)
-
-      REAL :: QIRsQREF3d(ngridmx,nlayermx,nir,naerkind)
-      REAL :: omegaIR3d(ngridmx,nlayermx,nir,naerkind)
-      REAL :: gIR3d(ngridmx,nlayermx,nir,naerkind)
-
-      REAL :: QREFvis3d(ngridmx,nlayermx,naerkind)
-      REAL :: QREFir3d(ngridmx,nlayermx,naerkind)
-
-      REAL :: omegaREFvis3d(ngridmx,nlayermx,naerkind)
-      REAL :: omegaREFir3d(ngridmx,nlayermx,naerkind)
+      REAL,INTENT(OUT) :: QVISsQREF3d(ngrid,nlayer,nsun,naerkind)
+      REAL,INTENT(OUT) :: omegaVIS3d(ngrid,nlayer,nsun,naerkind)
+      REAL,INTENT(OUT) :: gVIS3d(ngrid,nlayer,nsun,naerkind)
+
+      REAL,INTENT(OUT) :: QIRsQREF3d(ngrid,nlayer,nir,naerkind)
+      REAL,INTENT(OUT) :: omegaIR3d(ngrid,nlayer,nir,naerkind)
+      REAL,INTENT(OUT) :: gIR3d(ngrid,nlayer,nir,naerkind)
+
+      REAL,INTENT(OUT) :: QREFvis3d(ngrid,nlayer,naerkind)
+      REAL,INTENT(OUT) :: QREFir3d(ngrid,nlayer,naerkind)
+
+      REAL,INTENT(OUT) :: omegaREFvis3d(ngrid,nlayer,naerkind)
+      REAL,INTENT(OUT) :: omegaREFir3d(ngrid,nlayer,naerkind)
 
 c     Tests
@@ -181 +187 @@
       INTEGER, PARAMETER :: out_iaer = 2
       INTEGER :: out_ndim
-      REAL :: out_qext(ngridmx,nlayermx)
-      REAL :: out_omeg(ngridmx,nlayermx)
-      REAL :: out_g(ngridmx,nlayermx)
+      REAL :: out_qext(ngrid,nlayer)
+      REAL :: out_omeg(ngrid,nlayer)
+      REAL :: out_g(ngrid,nlayer)
       INTEGER :: out_nchannel
       CHARACTER*1 :: out_str
@@ -190 +196 @@
 c     -----------------------------------------------
       IF (firstcall) THEN
+c       0.0 Allocate all local saved arrays:
+        allocate(refftab(refftabsize,naerkind,2))
+        allocate(nuefftab(nuefftabsize,naerkind,2))
+        ! Optical properties of the grid (VISIBLE)
+        allocate(qsqrefVISgrid(refftabsize,nuefftabsize,nsun,naerkind))
+        allocate(qextVISgrid(refftabsize,nuefftabsize,nsun,naerkind))
+        allocate(qscatVISgrid(refftabsize,nuefftabsize,nsun,naerkind))
+        allocate(omegVISgrid(refftabsize,nuefftabsize,nsun,naerkind))
+        allocate(gVISgrid(refftabsize,nuefftabsize,nsun,naerkind))
+        ! Optical properties of the grid (INFRARED)
+        allocate(qsqrefIRgrid(refftabsize,nuefftabsize,nir,naerkind))
+        allocate(qextIRgrid(refftabsize,nuefftabsize,nir,naerkind))
+        allocate(qscatIRgrid(refftabsize,nuefftabsize,nir,naerkind))
+        allocate(omegIRgrid(refftabsize,nuefftabsize,nir,naerkind))
+        allocate(gIRgrid(refftabsize,nuefftabsize,nir,naerkind))
+        
+        allocate(qsqrefVISa(nsun,ngau,naerkind))
+        allocate(qrefVISa(ngau,naerkind))
+        allocate(qsqrefVISb(nsun,ngau,naerkind))
+        allocate(qrefVISb(ngau,naerkind))
+        allocate(omegVISa(nsun,ngau,naerkind))
+        allocate(omegrefVISa(ngau,naerkind))
+        allocate(omegVISb(nsun,ngau,naerkind))
+        allocate(omegrefVISb(ngau,naerkind))
+        allocate(gVISa(nsun,ngau,naerkind))
+        allocate(gVISb(nsun,ngau,naerkind))
+        
+        allocate(qsqrefIRa(nir,ngau,naerkind))
+        allocate(qrefIRa(ngau,naerkind))
+        allocate(qsqrefIRb(nir,ngau,naerkind))
+        allocate(qrefIRb(ngau,naerkind))
+        allocate(omegIRa(nir,ngau,naerkind))
+        allocate(omegrefIRa(ngau,naerkind))
+        allocate(omegIRb(nir,ngau,naerkind))
+        allocate(omegrefIRb(ngau,naerkind))
+        allocate(gIRa(nir,ngau,naerkind))
+        allocate(gIRb(nir,ngau,naerkind))
+        
 c       0.1 Pi!
         pi = 2. * asin(1.e0)
@@ -758 +802 @@
      &                  k2*omegrefIRgrid(grid_i+1,1,iaer)
           ENDIF                  ! --------------------------------
-        ENDDO !nlayermx
-      ENDDO !ngridmx
+        ENDDO !nlayer
+      ENDDO !ngrid
 c==================================================================
       ELSE                                          ! VARYING NUEFF
@@ -1171 +1215 @@
      &                  k4*omegrefIRgrid(grid_i,grid_j+1,iaer)
           ENDIF                  ! --------------------------------
-        ENDDO !nlayermx
-      ENDDO !ngridmx
+        ENDDO !nlayer
+      ENDDO !ngrid
 
       ENDIF ! varyingnueff

trunk/LMDZ.MARS/libf/phymars/albedocaps.F90

@@ -5 +5 @@
 
 ! to use the 'getin' routine 
-use ioipsl_getincom 
-
+use ioipsl_getincom, only: getin
+#ifdef MESOSCALE
+use comgeomfi_h
+#endif
+use surfdat_h, only: TESicealbedo, TESice_Ncoef, TESice_Scoef, &
+                     emisice, albedice, watercaptag, albedo_h2o_ice, &
+                     emissiv, albedodat
 implicit none
 
 #include"dimensions.h"
 #include"dimphys.h"
-#include"surfdat.h"
+!#include"surfdat.h"
 #include"callkeys.h"
-#ifdef MESOSCALE
-#include"comgeomfi.h"
-#endif
+!#ifdef MESOSCALE
+!#include"comgeomfi.h"
+!#endif
 
 ! arguments:
@@ -98 +103 @@
 subroutine TES_icecap_albedo(zls,ig,alb,icap)
 
+use comgeomfi_h, only: lati, long
+use surfdat_h, only: albedice, TESice_Ncoef, TESice_Scoef
 implicit none
 #include"dimensions.h"
 #include"dimphys.h"
-#include"surfdat.h"
-#include"comgeomfi.h"
+!#include"surfdat.h"
+!#include"comgeomfi.h"
 #include"netcdf.inc"
 #include"datafile.h"

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

@@ -10 +10 @@
 c  the scale over which this happens are set in the nlteparams.h file.
 c  Above layer NLAYLTE the tendency is purely the sum of NLTE contributions.
-c  (Note : nlaylte is calculated by "nlthermeq" and stored in common "yomlw.h")
+c  (Note : nlaylte is calculated by "nlthermeq" and stored in module "yomlw_h")
 c  Stephen Lewis 6/2000 FF 
 c
+      use yomlw_h, only: nlaylte
       implicit none
-#include "dimensions.h"
-#include "dimphys.h"
-#include "dimradmars.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
+!#include "dimradmars.h"
 #include "nlteparams.h"
-#include "yomlw.h"
+!#include "yomlw.h"
 
 c     Input:

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

@@ -4 +4 @@
 
 
-                                                   
+       use surfdat_h, only: zstd, zsig, zgam, zthe
+       use dimradmars_mod, only: ndomainsz
        IMPLICIT NONE
 c=======================================================================
@@ -16 +17 @@
 c        ("sub-domain") to save memory and
 c        be able run on a workstation at high resolution
-c        The sub-grid size is defined in dimradmars.h.
+c        The sub-grid size is defined in dimradmars_mod.
 c
 c   author:   
@@ -54 +55 @@
 c    ------------------
 c
-#include "dimensions.h"
-#include "dimphys.h"
-#include "dimradmars.h"
-#include "surfdat.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
+!#include "dimradmars.h"
+!#include "surfdat.h"
 
 c-----------------------------------------------------------------------
@@ -75 +76 @@
 c    -----------------
 
-      REAL sigtest(nlayermx+1)
-      INTEGER igwd,igwdim,itest(ngridmx)
-
-      INTEGER ndomain
-      parameter (ndomain = (ngridmx-1) / ndomainsz + 1)
+      REAL sigtest(nlayer+1)
+      INTEGER igwd,igwdim,itest(ngrid)
+
+      INTEGER,SAVE :: ndomain
+!      parameter (ndomain = (ngrid-1) / ndomainsz + 1)
 
       INTEGER l,ig
       INTEGER jd,ig0,nd
 
-      REAL zulow(ngridmx),zvlow(ngridmx)
-      REAL zustr(ngridmx),zvstr(ngridmx)
-
-      REAL zplev(ndomainsz,nlayermx+1)
-      REAL zplay(ndomainsz,nlayermx)
-      REAL zt(ndomainsz,nlayermx)
-      REAL zu(ndomainsz,nlayermx)
-      REAL zv(ndomainsz,nlayermx)
+      REAL zulow(ngrid),zvlow(ngrid)
+      REAL zustr(ngrid),zvstr(ngrid)
+
+      REAL zplev(ndomainsz,nlayer+1)
+      REAL zplay(ndomainsz,nlayer)
+      REAL zt(ndomainsz,nlayer)
+      REAL zu(ndomainsz,nlayer)
+      REAL zv(ndomainsz,nlayer)
       INTEGER zidx(ndomainsz)
-      REAL zzdtgw(ndomainsz,nlayermx)
-      REAL zzdugw(ndomainsz,nlayermx)
-      REAL zzdvgw(ndomainsz,nlayermx)
+      REAL zzdtgw(ndomainsz,nlayer)
+      REAL zzdugw(ndomainsz,nlayer)
+      REAL zzdvgw(ndomainsz,nlayer)
 
       logical ll
@@ -114 +115 @@
 
       IF (firstcall) THEN
-         do l=1,nlayermx+1
+        ndomain = (ngrid-1) / ndomainsz + 1
+
+         do l=1,nlayer+1
            sigtest(l)=pplev(1,l)/pplev(1,1)
          enddo
-         call sugwd(nlayermx,sigtest)
-
-         if (ngridmx .EQ. 1) then
+         call sugwd(nlayer,sigtest)
+
+         if (ngrid .EQ. 1) then
            if (ndomainsz .NE. 1) then
              print*
              print*,'ATTENTION !!!'
              print*,'pour tourner en 1D, meme pour drag_noro '
-             print*,'fixer ndomainsz=1 dans phymars/dimradmars.h'
+             print*,'fixer ndomainsz=1 dans phymars/dimradmars_mod'
              print*
              call exit(1)
@@ -139 +142 @@
         ig0=(jd-1)*ndomainsz
         if (jd.eq.ndomain) then
-          nd=ngridmx-ig0
+          nd=ngrid-ig0
         else
           nd=ndomainsz

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

@@ -5 +5 @@
      &     nuice,co2ice)
 
-       IMPLICIT NONE
+      use dimradmars_mod, only: ndomainsz, nflev, nsun, nir
+      use yomlw_h, only: gcp, nlaylte
+      IMPLICIT NONE
 c=======================================================================
 c   subject:
@@ -18 +20 @@
 c   The calculations are only performed for the first "nlaylte"
 c   parameters (nlaylte is calculated by subroutine "nlthermeq"
-c   and stored in common "yomlw.h").
+c   and stored in module "yomlw_h").
 c
 c   The purpose of this subroutine is to:
@@ -25 +27 @@
 c        ("sub-domain") to save memory and
 c        be able run on a workstation at high resolution
-c        The sub-grid size is defined in dimradmars.h
+c        The sub-grid size is defined in dimradmars_mod
 c      3) Compute the 3D scattering parameters depending on the
 c        size distribution of the different tracers (added by JBM)
@@ -74 +76 @@
 c   
 c   This version has been modified to only calculate radiative tendencies
-c   over layers 1..NFLEV (set in dimradmars.h).  Returns zero for higher
+c   over layers 1..NFLEV (set in dimradmars_mod).  Returns zero for higher
 c   layers, if any.
 c   In other routines, nlayermx -> nflev.
@@ -85 +87 @@
 c   ----------
 c   Here, solar band#1 is spectral interval between "long1vis" and "long2vis"
-c   set in dimradmars.h 
+c   set in dimradmars_mod 
 c   Here, solar band#2 is spectral interval between "long2vis" and "long3vis"
-c   set in dimradmars.h 
+c   set in dimradmars_mod
 c
 c   input:
@@ -105 +107 @@
 c                                        (see below)
 c   emis                  Thermal IR surface emissivity (no unit)
-c   mu0(ngridmx)           cos of solar zenith angle
+c   mu0(ngrid)           cos of solar zenith angle
 c                           (=1 when sun at zenith)
 c   pplay(ngrid,nlayer)    pressure (Pa) in the middle of each layer
@@ -111 +113 @@
 c   pt(ngrid,nlayer)       atmospheric temperature in each layer (K)
 c   tsurf(ngrid)           surface temperature (K)
-c   fract(ngridmx)         day fraction of the time interval 
+c   fract(ngrid)         day fraction of the time interval 
 c                          =1 during the full day ; =0 during the night
 c   declin                 latitude of subsolar point
@@ -136 +138 @@
 c   aerosol(ngrid,nlayer,naerkind)    aerosol extinction optical depth
 c                         at reference wavelength "longrefvis" set
-c                         in dimradmars.h , in each layer, for one of
+c                         in dimradmars_h , in each layer, for one of
 c                         the "naerkind" kind of aerosol optical
 c                         properties.
@@ -145 +147 @@
 c    -------------
 c
-#include "dimensions.h"
-#include "dimphys.h"
-#include "dimradmars.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
+!#include "dimradmars.h"
 #include "comcstfi.h"
 #include "callkeys.h"
-#include "yomlw.h"
+!#include "yomlw.h"
+! naerkind is set in scatterers.h (built when compiling with makegcm -s #)
+#include"scatterers.h"
 #include "aerkind.h"
 
@@ -156 +160 @@
 c    Input/Output
 c    ------------
-      INTEGER icount        
-      INTEGER ngrid,nlayer,nq 
-      INTEGER igout
-
-      REAL pq(ngrid,nlayer,nq)
-      REAL tauscaling(ngridmx) ! Conversion factor for 
+      INTEGER,INTENT(IN) :: icount        
+      INTEGER,INTENT(IN) :: ngrid,nlayer,nq 
+      INTEGER,INTENT(IN) :: igout
+
+      REAL,INTENT(IN) :: pq(ngrid,nlayer,nq)
+      REAL,INTENT(IN) :: tauscaling(ngrid) ! Conversion factor for 
                                ! qdust and Ndust
-      REAL albedo(ngrid,2),emis(ngrid)
-      REAL ls,zday
-
-      REAL pplev(ngrid,nlayer+1),pplay(ngrid,nlayer)
-      REAL pt(ngrid,nlayer)
-      REAL tsurf(ngrid)
-      REAL dist_sol,mu0(ngrid),fract(ngrid)
-      REAL dtlw(ngridmx,nlayermx),dtsw(ngridmx,nlayermx)
-      REAL fluxsurf_lw(ngridmx), fluxtop_lw(ngridmx)
-      REAL fluxsurf_sw(ngridmx,2), fluxtop_sw(ngridmx,2)
-
-      REAL tauref(ngrid), tau(ngrid,naerkind)
-      REAL taucloudtes(ngridmx)! Cloud opacity at infrared
+      REAL,INTENT(IN) :: albedo(ngrid,2),emis(ngrid)
+      REAL,INTENT(IN) :: ls,zday
+
+      REAL,INTENT(IN) :: pplev(ngrid,nlayer+1),pplay(ngrid,nlayer)
+      REAL,INTENT(IN) :: pt(ngrid,nlayer)
+      REAL,INTENT(IN) :: tsurf(ngrid)
+      REAL,INTENT(IN) :: dist_sol,mu0(ngrid),fract(ngrid)
+      REAL,INTENT(OUT) :: dtlw(ngrid,nlayer),dtsw(ngrid,nlayer)
+      REAL,INTENT(OUT) :: fluxsurf_lw(ngrid), fluxtop_lw(ngrid)
+      REAL,INTENT(OUT) :: fluxsurf_sw(ngrid,2), fluxtop_sw(ngrid,2)
+
+      REAL,INTENT(OUT) :: tauref(ngrid), tau(ngrid,naerkind)
+      REAL,INTENT(OUT) :: taucloudtes(ngrid)! Cloud opacity at infrared
                                !   reference wavelength using
                                !   Qabs instead of Qext
                                !   (direct comparison with TES)
-      REAL aerosol(ngrid,nlayer,naerkind)
-      REAL rdust(ngridmx,nlayermx)  ! Dust geometric mean radius (m)
-      REAL rice(ngridmx,nlayermx)   ! Ice geometric mean radius (m)
-      REAL nuice(ngridmx,nlayermx)  ! Estimated effective variance
-      REAL co2ice(ngridmx)           ! co2 ice surface layer (kg.m-2)
+      REAL,INTENT(OUT) :: aerosol(ngrid,nlayer,naerkind)
+      REAL,INTENT(OUT) :: rdust(ngrid,nlayer)  ! Dust geometric mean radius (m)
+      REAL,INTENT(OUT) :: rice(ngrid,nlayer)   ! Ice geometric mean radius (m)
+      REAL,INTENT(OUT) :: nuice(ngrid,nlayer)  ! Estimated effective variance
+      REAL,INTENT(IN) :: co2ice(ngrid)           ! co2 ice surface layer (kg.m-2)
 
 c
@@ -194 +198 @@
 
       real  cste_mars ! solar constant on Mars (Wm-2)
-      REAL ptlev(ngridmx,nlayermx+1)
-
-      INTEGER ndomain
-      parameter (ndomain = (ngridmx-1) / ndomainsz + 1)
+      REAL ptlev(ngrid,nlayer+1)
+
+      INTEGER,SAVE :: ndomain
 
 c     Thermal IR net radiative budget (W m-2)
@@ -232 +235 @@
       REAL :: nueffrad(ngrid,nlayer,naerkind)
 c     Aerosol optical properties
-      REAL :: QVISsQREF3d(ngridmx,nlayermx,nsun,naerkind)
-      REAL :: omegaVIS3d(ngridmx,nlayermx,nsun,naerkind)
-      REAL :: gVIS3d(ngridmx,nlayermx,nsun,naerkind)
-
-      REAL :: QIRsQREF3d(ngridmx,nlayermx,nir,naerkind)
-      REAL :: omegaIR3d(ngridmx,nlayermx,nir,naerkind)
-      REAL :: gIR3d(ngridmx,nlayermx,nir,naerkind)
-
-      REAL :: QREFvis3d(ngridmx,nlayermx,naerkind)
-      REAL :: QREFir3d(ngridmx,nlayermx,naerkind)
-
-      REAL :: omegaREFvis3d(ngridmx,nlayermx,naerkind)
-      REAL :: omegaREFir3d(ngridmx,nlayermx,naerkind)
+      REAL :: QVISsQREF3d(ngrid,nlayer,nsun,naerkind)
+      REAL :: omegaVIS3d(ngrid,nlayer,nsun,naerkind)
+      REAL :: gVIS3d(ngrid,nlayer,nsun,naerkind)
+
+      REAL :: QIRsQREF3d(ngrid,nlayer,nir,naerkind)
+      REAL :: omegaIR3d(ngrid,nlayer,nir,naerkind)
+      REAL :: gIR3d(ngrid,nlayer,nir,naerkind)
+
+      REAL :: QREFvis3d(ngrid,nlayer,naerkind)
+      REAL :: QREFir3d(ngrid,nlayer,naerkind)
+
+      REAL :: omegaREFvis3d(ngrid,nlayer,naerkind)
+      REAL :: omegaREFir3d(ngrid,nlayer,naerkind)
 
 c   local saved variables
 c   ---------------------
 
-      real pview(ngridmx)
-      save pview
+      real,save,allocatable :: pview(:)
       
       real zco2   ! volume fraction of CO2 in Mars atmosphere
@@ -266 +268 @@
 
       IF (firstcall) THEN
+        ! compute ndomain and allocate local saved arrays
+        ndomain= (ngrid-1) / ndomainsz + 1
+        allocate(pview(ngrid))
 
 c        Please name the different scatterers here ----------------
 c        PLEASE MAKE SURE that you set up the right number of
-c          scatterers in dimradmars.h (naerkind);
+c          scatterers in scatterers.h (naerkind);
           name_iaer(1) = "dust_conrath"   !! default choice is good old Conrath profile
           IF (doubleq.AND.active) name_iaer(1) = "dust_doubleq" !! two-moment scheme
@@ -328 +333 @@
            write(*,*) "               expected ",naerkind
            write(*,*) "please make sure that the number of"
-           write(*,*) "scatterers in dimradmars.h, the names"
+           write(*,*) "scatterers in scatterers.h, the names"
            write(*,*) "in callradite.F, and the flags in"
            write(*,*) "callphys.def are all consistent!"
@@ -353 +358 @@
            WRITE(*,*) 'If activice is TRUE, water has to be set'
            WRITE(*,*) 'to TRUE, and "naerkind" must be at least'
-           WRITE(*,*) 'equal to 2 in dimradmars.h.'
+           WRITE(*,*) 'equal to 2 in scatterers.h.'
            CALL ABORT
          ELSE IF ( (.NOT.activice).AND.(naerkind.GT.1) ) THEN
@@ -364 +369 @@
 c        Loading the optical properties in external look-up tables:
          CALL SUAER
-         CALL SULW
+!         CALL SULW ! this step is now done in ini_yomlw_h
 
          write(*,*) 'Splitting radiative calculations: ',
-     $              ' ngridmx,ngrid,ndomainsz,ndomain',
-     $                ngridmx,ngrid,ndomainsz,ndomain
-         if (ngridmx .EQ. 1) then
+     $              ' ngrid,ndomainsz,ndomain',
+     $                ngrid,ndomainsz,ndomain
+         if (ngrid .EQ. 1) then
            if (ndomainsz .NE. 1) then
              print*
              print*,'ATTENTION !!!'
              print*,'pour tourner en 1D, '
-             print*,'fixer ndomainsz=1 dans phymars/dimradmars.h'
+             print*,'fixer ndomainsz=1 dans phymars/dimradmars_h'
              print*
              call exit(1)
@@ -409 +414 @@
         ig0=(jd-1)*ndomainsz
         if (jd.eq.ndomain) then
-         nd=ngridmx-ig0
+         nd=ngrid-ig0
         else
          nd=ndomainsz

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

@@ -29 +29 @@
 c   -------------
       
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 #include "comcstfi.h"
 !#include "tracer.h"
@@ -52 +52 @@
       real,intent(out) :: rice(ngrid,nlay)  ! H2O Ice geometric mean radius (m)
 c     Sedimentation radius of water ice
-      real,intent(in) :: rsedcloud(ngridmx,nlayermx)
+      real,intent(in) :: rsedcloud(ngrid,nlay)
 c     Cloud density (kg.m-3)
-      real,intent(inout) :: rhocloud(ngridmx,nlayermx)
+      real,intent(inout) :: rhocloud(ngrid,nlay)
 c    Traceurs :
       real,intent(in) :: pq(ngrid,nlay,nq)  ! tracers (kg/kg)
@@ -130 +130 @@
       IF (firstcall) THEN
          
-         IF(ngrid.NE.ngridmx) THEN
-            PRINT*,'STOP dans callsedim'
-            PRINT*,'probleme de dimensions :'
-            PRINT*,'ngrid  =',ngrid
-            PRINT*,'ngridmx  =',ngridmx
-            STOP
-         ENDIF
-
 c       Doubleq: initialization
         IF (doubleq) THEN

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

@@ -2 +2 @@
      &         ,pplev,pcondicea,pcondices,pfallice,pemisurf)
 
-       IMPLICIT NONE
+      use surfdat_h, only: iceradius, dtemisice
+      IMPLICIT NONE
 
 c=======================================================================
@@ -17 +18 @@
 #include "dimphys.h"
 #include "comcstfi.h"
-#include "surfdat.h"
+!#include "surfdat.h"
 #include "callkeys.h"
 

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

@@ -31 +31 @@
 !     ------------
 
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 #include "comcstfi.h"
 #include "callkeys.h"
@@ -63 +63 @@
 
       INTEGER ig,i,l,l1,l2,jj
-      INTEGER jcnt, jadrs(ngridmx)
-
-      REAL sig(nlayermx+1),sdsig(nlayermx),dsig(nlayermx)
-      REAL zu(ngridmx,nlayermx),zv(ngridmx,nlayermx)
-      REAL zh(ngridmx,nlayermx)
-      REAL zu2(ngridmx,nlayermx),zv2(ngridmx,nlayermx)
-      REAL zh2(ngridmx,nlayermx), zhc(ngridmx,nlayermx)
+      INTEGER jcnt, jadrs(ngrid)
+
+      REAL sig(nlay+1),sdsig(nlay),dsig(nlay)
+      REAL zu(ngrid,nlay),zv(ngrid,nlay)
+      REAL zh(ngrid,nlay)
+      REAL zu2(ngrid,nlay),zv2(ngrid,nlay)
+      REAL zh2(ngrid,nlay), zhc(ngrid,nlay)
       REAL zhm,zsm,zdsm,zum,zvm,zalpha,zhmc
 
@@ -75 +75 @@
       INTEGER iq,ico2
       save ico2
-      REAL zq(ngridmx,nlayermx,nq), zq2(ngridmx,nlayermx,nq)
+      REAL zq(ngrid,nlay,nq), zq2(ngrid,nlay,nq)
       REAL zqm(nq),zqco2m
       real m_co2, m_noco2, A , B
@@ -82 +82 @@
       real mtot1, mtot2 , mm1, mm2
        integer l1ref, l2ref
-      LOGICAL vtest(ngridmx),down,firstcall
+      LOGICAL vtest(ngrid),down,firstcall
       save firstcall
       data firstcall/.true./
@@ -94 +94 @@
 
       IF (firstcall) THEN 
-        IF(ngrid.NE.ngridmx) THEN
-           PRINT*
-           PRINT*,'STOP in convadj'
-           PRINT*,'ngrid    =',ngrid
-           PRINT*,'ngridmx  =',ngridmx
-        ENDIF
+
         ico2=0
         if (tracer) then

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

@@ -4 +4 @@
 ! ngridmx : number of horizontal grid points
 ! note: the -1/jjm term will be 0; unless jj=1
-      integer, parameter :: ngridmx = (2+(jjm-1)*iim - 1/jjm)   
+!      integer, parameter :: ngridmx = (2+(jjm-1)*iim - 1/jjm)   
 ! nlayermx : number of atmospheric layers
       integer, parameter :: nlayermx = llm 
 ! nsoilmx : number of subterranean layers
 !EM: old soil routine:      integer, parameter :: nsoilmx = 10
-      integer, parameter :: nsoilmx = 18 
+!      integer, parameter :: nsoilmx = 18 ! nsoilmx is now in comsoil_h
 !-----------------------------------------------------------------------

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

@@ -51 +51 @@
 C
 c
+      use dimradmars_mod, only:  ndlo2
       IMPLICIT none
 c======================================================================
@@ -69 +70 @@
 c d_v-----output-R-increment de la vitesse v
 c======================================================================
-#include "dimensions.h"
-#include "dimphys.h"
-#include "dimradmars.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
+!#include "dimradmars.h"
 #include "comcstfi.h"
 c
@@ -88 +89 @@
 c Variables locales:
 c
-      REAL paprs(NDLO2,nlayermx+1)
-      REAL paprsf(NDLO2,nlayermx)
-      REAL zgeom(NDLO2,nlayermx)
-      REAL pdtdt(NDLO2,nlayermx)
-      REAL pdudt(NDLO2,nlayermx), pdvdt(NDLO2,nlayermx)
-      REAL pt(NDLO2,nlayermx), pu(NDLO2,nlayermx)
-      REAL pv(NDLO2,nlayermx)
+      REAL paprs(NDLO2,klev+1)
+      REAL paprsf(NDLO2,klev)
+      REAL zgeom(NDLO2,klev)
+      REAL pdtdt(NDLO2,klev)
+      REAL pdudt(NDLO2,klev), pdvdt(NDLO2,klev)
+      REAL pt(NDLO2,klev), pu(NDLO2,klev)
+      REAL pv(NDLO2,klev)
 c
 c initialiser les variables de sortie (pour securite)

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

@@ -3 +3 @@
 
       use tracer_mod, only: alpha_devil
+      use surfdat_h, only: z0_default
       IMPLICIT NONE
 
@@ -28 +29 @@
 c   -------------
 
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 #include "comcstfi.h"      
 c#include "comconst.h"        ! TEMPORAIRE AVEC ANLDEVIL !!!!
-#include "surfdat.h"
-#include "comgeomfi.h"
+!#include "surfdat.h"
+!#include "comgeomfi.h"
 !#include "tracer.h"
 c   arguments:
@@ -62 +63 @@
 
 
-      REAL devila(ngridmx)
-      integer ltop(ngridmx)
+      REAL devila(ngrid)
+      integer ltop(ngrid)
       real b,rho,Fs,wind
 
@@ -77 +78 @@
 
 c   TEMPORAIRE AVEC ANLDEVIL : *************
-c        real b_diag(ngridmx)
-c       real localtime(ngridmx)
+c        real b_diag(ngrid)
+c       real localtime(ngrid)
 c       common/temporaire/localtime
-c      real ztop(ngridmx),magwind(ngridmx),t1(ngridmx)
+c      real ztop(ngrid),magwind(ngrid),t1(ngrid)
 c      real rcp ,cpp
 c      rcp = kappa
@@ -95 +96 @@
         write(*,*) 'In dustdevil :'
         write(*,*) '    q2top= ',q2top,'     seuil= ', seuil 
-c       un petit test de coherence:
-         IF(ngrid.NE.ngridmx) THEN
-            PRINT*,'STOP dans coefdifv'
-            PRINT*,'probleme de dimensions :'
-            PRINT*,'ngrid  =',ngrid
-            PRINT*,'ngridmx  =',ngridmx
-            STOP
-         ENDIF
 
 c A rough estimation of the horizontal drag coefficient Cd
@@ -218 +211 @@
 c     TEMPORAIRE AVEC ANLDEVIL:
 c     IF (ngrid.gt.1) THEN
-c      do ig=2,ngridmx-1
+c      do ig=2,ngrid-1
 c       write(77,88) lati(ig)*180./pi,localtime(ig),
 c    &        -12.*log(pplev(ig,ltop(ig))/pplev(ig,1)),
@@ -226 +219 @@
 c88    format (f7.3,1x,f7.3,1x,f6.3,1x,f6.4,1x,f7.4,1x,
 c    &        f7.3,1x,f7.3,1x,f9.3)
-c      do ig=1,ngridmx
+c      do ig=1,ngrid
 c       ztop(ig) = -12.*log(pplev(ig,ltop(ig))/pplev(ig,1))
 c       magwind(ig) = sqrt(pu(ig,1)**2+pv(ig,1)**2)
@@ -232 +225 @@
 c      end do
 
-c       call WRITEDIAGFI(ngridmx,'dqs_dev','dqs devil',
+c       call WRITEDIAGFI(ngrid,'dqs_dev','dqs devil',
 c    &               'kg.m-2.s-1',2,pdqs_dev)
-c       call WRITEDIAGFI(ngridmx,'wind','wind',
+c       call WRITEDIAGFI(ngrid,'wind','wind',
 c    &               'm.s-1',2,magwind)
-c       call WRITEDIAGFI(ngridmx,'ztop','top pbl',
+c       call WRITEDIAGFI(ngrid,'ztop','top pbl',
 c    &               'km',2,ztop)
-c       call WRITEDIAGFI(ngridmx,'tsurf','tsurf',
+c       call WRITEDIAGFI(ngrid,'tsurf','tsurf',
 c    &               'K',2,ptsurf)
-c       call WRITEDIAGFI(ngridmx,'T1','T(1)',
+c       call WRITEDIAGFI(ngrid,'T1','T(1)',
 c    &               'K',2,t1)
-c       call WRITEDIAGFI(ngridmx,'b','b',
+c       call WRITEDIAGFI(ngrid,'b','b',
 c    &               ' ',2,b_diag)
 c     END If

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

@@ -24 +24 @@
 c   -------------
 
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 #include "comcstfi.h"
 !#include "tracer.h"
@@ -47 +47 @@
 c   ------
       INTEGER ig,iq
-      REAL fhoriz(ngridmx)  ! Horizontal dust flux 
+      REAL fhoriz(ngrid)  ! Horizontal dust flux 
       REAL ust,us
       REAL stress_seuil

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

@@ -1 +1 @@
       SUBROUTINE flusv(KDLON,nsf,n,omega,g,tau,emis,bh,bsol,fah,fdh)
+      use dimradmars_mod, only: ndlo2, ndlon
       IMPLICIT NONE
 c.......................................................................
@@ -37 +38 @@
 #include "dimensions.h"
 #include "dimphys.h"
-#include "dimradmars.h"
+!#include "dimradmars.h"
 c.......................................................................
 c  declaration des arguments 
@@ -271 +272 @@
 
       SUBROUTINE sys3v(KDLON,n,a,b,d,e,y)
+      use dimradmars_mod, only: ndlon, ndlo2
       IMPLICIT NONE
 c.......................................................................
@@ -293 +295 @@
 #include "dimensions.h"
 #include "dimphys.h"
-#include "dimradmars.h"
+!#include "dimradmars.h"
 c.......................................................................
 c  declaration des arguments 

trunk/LMDZ.MARS/libf/phymars/getslopes.F90

@@ -1 @@
-subroutine getslopes(geopot)
+subroutine getslopes(ngrid,geopot)
     
+use comgeomfi_h, only: long, lati
+use slope_mod, only: theta_sl, psi_sl
 implicit none
 
 #include "dimensions.h"
-#include "dimphys.h"
-#include "slope.h"
-#include "comgeomfi.h"
+!#include "dimphys.h"
+!#include "slope.h"
+!#include "comgeomfi.h"
 #include "comcstfi.h"
 
@@ -16 +18 @@
 ! TN 04/1013
 
-
-real geopot(ngridmx)     ! geopotential on phy grid
+integer,intent(in) :: ngrid ! nnumber of atmospheric columns
+real,intent(in) :: geopot(ngrid)     ! geopotential on phy grid
 real topogrid(iim,jjm+1) ! topography on lat/lon grid with poles and only one -180/180 point
 real latigrid(iim,jjm+1),longgrid(iim,jjm+1) ! meshgrid of latitude and longitude values (radians)
@@ -43 +45 @@
 latigrid(:,1) = lati(1)
 longgrid(:,1) = long(1)
-topogrid(:,jjm+1) = geopot(ngridmx)/g
-latigrid(:,jjm+1) = lati(ngridmx)
-longgrid(:,jjm+1) = long(ngridmx)
+topogrid(:,jjm+1) = geopot(ngrid)/g
+latigrid(:,jjm+1) = lati(ngrid)
+longgrid(:,jjm+1) = long(ngrid)
 
 

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

@@ -52 +52 @@
 C     PASSAGE OF THE NEW GWDRAG TO I.F.S. (F. LOTT, 22/11/93)
 C-----------------------------------------------------------------------
+      use dimradmars_mod, only: ndlo2
       implicit none
 C
@@ -59 +60 @@
 #include "dimensions.h"
 #include "dimphys.h"
-#include "dimradmars.h"
+!#include "dimradmars.h"
       integer klon,klev,kidia,kfdia
 #include "yoegwd.h"

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

@@ -45 +45 @@
 C
 C-----------------------------------------------------------------------
+      use dimradmars_mod, only: ndlo2
       implicit none
 #include "dimensions.h"
 #include "dimphys.h"
-#include "dimradmars.h"
+!#include "dimradmars.h"
       integer klon,klev,kidia,kfdia
 

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

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

@@ -48 +48 @@
       USE ioipsl_getincom, only : getin
       use tracer_mod, only : nqmx, nuice_sed, ccn_factor
-      
+      use comsoil_h, only: ini_comsoil_h
+#ifdef MESOSCALE
+      use comsoil_h, only: volcapa !!MESOSCALE -- needed to fill volcapa
+#endif      
+      use comgeomfi_h, only: long, lati, area, totarea
+      use comdiurn_h, only: sinlat, coslat, sinlon, coslon
+      use surfdat_h, only: ini_surfdat_h, albedo_h2o_ice, inert_h2o_ice,
+     &                     frost_albedo_threshold
+      use comsaison_h, only: ini_comsaison_h
+      use slope_mod, only: ini_slope_mod
+      use dimradmars_mod, only: ini_dimradmars_mod
+      use yomaer_h,only: ini_yomaer_h, tauvis
+      use yomlw_h, only: ini_yomlw_h
+      use conc_mod, only: ini_conc_mod
       IMPLICIT NONE
 #include "dimensions.h"
@@ -54 +67 @@
 #include "planete.h"
 #include "comcstfi.h"
-#include "comsaison.h"
-#include "comdiurn.h"
-#include "comgeomfi.h"
+!#include "comsaison.h"
+!#include "comdiurn.h"
+!#include "comgeomfi.h"
 #include "callkeys.h"
-#include "surfdat.h"
-#include "dimradmars.h"
-#include "yomaer.h"
+!#include "surfdat.h"
+!#include "dimradmars.h"
+!#include "yomaer.h"
 #include "datafile.h"
-#include "slope.h"
+!#include "slope.h"
 #include "microphys.h"
 !#include "tracer.h"
+! naerkind is set in scatterers.h (built when compiling with makegcm -s #)
+#include"scatterers.h"
 #ifdef MESOSCALE
-#include "comsoil.h"     !!MESOSCALE -- needed to fill volcapa
+!#include "comsoil.h"     !!MESOSCALE -- needed to fill volcapa
 #include "meso_inc/meso_inc_inifisvar.F"
 #endif
@@ -107 +122 @@
 !     The usual Tests
 !     --------------
-      IF (nlayer.NE.nlayermx) THEN
-         PRINT*,'STOP in inifis'
-         PRINT*,'Probleme de dimensions :'
-         PRINT*,'nlayer     = ',nlayer
-         PRINT*,'nlayermx   = ',nlayermx
-         STOP
-      ENDIF
-
-      IF (ngrid.NE.ngridmx) THEN
-         PRINT*,'STOP in inifis'
-         PRINT*,'Probleme de dimensions :'
-         PRINT*,'ngrid     = ',ngrid
-         PRINT*,'ngridmx   = ',ngridmx
-         STOP
-      ENDIF
+!      IF (nlayer.NE.nlayermx) THEN
+!         PRINT*,'STOP in inifis'
+!         PRINT*,'Probleme de dimensions :'
+!         PRINT*,'nlayer     = ',nlayer
+!         PRINT*,'nlayermx   = ',nlayermx
+!         STOP
+!      ENDIF
+
+!      IF (ngrid.NE.ngridmx) THEN
+!         PRINT*,'STOP in inifis'
+!         PRINT*,'Probleme de dimensions :'
+!         PRINT*,'ngrid     = ',ngrid
+!         PRINT*,'ngridmx   = ',ngridmx
+!         STOP
+!      ENDIF
 
 ! --------------------------------------------------------------
@@ -765 +780 @@
 !     ------------------------
 
-      ! in 'comgeomfi.h'
+      ! allocate "slope_mod" arrays
+      call ini_slope_mod(ngrid)
+      
+      ! allocate "comsaison_h" arrays
+      call ini_comsaison_h(ngrid)
+      
+      ! allocate "surfdat_h" arrays
+      call ini_surfdat_h(ngrid)
+      
+      ! allocate "comgeomfi_h" arrays
+      allocate(lati(ngrid))
+      allocate(long(ngrid))
+      allocate(area(ngrid))
+      
+      ! fill "comgeomfi_h" data
       CALL SCOPY(ngrid,plon,1,long,1)
       CALL SCOPY(ngrid,plat,1,lati,1)
       CALL SCOPY(ngrid,parea,1,area,1)
-      totarea=SSUM(ngridmx,area,1)
-
-      ! in 'comdiurn.h'
+      totarea=SSUM(ngrid,area,1)
+
+      ! allocate "comdiurn_h" data
+      allocate(sinlat(ngrid))
+      allocate(coslat(ngrid))
+      allocate(sinlon(ngrid))
+      allocate(coslon(ngrid))
+      
+      ! fill "comdiurn_h" data
       DO ig=1,ngrid
          sinlat(ig)=sin(plat(ig))
@@ -781 +816 @@
       pi=2.*asin(1.) ! NB: pi is a common in comcstfi.h
 
-!     managing the tracers, and tests:
-!     -------------------------------
-!     Ehouarn: removed; as these tests are now done in initracer.F
-!      if(tracer) then
-!
-!!          when photochem is used, nqchem_min is the rank
-!!          of the first chemical species
-!
-!! Ehouarn: nqchem_min is now meaningless and no longer used
-!!       nqchem_min = 1
-!       if (photochem .or. callthermos) then
-!         chem = .true.
-!       end if
-!
-!       if (water .or. thermoswater) h2o = .true.
-!
-!!          TESTS
-!
-!       print*,'inifis: TRACERS:'
-!       write(*,*) "    chem=",chem,"    h2o=",h2o
-!!       write(*,*) "   doubleq=",doubleq
-!!       write(*,*) "   dustbin=",dustbin
-!
-!       if ((doubleq).and.(h2o).and.
-!     $     (chem)) then
-!         print*,' 2 dust tracers (doubleq)'
-!         print*,' 1 water vapour tracer'
-!         print*,' 1 water ice tracer'
-!         print*,nq-4,' chemistry tracers'
-!       endif
-!
-!       if ((doubleq).and.(h2o).and.
-!     $     .not.(chem)) then
-!         print*,' 2 dust tracers (doubleq)'
-!         print*,' 1 water vapour tracer'
-!         print*,' 1 water ice tracer'
-!         if (nq.LT.4) then
-!           print*,'nq should be at least equal to'
-!           print*,'4 with these options.'
-!           stop
-!         endif
-!       endif
-!
-!       if (.not.(doubleq).and.(h2o).and.
-!     $     (chem)) then
-!         if (dustbin.gt.0) then
-!           print*,dustbin,' dust bins'
-!         endif
-!         print*,nq-2-dustbin,' chemistry tracers'
-!         print*,' 1 water vapour tracer'
-!         print*,' 1 water ice tracer'
-!       endif
-!
-!       if (.not.(doubleq).and.(h2o).and.
-!     $     .not.(chem)) then
-!         if (dustbin.gt.0) then
-!           print*,dustbin,' dust bins'
-!         endif
-!         print*,' 1 water vapour tracer'
-!         print*,' 1 water ice tracer'
-!         if (nq.gt.(dustbin+2)) then
-!           print*,'nq should be ',(dustbin+2),
-!     $            ' with these options...'
-!                  print*,'(or check callphys.def)'
-!         endif
-!         if (nq.lt.(dustbin+2)) then
-!           write(*,*) "inifis: nq.lt.(dustbin+2)"
-!           stop
-!         endif
-!       endif
-!
-!      endif ! of if (tracer)
-!
-!      RETURN
+      ! allocate "comsoil_h" arrays
+      call ini_comsoil_h(ngrid)
+            
+      ! set some variables in "dimradmars_mod"
+      call ini_dimradmars_mod(ngrid,nlayer)
+      
+      ! allocate arrays in "yomaer_h"
+      call ini_yomaer_h
+      
+      ! allocate arrays in "yomlw_h"
+      call ini_yomlw_h(ngrid)
+      
+      ! allocate arrays in "conc_mod"
+      call ini_conc_mod(ngrid,nlayer)
+      
       END

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

@@ -26 +26 @@
 
 
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 #include "comcstfi.h"
 #include "callkeys.h"
 !#include "tracer.h"
 !#include "advtrac.h"
-#include "comgeomfi.h"
-
-#include "surfdat.h"
+!#include "comgeomfi.h"
+
+!#include "surfdat.h"
 
       integer,intent(in) :: ngrid ! number of atmospheric columns
@@ -68 +68 @@
       allocate(alpha_lift(nq))
       allocate(alpha_devil(nq))
-      allocate(dryness(ngridmx))
+      allocate(dryness(ngrid))
       allocate(igcm_dustbin(nq))
 

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

@@ -1 +1 @@
       SUBROUTINE iniwrite(nid,idayref,phis)
+
+      use comsoil_h, only: mlayer, nsoilmx
       IMPLICIT NONE
 
@@ -30 +32 @@
 #include "description.h"
 #include "serre.h"
-#include"dimphys.h"
-#include"comsoil.h"
+!#include"dimphys.h"
+!#include"comsoil.h"
 
 c   Arguments:
@@ -253 +255 @@
 
 !-------------------------------
-! (soil) depth variable mlayer() (known from comsoil.h)
+! (soil) depth variable mlayer() (known from comsoil_h)
 !-------------------------------
       ierr=NF_REDEF (nid) ! Enter NetCDF (re-)define mode

trunk/LMDZ.MARS/libf/phymars/iniwritesoil.F90

@@ -1 @@
-subroutine iniwritesoil(nid)
+subroutine iniwritesoil(nid,ngrid)
 
 ! initialization routine for 'writediagoil'. Here we create/define
@@ -5 +5 @@
 ! (time-independent) parameters.
 
+use comsoil_h, only: mlayer, inertiedat, nsoilmx
+
 implicit none
 
 #include"dimensions.h"
-#include"dimphys.h"
+!#include"dimphys.h"
 #include"paramet.h"
 #include"comcstfi.h"
 #include"comgeom.h"
-#include"comsoil.h"
+!#include"comsoil.h"
 #include"netcdf.inc"
 
 ! Arguments:
+integer,intent(in) :: ngrid
 integer,intent(in) :: nid ! NetCDF output file ID
 
@@ -154 +157 @@
 ierr=NF_PUT_VAR_REAL(nid,varid,mlayer)
 #endif
-! Note mlayer(0:nsoilmx-1) known from comsoil.h
+! Note mlayer(0:nsoilmx-1) known from comsoil_h
 if (ierr.ne.NF_NOERR) then
   write(*,*)"iniwritesoil: Error, could not write depth variable"
@@ -240 +243 @@
 
 ! Recast data along 'dynamics' grid
-! Note: inertiedat is known from comsoil.h
+! Note: inertiedat is known from comsoil_h
 
 do l=1,nsoilmx
@@ -246 +249 @@
   do i=1,iip1
     data3(i,1,l)=inertiedat(1,l)
-    data3(i,jjp1,l)=inertiedat(ngridmx,l)
+    data3(i,jjp1,l)=inertiedat(ngrid,l)
   enddo
   ! rest of the grid

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

@@ -7 +7 @@
 c----------------------------------------------------------------------
 
+      use dimradmars_mod, only: ndlon, ndlo2, kflev , nir
+      use yomlw_h, only: nlaylte, xi , tstand, xp
       implicit none
  
-#include "dimensions.h"
-#include "dimphys.h"
-#include "dimradmars.h"
-#include "callkeys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
+!#include "dimradmars.h"
+!#include "callkeys.h"
 
-#include "yomlw.h"
+!#include "yomlw.h"
 
 c----------------------------------------------------------------------

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

@@ -4 +4 @@
      .         ,pemis,pfluc)
 
+      use dimradmars_mod, only: nir, npademx, nabsmx, nflev, ndlon,
+     &                          ndlo2
+      use yomlw_h, only: nlaylte
       IMPLICIT NONE
  
-#include "dimensions.h"
-#include "dimphys.h"
-#include "dimradmars.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
+!#include "dimradmars.h"
 #include "callkeys.h"
 #include "comcstfi.h"
 
-#include "yomaer.h"
-#include "yomlw.h"
+!#include "yomaer.h"
+!#include "yomlw.h"
 C-----------------------------------------------------------------------
 C

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

@@ -11 +11 @@
 c----------------------------------------------------------------------
 
+      use dimradmars_mod, only: ndlo2, nir, ndlon, nuco2, nflev
+      use yomlw_h, only: nlaylte, xi, xi_ground, gcp
       implicit none
  
 
-#include "dimensions.h"
-#include "dimphys.h"
-#include "dimradmars.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
+!#include "dimradmars.h"
 #include "callkeys.h"
 #include "comg1d.h"
  
-#include "yomlw.h"
+!#include "yomlw.h"
 
 c----------------------------------------------------------------------
@@ -65 +67 @@
 
       integer ja,jl,j,i,ig1d,ig,l,ndim
-      parameter(ndim = ndlon*(nuco2+1)*(nflev+2)*(nflev+2))
+!      parameter(ndim = ndlon*(nuco2+1)*(nflev+2)*(nflev+2))
       real  ksidb (ndlon,nuco2+1,0:nflev+1,0:nflev+1) ! net exchange rate (W/m2)
 
@@ -77 +79 @@
 c     To compute IR flux in the atmosphere  (For diagnostic only !!)
       logical computeflux
-      real coefd(ngridmx,nuco2,nflev+1,nflev+1) 
-      real coefu(ngridmx,nuco2,0:nflev,nflev+1)
-      real flw_up(ngridmx,nflev+1), flw_dn(ngridmx,nflev+1) ! fluxes (W/m2)
-
-
+      real coefd(kdlon,nuco2,nflev+1,nflev+1) 
+      real coefu(kdlon,nuco2,0:nflev,nflev+1)
+      real flw_up(kdlon,nflev+1), flw_dn(kdlon,nflev+1) ! fluxes (W/m2)
+
+
+      ndim = ndlon*(nuco2+1)*(nflev+2)*(nflev+2)
       call zerophys(ndim, ksidb)
 
@@ -364 +367 @@
       if (callg2d) then
 
-      ig1d = ngridmx/2 + 1
-c     ig1d = ngridmx
+      ig1d = kdlon/2 + 1
+c     ig1d = kdlon
 
       if ((ig0+1).LE.ig1d .and. ig1d.LE.(ig0+kdlon)
-     .    .OR.  ngridmx.EQ.1   ) then
+     .    .OR.  kdlon.EQ.1   ) then
 
           ig = ig1d-ig0

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

@@ -4 +4 @@
 
 
+      use dimradmars_mod, only: ndlo2, ndlon, nflev, nir
+      use yomlw_h, only: gcp, nlaylte, xi
       implicit none
 
 
-#include "dimensions.h"
-#include "dimphys.h"
-#include "dimradmars.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
+!#include "dimradmars.h"
 #include "comg1d.h"
 #include "callkeys.h"
 #include "comcstfi.h"
-#include "yomlw.h"
+!#include "yomlw.h"
  
 CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC

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

@@ -9 +9 @@
 c----------------------------------------------------------------------
 c     LWMAIN     organizes the LTE longwave calculations
-c     for layer 1 to layer "nlaylte" (stored in  "yomlw.h")
-c----------------------------------------------------------------------
-
+c     for layer 1 to layer "nlaylte" (stored in  "yomlw_h")
+c----------------------------------------------------------------------
+
+      use dimradmars_mod, only: ndlo2, nflev, nir, ndlon, nuco2
+      use yomlw_h, only: nlaylte, xi
       implicit none
  
-#include "dimensions.h"
-#include "dimphys.h"
-#include "dimradmars.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
+!#include "dimradmars.h"
 #include "callkeys.h"
 #include "comg1d.h"
- 
-#include "yomlw.h"
+! naerkind is set in scatterers.h (built when compiling with makegcm -s #)
+#include"scatterers.h"
+!#include "yomlw.h"
 
 c----------------------------------------------------------------------
@@ -40 +43 @@
       real aerosol(ndlo2,kflev,naerkind)      !  aerosol extinction optical
 c                         depth at reference wavelength "longrefvis" set
-c                         in dimradmars.h , in each layer, for one of
+c                         in dimradmars_mod , in each layer, for one of
 c                         the "naerkind" kind of aerosol optical properties.
 
@@ -95 +98 @@
         firstcall = .false.
 
-        do jkk = 0 , nlaylte+1
-          do jk = 0 , nlaylte+1
-            do ja = 1 , nuco2
-              do jl = 1 , ngridmx
-                  xi (jl,ja,jk,jkk)=0.
-              enddo
-            enddo
-          enddo
-        enddo
+        xi (:,:,:,:)=0.
 
       endif
@@ -184 +179 @@
 c         do jk = 0 , nlaylte+1
 c           do ja = 1 , nuco2
-c             do jl = 1 , ngridmx
+c             do jl = 1 , ngrid
 c      if (xi (jl,ja,jk,jkk) .LT. 0
 c    .       .OR. xi (jl,ja,jk,jkk) .GT. 1 ) then

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

@@ -7 +7 @@
 c----------------------------------------------------------------------
 
+      use dimradmars_mod, only : ndlon, ndlo2
+      use yomlw_h, only: ga, gb, cst_voigt
       implicit none
 
-#include "dimensions.h"
-#include "dimphys.h"
-#include "dimradmars.h"
-#include "yomlw.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
+!#include "dimradmars.h"
+!#include "yomlw.h"
 
 c----------------------------------------------------------------------

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

@@ -31 +31 @@
 c-----------------------------------------------------------------------
  
+      use dimradmars_mod, only: ndlo2, nir, nuco2, ndlon, nflev
+      use yomlw_h, only: nlaylte, tref, at, bt, cst_voigt
       implicit none
 
-#include "dimensions.h"
-#include "dimphys.h"
-#include "dimradmars.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
+!#include "dimradmars.h"
 #include "comcstfi.h"
 
-#include "yomaer.h"
-#include "yomlw.h"
+!#include "yomaer.h"
+!#include "yomlw.h"
+! naerkind is set in scatterers.h (built when compiling with makegcm -s #)
+#include"scatterers.h"
 
 #include "callkeys.h"
@@ -56 +60 @@
       real aerosol (ndlo2,kflev,naerkind) ! aerosol extinction optical depth
 c                         at reference wavelength "longrefvis" set
-c                         in dimradmars.h , in each layer, for one of
+c                         in dimradmars_mod , in each layer, for one of
 c                         the "naerkind" kind of aerosol optical properties.
       REAL QIRsQREF3d(ndlo2,kflev,nir,naerkind)  ! 3d ext. coef.

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

@@ -33 +33 @@
 c----------------------------------------------------------------------
 
+      use dimradmars_mod, only: ndlo2, nuco2, ndlon, nflev
+      use yomlw_h, only: xi, nlaylte
       implicit none
 
-#include "dimensions.h"
-#include "dimphys.h"
-#include "dimradmars.h"
-#include "callkeys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
+!#include "dimradmars.h"
+!#include "callkeys.h"
  
-#include "yomlw.h"
+!#include "yomlw.h"
 
 c----------------------------------------------------------------------

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

@@ -32 +32 @@
 c----------------------------------------------------------------------
 
+      use dimradmars_mod, only: ndlon, nuco2, nflev, ndlo2
+      use yomlw_h, only: nlaylte, xi, xi_emis
       implicit none
 
-#include "dimensions.h"
-#include "dimphys.h"
-#include "dimradmars.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
+!#include "dimradmars.h"
  
-#include "yomlw.h"
+!#include "yomlw.h"
 #include "callkeys.h"
 
@@ -60 +62 @@
 
       integer ja,jl,jk,jkk,ndim
-      parameter(ndim = ndlon*nuco2*(nflev+2)*(nflev+2))
+!      parameter(ndim = ndlon*nuco2*(nflev+2)*(nflev+2))
 
 
@@ -74 +76 @@
 
 c----------------------------------------------------------------------
+      ndim = ndlon*nuco2*(nflev+2)*(nflev+2)
       call zerophys(ndim,ksi_emis)
 c----------------------------------------------------------------------

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

@@ -70 +70 @@
 c-----------------------------------------------------------------------
 
+      use dimradmars_mod, only: ndlo2, nuco2, ndlon, nflev
+      use yomlw_h, only: nlaylte, xi, xi_ground, xi_emis
       implicit none
 
-#include "dimensions.h"
-#include "dimphys.h"
-#include "dimradmars.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
+!#include "dimradmars.h"
  
-#include "yomlw.h"
+!#include "yomlw.h"
 #include "callkeys.h"
 

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

@@ -7 +7 @@
                                                    
        use tracer_mod, only: noms
+       use surfdat_h, only: emissiv, phisfi
        IMPLICIT NONE
 c=======================================================================
@@ -30 +31 @@
 c 
 c                    \
-c    pdt(ngrid,nlayermx)   \  derivee temporelle physique avant condensation
+c    pdt(ngrid,nlayer)\  derivee temporelle physique avant condensation
 c                     /  ou sublimation pour  pt,ptsrf
 c    pdtsrf(ngrid)   /
@@ -37 +38 @@
 c   -------
 c
-c    pdpsrf(ngrid)   \  derivee temporelle physique (contribution de
-c    pdtc(ngrid,nlayermx) /  la condensation ou sublimation) pour Ps,pt,ptsrf
-c    pdtsrfc(ngrid) /
+c    pdpsrf(ngrid)      \  derivee temporelle physique (contribution de
+c    pdtc(ngrid,nlayer) /  la condensation ou sublimation) pour Ps,pt,ptsrf
+c    pdtsrfc(ngrid)    /
 c
 c   Entree/sortie
@@ -55 +56 @@
 c
 #include "dimensions.h"
-#include "dimphys.h"
+!#include "dimphys.h"
 #include "comcstfi.h"
-#include "surfdat.h"
-#include "comgeomfi.h"
+!#include "surfdat.h"
+!#include "comgeomfi.h"
 #include "comvert.h"
-#include "paramet.h"
+!#include "paramet.h"
 #include "callkeys.h"
 !#include "tracer.h"
@@ -114 +115 @@
 c --------------------------------------------      
       INTEGER i,j
-      REAL Fluxmean(jjp1)
+c      REAL Fluxmean(jjp1)
       INTEGER l,ig,iq,icap,nmix
       LOGICAL transparency, fluxdependent
@@ -166 +167 @@
       real,parameter :: cpice=1000. ! (J.kg-1.K-1) specific heat of CO2 ice
       REAL,SAVE :: acond,bcond,ccond
-!      REAL,SAVE :: albediceF(ngridmx)
+!      REAL,SAVE :: albediceF(ngrid)
       real,save :: m_co2, m_noco2, A , B
 
@@ -225 +226 @@
 c       zfallice(ngrid,l):amount of ice falling from layer l (kg/m2/s)
 c                           
-c       pdtc(ngrid,nlayermx)  : dT/dt due to cond/sub
+c       pdtc(ngrid,nlayer)  : dT/dt due to cond/sub
 c
 c
@@ -675 +676 @@
                 end do
                 Sm(1)  = masse(1)
-                do l =2,nlayermx
+                do l =2,nlayer
                   do iq=1,nq
                      zq(l,iq)=pq(ig,l,iq)
@@ -733 +734 @@
 c        END DO
 c     END DO
-c     call WRITEDIAGFI(ngridmx,'tconda1',
+c     call WRITEDIAGFI(ngrid,'tconda1',
 c    &'Taux de condensation CO2 atmospherique /Pa',
 c    & 'kg.m-2.Pa-1.s-1',3,tconda1)
-c     call WRITEDIAGFI(ngridmx,'tconda2',
+c     call WRITEDIAGFI(ngrid,'tconda2',
 c    &'Taux de condensation CO2 atmospherique /m',
 c    & 'kg.m-3.s-1',3,tconda2)
 
 ! output falling co2 ice in 1st layer:
-!      call WRITEDIAGFI(ngridmx,'fallice',
+!      call WRITEDIAGFI(ngrid,'fallice',
 !     &'Precipitation of co2 ice',
 !     & 'kg.m-2.s-1',2,zfallice(1,1))

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

@@ -14 +14 @@
 c   -------------
 
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 #include "comcstfi.h"
 c
@@ -33 +33 @@
 c    Traceurs :
       real,intent(inout) :: pqi(ngrid,nlay)  ! traceur   (e.g. ?/kg)
-      real,intent(out) :: wq(ngridmx,nlay+1)  ! flux de traceur durant timestep (?/m-2)
+      real,intent(out) :: wq(ngrid,nlay+1)  ! flux de traceur durant timestep (?/m-2)
       real,intent(in) :: beta ! correction for the shape of the particles
                 !   (see Murphy et al. JGR 1990 vol.95)
@@ -50 +50 @@
 c    Traceurs :
 c    ~~~~~~~~ 
-      real traversee (ngridmx,nlayermx)
-      real vstokes(ngridmx,nlayermx)
-      real w(ngridmx,nlayermx)
+      real traversee (ngrid,nlay)
+      real vstokes(ngrid,nlay)
+      real w(ngrid,nlay)
       real ptop, dztop, Ep, Stra
 
@@ -71 +71 @@
 
       IF (firstcall) THEN
-         IF(ngrid.NE.ngridmx) THEN
-            PRINT*,'STOP dans newsedim'
-            PRINT*,'probleme de dimensions :'
-            PRINT*,'ngrid  =',ngrid
-            PRINT*,'ngridmx  =',ngridmx
-            STOP
-         ENDIF
+
          firstcall=.false.
 
@@ -211 +205 @@
       end do
 
-      call vlz_fi(ngrid,pqi,2.,masse,w,wq)
+      call vlz_fi(ngrid,nlay,pqi,2.,masse,w,wq)
 c         write(*,*) ' newsed: wq(6), wq(7), q(6)',
 c    &                wq(1,6),wq(1,7),pqi(1,6)

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

@@ -3 +3 @@
                                                    
        use tracer_mod, only: igcm_co2, igcm_o
+       use comdiurn_h, only: sinlon, coslon, sinlat, coslat
        IMPLICIT NONE
 c=======================================================================
@@ -30 +31 @@
 c   nlayer                Number of layer
 c   dist_sol              sun-Mars distance (AU)
-c   mu0(ngridmx)          
-c   fract(ngridmx)        day fraction of the time interval
+c   mu0(ngrid)          
+c   fract(ngrid)          day fraction of the time interval
 c   declin                latitude of subslar point
 c
@@ -45 +46 @@
 c    ------------------
 c
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 #include "comcstfi.h"
 #include "callkeys.h"
-#include "comdiurn.h"
+!#include "comdiurn.h"
 #include "nirdata.h"
 !#include "tracer.h"
@@ -62 +63 @@
       integer,intent(in) :: nq ! number of tracers
       real,intent(in) :: pq(ngrid,nlayer,nq) ! tracers
-      real,intent(in) :: mu0(ngridmx) ! solar angle
-      real,intent(in) :: fract(ngridmx) ! day fraction of the time interval
+      real,intent(in) :: mu0(ngrid) ! solar angle
+      real,intent(in) :: fract(ngrid) ! day fraction of the time interval
       real,intent(in) :: declin ! latitude of sub-solar point
       
@@ -71 +72 @@
 c    -----------------
       INTEGER l,ig, n, nstep,i
-      REAL co2heat0, zmu(ngridmx)
+      REAL co2heat0, zmu(ngrid)
 
 c     special diurnal=F 
-      real mu0_int(ngridmx),fract_int(ngridmx),zday_int
+      real mu0_int(ngrid),fract_int(ngrid),zday_int
       real ztim1,ztim2,ztim3,step
 

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

@@ -22 +22 @@
 c***********************************************************************
 
+      use conc_mod, only: cpnew, mmean
       implicit none
 
@@ -29 +30 @@
       include 'nlte_commons.h'
       include "chimiedata.h"
-      include "conc.h"
+!      include "conc.h"
 
 

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

@@ -31 +31 @@
 
       use tracer_mod, only: igcm_co2, igcm_co, igcm_o, igcm_n2, mmol
+      use conc_mod, only: mmean
       implicit none
 
@@ -37 +38 @@
 #include "dimphys.h"
 #include "chimiedata.h"
-#include "conc.h" !Added to have "dynamic composition" in the scheme
+!#include "conc.h" !Added to have "dynamic composition" in the scheme
 !#include "tracer.h" !"
 #include "callkeys.h"

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

@@ -1 +1 @@
       subroutine nlthermeq(ngrid, nlayer, pplev, pplay)
 c
-c  Compute the number of layers nlaylte (stored in common yomlw.h)
+c  Compute the number of layers nlaylte (stored in module yomlw_h)
 c  over which local thermodynamic equilibrium
 c  radiation scheme should be run to be sure of covering at least to a
@@ -8 +8 @@
 c  Stephen Lewis 6/2000
 c  Modified Y. Wanherdrick/ F. Forget 09/2000
-
+      use yomlw_h, only: nlaylte
       implicit none
-#include "dimensions.h"
-#include "dimphys.h"
-#include "dimradmars.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
+!#include "dimradmars.h"
 #include "nlteparams.h"
-#include "yomlw.h"
+!#include "yomlw.h"
 #include "callkeys.h"
 

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

@@ -71 +71 @@
 C     F.LOTT + M. MILLER    E.C.M.W.F.     22/11/94
 C-----------------------------------------------------------------------
+      use dimradmars_mod, only: ndlo2
       implicit none
 C
@@ -76 +77 @@
 #include "dimensions.h"
 #include "dimphys.h"
-#include "dimradmars.h"
-      integer klon,klev,kidia,kfdia
-      parameter(kidia=1,kfdia=NDLO2)
+!#include "dimradmars.h"
+      integer klon,klev,kidia
+      parameter(kidia=1)
+      integer, save :: kfdia ! =NDLO2
 
 #include "comcstfi.h"
@@ -153 +155 @@
  110  CONTINUE
 C
+      kfdia=NDLO2
+      
 c     ZTMST=TWODT
 c     IF(NSTEP.EQ.NSTART) ZTMST=0.5*TWODT

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

@@ -46 +46 @@
 C
 C-----------------------------------------------------------------------
+      use dimradmars_mod, only: ndlo2
       implicit none
 C
@@ -51 +52 @@
 #include "dimensions.h"
 #include "dimphys.h"
-#include "dimradmars.h"
+!#include "dimradmars.h"
       integer klon,klev,kidia,kfdia
 

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

@@ -1 @@
-      SUBROUTINE phyetat0 (fichnom,tab0,Lmodif,nsoil,nq,
+      SUBROUTINE phyetat0 (fichnom,tab0,Lmodif,nsoil,ngrid,nlay,nq,
      .           day_ini,time0,
      .           tsurf,tsoil,emis,q2,qsurf,co2ice)
@@ -5 +5 @@
       use netcdf
       use infotrac, only: nqtot, tnom
+      use surfdat_h, only: phisfi, albedodat, z0, z0_default,
+     &                     zmea, zstd, zsig, zgam, zthe
 
       implicit none
@@ -17 +19 @@
 c======================================================================
 !#include "netcdf.inc"
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 !#include "comgeomfi.h"
-#include "surfdat.h"
+!#include "surfdat.h"
 #include "planete.h"
-#include "dimradmars.h"
-#include "yomaer.h"
+!#include "dimradmars.h"
+!#include "yomaer.h"
 #include "comcstfi.h"
 !#include "tracer.h"
@@ -35 +37 @@
 !  ---------
 !  inputs:
-      character*(*) fichnom ! "startfi.nc" file
-      integer tab0
-      integer Lmodif
-      integer nsoil ! # of soil layers
-      integer nq
-      integer day_ini
-      real time0
+      character*(*),intent(in) :: fichnom ! "startfi.nc" file
+      integer,intent(in) :: tab0
+      integer,intent(in) :: Lmodif
+      integer,intent(in) :: nsoil ! # of soil layers
+      integer,intent(in) :: ngrid ! # of atmospheric columns
+      integer,intent(in) :: nlay ! # of atmospheric layers
+      integer,intent(in) :: nq
+      integer :: day_ini
+      real :: time0
 
 !  outputs:
-      real tsurf(ngridmx) ! surface temperature
-      real tsoil(ngridmx,nsoil) ! soil temperature
-      real emis(ngridmx) ! surface emissivity
-      real q2(ngridmx, llm+1) ! 
-      real qsurf(ngridmx,nq) ! tracers on surface
-      real co2ice(ngridmx) ! co2 ice cover
+      real,intent(out) :: tsurf(ngrid) ! surface temperature
+      real,intent(out) :: tsoil(ngrid,nsoil) ! soil temperature
+      real,intent(out) :: emis(ngrid) ! surface emissivity
+      real,intent(out) :: q2(ngrid,nlay+1) ! 
+      real,intent(out) :: qsurf(ngrid,nq) ! tracers on surface
+      real,intent(out) :: co2ice(ngrid) ! co2 ice cover
 
 !======================================================================
 !  Local variables:
 
-      real surffield(ngridmx) ! to temporarily store a surface field
+      real surffield(ngrid) ! to temporarily store a surface field
       real xmin,xmax ! to display min and max of a field
 c
@@ -248 +252 @@
          CALL abort
       ENDIF
-      xmin = 1.0E+20
-      xmax = -1.0E+20
-      DO i = 1, ngridmx
-         xmin = MIN(zmea(i),xmin)
-         xmax = MAX(zmea(i),xmax)
-      ENDDO
+      xmin = MINVAL(zmea)
+      xmax = MAXVAL(zmea)
       PRINT*,'<zmea>:', xmin, xmax
 c
@@ -270 +270 @@
          CALL abort
       ENDIF
-      xmin = 1.0E+20
-      xmax = -1.0E+20
-      DO i = 1, ngridmx
-         xmin = MIN(zstd(i),xmin)
-         xmax = MAX(zstd(i),xmax)
-      ENDDO
+      xmin = MINVAL(zstd)
+      xmax = MAXVAL(zstd)
       PRINT*,'<zstd>:', xmin, xmax
 c
@@ -292 +288 @@
          CALL abort
       ENDIF
-      xmin = 1.0E+20
-      xmax = -1.0E+20
-      DO i = 1, ngridmx
-         xmin = MIN(zsig(i),xmin)
-         xmax = MAX(zsig(i),xmax)
-      ENDDO
+      xmin = MINVAL(zsig)
+      xmax = MAXVAL(zsig)
       PRINT*,'<zsig>:', xmin, xmax
 c
@@ -314 +306 @@
          CALL abort
       ENDIF
-      xmin = 1.0E+20
-      xmax = -1.0E+20
-      DO i = 1, ngridmx
-         xmin = MIN(zgam(i),xmin)
-         xmax = MAX(zgam(i),xmax)
-      ENDDO
+      xmin = MINVAL(zgam)
+      xmax = MAXVAL(zgam)
       PRINT*,'<zgam>:', xmin, xmax
 c
@@ -336 +324 @@
          CALL abort
       ENDIF
-      xmin = 1.0E+20
-      xmax = -1.0E+20
-      DO i = 1, ngridmx
-         xmin = MIN(zthe(i),xmin)
-         xmax = MAX(zthe(i),xmax)
-      ENDDO
+      xmin = MINVAL(zthe)
+      xmax = MAXVAL(zthe)
       PRINT*,'<zthe>:', xmin, xmax
       
@@ -417 +401 @@
       corner(1)=1
       corner(2)=indextime
-      edges(1)=ngridmx
+      edges(1)=ngrid
       edges(2)=1
       ierr=nf90_inq_varid(nid,"co2ice",nvarid)
@@ -486 +470 @@
 !         IF (nbsrf >= 2) THEN
 !            DO nsrf = 2, nbsrf
-!               DO i = 1, ngridmx
+!               DO i = 1, ngrid
 !                  tsurf(i,nsrf) = tsurf(i,1)
 !               ENDDO
@@ -506 +490 @@
 !               PRINT*, "phyetat0: Le champ <tsoil> est absent"
 !               PRINT*, "          Il prend donc la valeur de surface"
-!               DO i=1, ngridmx
+!               DO i=1, ngrid
 !                  tsoil(i,isoil,nsrf)=tsurf(i,nsrf)
 !               ENDDO
@@ -549 +533 @@
 
 !
-! surface roughness length (NB: z0 is a common in surfdat.h)
+! surface roughness length (NB: z0 is a common in surfdat_h)
 !
       ierr=nf90_inq_varid(nid,"z0",nvarid)
@@ -577 +561 @@
       corner(2)=1
       corner(3)=indextime
-      edges(1)=ngridmx
-      edges(2)=llm+1
+      edges(1)=ngrid
+      edges(2)=nlay+1
       edges(3)=1
       ierr=nf90_inq_varid(nid,"q2",nvarid)
@@ -602 +586 @@
       corner(1)=1
       corner(2)=indextime
-      edges(1)=ngridmx
+      edges(1)=ngrid
       edges(2)=1
       IF(nq.GE.1) THEN
@@ -628 +612 @@
      &                  ' not found in file'
              write(*,*) trim(txt), ' set to 0'
-             do ig=1,ngridmx
+             do ig=1,ngrid
                qsurf(ig,iq)=0.
              end do
@@ -635 +619 @@
            !ierr=nf90_get_var(nid,nvarid,qsurf(1,iq))
            ierr=nf90_get_var(nid,nvarid,surffield,corner,edges)
-           qsurf(1:ngridmx,iq)=surffield(1:ngridmx)
+           qsurf(1:ngrid,iq)=surffield(1:ngrid)
              IF (ierr.NE.nf90_noerr) THEN
                PRINT*, 'phyetat0: Lecture echouee pour <',trim(txt),'>'
@@ -644 +628 @@
            xmin = 1.0E+20
            xmax = -1.0E+20
-           xmin = MINVAL(qsurf(1:ngridmx,iq))
-           xmax = MAXVAL(qsurf(1:ngridmx,iq))
+           xmin = MINVAL(qsurf(1:ngrid,iq))
+           xmax = MAXVAL(qsurf(1:ngrid,iq))
            PRINT*,'tracer on surface <',trim(txt),'>:',xmin,xmax
          ENDDO
@@ -660 +644 @@
 !            if (yes.eq.'y') then
 !              write(*,*) 'OK, let s reindex qsurf'
-!                 do ig=1,ngridmx
+!                 do ig=1,ngrid
 !                    do iq=nqtot,nqtot-nqold+1,-1
 !                       qsurf(ig,iq)=qsurf(ig,iq-nqtot+nqold)
@@ -675 +659 @@
 ! as well as thermal inertia and volumetric heat capacity
 
-      call soil_settings(nid,ngridmx,nsoil,tsurf,tsoil,indextime)
+      call soil_settings(nid,ngrid,nsoil,tsurf,tsoil,indextime)
 c
 c Fermer le fichier:

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

@@ -1 @@
-      subroutine physdem0(filename,lonfi,latfi,nsoil,nq,
+      subroutine physdem0(filename,lonfi,latfi,nsoil,ngrid,nlay,nq,
      .                   phystep,day_ini,time,airefi,
      .                   alb,ith,pzmea,pzstd,pzsig,pzgam,pzthe)
 
       use infotrac, only: nqtot, tnom
+      use comsoil_h, only: inertiedat, volcapa, mlayer
+      use comgeomfi_h, only: area
+      use surfdat_h, only: albedodat, zmea, zstd, zsig, zgam, zthe,
+     &                     z0_default, albedice, emisice, emissiv,
+     &                     iceradius, dtemisice, phisfi, z0
+      use yomaer_h, only: tauvis
       implicit none
 c
@@ -32 +38 @@
 #include "ener.h"
 #include "netcdf.inc"
-#include "dimphys.h"
+!#include "dimphys.h"
 !#include "advtrac.h"
 #include "callkeys.h"
@@ -43 +49 @@
 
       REAL day_ini
-      INTEGER nsoil,nq
+      INTEGER,INTENT(IN) :: nsoil,ngrid,nlay,nq
       integer ierr,idim1,idim2,idim3,idim4,idim5,idim6,nvarid
 
 c
       REAL phystep,time
-      REAL latfi(ngridmx), lonfi(ngridmx)
-!      REAL champhys(ngridmx)
+      REAL latfi(ngrid), lonfi(ngrid)
+!      REAL champhys(ngrid)
       INTEGER length
       PARAMETER (length=100)
@@ -62 +68 @@
 #include "clesph0.h"
 #include "fxyprim.h"
-#include "comgeomfi.h"
-#include "surfdat.h"
-#include "comsoil.h"
+!#include "comgeomfi.h"
+!#include "surfdat.h"
+!#include "comsoil.h"
 #include "planete.h"
-#include "dimradmars.h"
-#include "yomaer.h"
+!#include "dimradmars.h"
+!#include "yomaer.h"
 #include "comcstfi.h"
 
-      real airefi(ngridmx)
-      real alb(ngridmx),ith(ngridmx,nsoil)
-      real pzmea(ngridmx),pzstd(ngridmx)
-      real pzsig(ngridmx),pzgam(ngridmx),pzthe(ngridmx)
+      real airefi(ngrid)
+      real alb(ngrid),ith(ngrid,nsoil)
+      real pzmea(ngrid),pzstd(ngrid)
+      real pzsig(ngrid),pzgam(ngrid),pzthe(ngrid)
       integer ig
 
@@ -86 +92 @@
 
       ! copy airefi(:) to area(:)
-      CALL SCOPY(ngridmx,airefi,1,area,1)
-      ! note: area() is defined in comgeomfi.h
-
-
-      DO ig=1,ngridmx
-         albedodat(ig)=alb(ig) ! note: albedodat() is defined in surfdat.h
-         zmea(ig)=pzmea(ig) ! note: zmea() is defined in surfdat.h
-         zstd(ig)=pzstd(ig) ! note: zstd() is defined in surfdat.h
-         zsig(ig)=pzsig(ig) ! note: zsig() is defined in surfdat.h
-         zgam(ig)=pzgam(ig) ! note: zgam() is defined in surfdat.h
-         zthe(ig)=pzthe(ig) ! note: zthe() is defined in surfdat.h
+      CALL SCOPY(ngrid,airefi,1,area,1)
+      ! note: area() is defined in comgeomfi_h
+
+
+      DO ig=1,ngrid
+         albedodat(ig)=alb(ig) ! note: albedodat() is defined in surfdat_h
+         zmea(ig)=pzmea(ig) ! note: zmea() is defined in surfdat_h
+         zstd(ig)=pzstd(ig) ! note: zstd() is defined in surfdat_h
+         zsig(ig)=pzsig(ig) ! note: zsig() is defined in surfdat_h
+         zgam(ig)=pzgam(ig) ! note: zgam() is defined in surfdat_h
+         zthe(ig)=pzthe(ig) ! note: zthe() is defined in surfdat_h
       ENDDO
 
-      inertiedat(:,:)=ith(:,:) ! note inertiedat() is defined in comsoil.h
+      inertiedat(:,:)=ith(:,:) ! note inertiedat() is defined in comsoil_h
 c
 c  things to store in the physics start file:
@@ -121 +127 @@
       endif
 c
-      ierr = NF_DEF_DIM (nid,"physical_points",ngridmx,idim2)
+      ierr = NF_DEF_DIM (nid,"physical_points",ngrid,idim2)
       if (ierr.ne.NF_NOERR) then
         WRITE(6,*)'physdem0: Problem defining physical_points dimension'
@@ -164 +170 @@
       ENDDO
 
-      write(*,*) "physdem0: ngridmx: ",ngridmx
+      write(*,*) "physdem0: ngrid: ",ngrid
 
 ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
@@ -170 +176 @@
 ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
 c Informations on the physics grid
-      tab_cntrl(1) = float(ngridmx)  ! number of nodes on physics grid
-      tab_cntrl(2) = float(nlayermx) ! number of atmospheric layers
+      tab_cntrl(1) = float(ngrid)  ! number of nodes on physics grid
+      tab_cntrl(2) = float(nlay) ! number of atmospheric layers
       tab_cntrl(3) = day_ini + int(time)      ! initial day 
       tab_cntrl(4) = time -int(time)          ! initial time of day
@@ -260 +266 @@
       
 
-! write mid-layer depths mlayer() !known from comsoil.h
+! write mid-layer depths mlayer() !known from comsoil_h
 
       ierr = NF_REDEF (nid) ! Enter NetCDF (re-)define mode
@@ -464 +470 @@
 #endif
 
-! surface roughness length (z0 is a common in surfdat.h)
+! surface roughness length (z0 is a common in surfdat_h)
 
       ierr = NF_REDEF (nid)
@@ -691 +697 @@
 
 
-      subroutine physdem1(filename,nsoil,nq,
+      subroutine physdem1(filename,nsoil,ngrid,nlay,nq,
      .                   phystep,time,
      .                   tsurf,tsoil,co2ice,emis,q2,qsurf)
       use infotrac, only: nqtot, tnom
+      use surfdat_h, only: emis
       implicit none
 c
@@ -721 +728 @@
 #include "ener.h"
 #include "netcdf.inc"
-#include "dimphys.h"
+!#include "dimphys.h"
 !#include "advtrac.h"
 #include "callkeys.h"
@@ -732 +739 @@
 
       REAL day_ini
-      INTEGER nsoil,nq
+      INTEGER,INTENT(IN) :: nsoil,ngrid,nlay,nq
       integer ierr,nvarid
 
 c
       REAL phystep,time
-!      REAL champhys(ngridmx)
-      REAL tsurf(ngridmx)
+!      REAL champhys(ngrid)
+      REAL tsurf(ngrid)
 
       INTEGER nb
@@ -753 +760 @@
 #include "clesph0.h"
 #include "fxyprim.h"
-#include "comgeomfi.h"
-#include "surfdat.h"
-#include "comsoil.h"
+!#include "comgeomfi.h"
+!#include "surfdat.h"
+!#include "comsoil.h"
 #include "planete.h"
-#include "dimradmars.h"
-#include "yomaer.h"
+!#include "dimradmars.h"
+!#include "yomaer.h"
 #include "comcstfi.h"
 
-      real co2ice(ngridmx),tsoil(ngridmx,nsoil),emis(ngridmx)
-      real q2(ngridmx, llm+1),qsurf(ngridmx,nq)
+      real co2ice(ngrid),tsoil(ngrid,nsoil),emis(ngrid)
+      real q2(ngrid,nlay+1),qsurf(ngrid,nq)
       integer ig
 
@@ -815 +822 @@
       corner(2)=1
       corner(3)=nb
-      edges(1)=ngridmx
+      edges(1)=ngrid
       edges(2)=nsoil
       edges(3)=1
@@ -838 +845 @@
       corner(2)=1
       corner(3)=nb
-      edges(1)=ngridmx
+      edges(1)=ngrid
       edges(2)=llm+1
       edges(3)=1
@@ -861 +868 @@
       corner(1)=1
       corner(2)=nb
-      edges(1)=ngridmx
+      edges(1)=ngrid
       edges(2)=1
       
@@ -946 +953 @@
         write(*,*)'physdem1: moving surface water ice to index ',nqtot
         do iq=nqtot,nqtot
-          qsurf(1:ngridmx,iq)=qsurf(1:ngridmx,iq-1)
-          qsurf(1:ngridmx,iq-1)=0
+          qsurf(1:ngrid,iq)=qsurf(1:ngrid,iq-1)
+          qsurf(1:ngrid,iq-1)=0
         enddo
       ENDIF

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

@@ -17 +17 @@
      &                      igcm_dust_mass, igcm_dust_number, igcm_h2o2,
      &                      nuice_ref, rho_ice, rho_dust, ref_r0
-
+      use comsoil_h, only: inertiedat, ! soil thermal inertia
+     &                     nsoilmx ! number of subsurface layers
+      use eofdump_mod, only: eofdump
+      use comgeomfi_h, only: long, lati, area
+      use comdiurn_h, only: sinlon, coslon, sinlat, coslat
+      use surfdat_h, only: phisfi, albedodat, zmea, zstd, zsig, zgam,
+     &                     zthe, z0, albedo_h2o_ice,
+     &                     frost_albedo_threshold
+      use comsaison_h, only: dist_sol, declin, mu0, fract
+      use slope_mod, only: theta_sl, psi_sl
+      use conc_mod, only: rnew, cpnew, mmean
       IMPLICIT NONE
 c=======================================================================
@@ -105 +115 @@
 c   -------
 c
-c    pdu(ngrid,nlayermx)       |
-c    pdv(ngrid,nlayermx)       |  Temporal derivative of the corresponding
-c    pdt(ngrid,nlayermx)       |  variables due to physical processes.
-c    pdq(ngrid,nlayermx,nq)    |
-c    pdpsrf(ngrid)             |
+c    pdu(ngrid,nlayer)       |
+c    pdv(ngrid,nlayer)       |  Temporal derivative of the corresponding
+c    pdt(ngrid,nlayer)       |  variables due to physical processes.
+c    pdq(ngrid,nlayer,nq)    |
+c    pdpsrf(ngrid)           |
 c    tracerdyn                 call tracer in dynamical part of GCM ?
 
@@ -120 +130 @@
 #include "dimensions.h"
 #include "dimphys.h"
-#include "comgeomfi.h"
-#include "surfdat.h"
-#include "comsoil.h"
-#include "comdiurn.h"
+!#include "comgeomfi.h"
+!#include "surfdat.h"
+!#include "comsoil.h"
+!#include "comdiurn.h"
 #include "callkeys.h"
 #include "comcstfi.h"
 #include "planete.h"
-#include "comsaison.h"
+!#include "comsaison.h"
 #include "control.h"
-#include "dimradmars.h"
+!#include "dimradmars.h"
+! naerkind is set in scatterers.h (built when compiling with makegcm -s #)
+#include"scatterers.h"
 #include "comg1d.h"
 !#include "tracer.h"
@@ -138 +150 @@
 #include "param.h"
 #include "param_v4.h"
-#include "conc.h"
+!#include "conc.h"
 
 #include "netcdf.inc"
 
-#include "slope.h"
+!#include "slope.h"
 
 #ifdef MESOSCALE
@@ -158 +170 @@
       INTEGER ngrid,nlayer,nq
       REAL ptimestep
-      REAL pplev(ngridmx,nlayer+1),pplay(ngridmx,nlayer)
-      REAL pphi(ngridmx,nlayer)
-      REAL pu(ngridmx,nlayer),pv(ngridmx,nlayer)
-      REAL pt(ngridmx,nlayer),pq(ngridmx,nlayer,nq)
-      REAL pw(ngridmx,nlayer) !Mars pvervel transmit par dyn3d
-      REAL zh(ngridmx,nlayermx)      ! potential temperature (K)
+      REAL pplev(ngrid,nlayer+1),pplay(ngrid,nlayer)
+      REAL pphi(ngrid,nlayer)
+      REAL pu(ngrid,nlayer),pv(ngrid,nlayer)
+      REAL pt(ngrid,nlayer),pq(ngrid,nlayer,nq)
+      REAL pw(ngrid,nlayer) !Mars pvervel transmit par dyn3d
+      REAL zh(ngrid,nlayer)      ! potential temperature (K)
       LOGICAL firstcall,lastcall
 
@@ -173 +185 @@
 c   --------
 c     physical tendencies
-      REAL pdu(ngridmx,nlayer),pdv(ngridmx,nlayer)
-      REAL pdt(ngridmx,nlayer),pdq(ngridmx,nlayer,nq)
-      REAL pdpsrf(ngridmx) ! surface pressure tendency
+      REAL pdu(ngrid,nlayer),pdv(ngrid,nlayer)
+      REAL pdt(ngrid,nlayer),pdq(ngrid,nlayer,nq)
+      REAL pdpsrf(ngrid) ! surface pressure tendency
 
 
@@ -181 +193 @@
 c ----------------------
 c     aerosol (dust or ice) extinction optical depth  at reference wavelength 
-c     "longrefvis" set in dimradmars.h , for one of the "naerkind"  kind of
+c     "longrefvis" set in dimradmars_mod , for one of the "naerkind"  kind of
 c      aerosol optical properties  :
-      REAL aerosol(ngridmx,nlayermx,naerkind)
-
-      INTEGER day_ini  ! Initial date of the run (sol since Ls=0) 
-      INTEGER icount     ! counter of calls to physiq during the run.
-      REAL tsurf(ngridmx)            ! Surface temperature (K)
-      REAL tsoil(ngridmx,nsoilmx)    ! sub-surface temperatures (K)
-      REAL co2ice(ngridmx)           ! co2 ice surface layer (kg.m-2)  
-      REAL albedo(ngridmx,2)         ! Surface albedo in each solar band
-      REAL emis(ngridmx)             ! Thermal IR surface emissivity
-      REAL dtrad(ngridmx,nlayermx)   ! Net atm. radiative heating rate (K.s-1)
-      REAL fluxrad_sky(ngridmx)      ! rad. flux from sky absorbed by surface (W.m-2)
-      REAL fluxrad(ngridmx)          ! Net radiative surface flux (W.m-2)
-      REAL capcal(ngridmx)           ! surface heat capacity (J m-2 K-1)
-      REAL fluxgrd(ngridmx)          ! surface conduction flux (W.m-2)
+      REAL,SAVE,ALLOCATABLE :: aerosol(:,:,:)
+
+      INTEGER,SAVE :: day_ini  ! Initial date of the run (sol since Ls=0) 
+      INTEGER,SAVE :: icount     ! counter of calls to physiq during the run.
+      REAL,SAVE,ALLOCATABLE :: tsurf(:)   ! Surface temperature (K)
+      REAL,SAVE,ALLOCATABLE :: tsoil(:,:) ! sub-surface temperatures (K)
+      REAL,SAVE,ALLOCATABLE :: co2ice(:)  ! co2 ice surface layer (kg.m-2)  
+      REAL,SAVE,ALLOCATABLE :: albedo(:,:) ! Surface albedo in each solar band
+      REAL,SAVE,ALLOCATABLE :: emis(:)    ! Thermal IR surface emissivity
+      REAL,SAVE,ALLOCATABLE :: dtrad(:,:) ! Net atm. radiative heating rate (K.s-1)
+      REAL,SAVE,ALLOCATABLE :: fluxrad_sky(:) ! rad. flux from sky absorbed by surface (W.m-2)
+      REAL,SAVE,ALLOCATABLE :: fluxrad(:) ! Net radiative surface flux (W.m-2)
+      REAL,SAVE,ALLOCATABLE :: capcal(:) ! surface heat capacity (J m-2 K-1)
+      REAL,SAVE,ALLOCATABLE :: fluxgrd(:) ! surface conduction flux (W.m-2)
       REAL,ALLOCATABLE,SAVE :: qsurf(:,:) ! tracer on surface (e.g. kg.m-2)
-      REAL q2(ngridmx,nlayermx+1)    ! Turbulent Kinetic Energy
+      REAL,SAVE,ALLOCATABLE :: q2(:,:)    ! Turbulent Kinetic Energy
       
 c     Variables used by the water ice microphysical scheme:
-      REAL rice(ngridmx,nlayermx)    ! Water ice geometric mean radius (m)
-      REAL nuice(ngridmx,nlayermx)   ! Estimated effective variance
+      REAL rice(ngrid,nlayer)    ! Water ice geometric mean radius (m)
+      REAL nuice(ngrid,nlayer)   ! Estimated effective variance
                                      !   of the size distribution
-      real rsedcloud(ngridmx,nlayermx) ! Cloud sedimentation radius
-      real rhocloud(ngridmx,nlayermx)  ! Cloud density (kg.m-3)
-      REAL surfdust(ngridmx,nlayermx) ! dust surface area (m2/m3, if photochemistry)
-      REAL surfice(ngridmx,nlayermx)  !  ice surface area (m2/m3, if photochemistry)
-      REAL inertiesoil(ngridmx,nsoilmx)! Time varying subsurface
-                                       ! thermal inertia (J.s-1/2.m-2.K-1)
-                                       ! (used only when tifeedback=.true.)
+      real rsedcloud(ngrid,nlayer) ! Cloud sedimentation radius
+      real rhocloud(ngrid,nlayer)  ! Cloud density (kg.m-3)
+      REAL surfdust(ngrid,nlayer) ! dust surface area (m2/m3, if photochemistry)
+      REAL surfice(ngrid,nlayer)  !  ice surface area (m2/m3, if photochemistry)
+      REAL inertiesoil(ngrid,nsoilmx) ! Time varying subsurface
+                                      ! thermal inertia (J.s-1/2.m-2.K-1)
+                                      ! (used only when tifeedback=.true.)
 
 c     Variables used by the slope model
@@ -219 +231 @@
       REAL sky
 
-      SAVE day_ini, icount, time_phys
-      SAVE aerosol, tsurf,tsoil
-      SAVE co2ice,albedo,emis, q2
-      SAVE capcal,fluxgrd,dtrad,fluxrad,fluxrad_sky
-
-      REAL stephan   
-      DATA stephan/5.67e-08/  ! Stephan Boltzman constant
-      SAVE stephan
+      REAL,PARAMETER :: stephan = 5.67e-08 ! Stephan Boltzman constant
 
 c Local variables :
@@ -237 +242 @@
       INTEGER l,ig,ierr,igout,iq,tapphys
 
-      REAL fluxsurf_lw(ngridmx)      !incident LW (IR) surface flux (W.m-2)
-      REAL fluxsurf_sw(ngridmx,2)    !incident SW (solar) surface flux (W.m-2)
-      REAL fluxtop_lw(ngridmx)       !Outgoing LW (IR) flux to space (W.m-2)
-      REAL fluxtop_sw(ngridmx,2)     !Outgoing SW (solar) flux to space (W.m-2)
-      REAL tauref(ngridmx)           ! Reference column optical depth at odpref
+      REAL fluxsurf_lw(ngrid)      !incident LW (IR) surface flux (W.m-2)
+      REAL fluxsurf_sw(ngrid,2)    !incident SW (solar) surface flux (W.m-2)
+      REAL fluxtop_lw(ngrid)       !Outgoing LW (IR) flux to space (W.m-2)
+      REAL fluxtop_sw(ngrid,2)     !Outgoing SW (solar) flux to space (W.m-2)
+      REAL tauref(ngrid)           ! Reference column optical depth at odpref
       real,parameter :: odpref=610. ! DOD reference pressure (Pa)
-      REAL tau(ngridmx,naerkind)     ! Column dust optical depth at each point
+      REAL tau(ngrid,naerkind)     ! Column dust optical depth at each point
       REAL zls                       !  solar longitude (rad)
       REAL zday                      ! date (time since Ls=0, in martian days)
-      REAL zzlay(ngridmx,nlayermx)   ! altitude at the middle of the layers
-      REAL zzlev(ngridmx,nlayermx+1) ! altitude at layer boundaries
+      REAL zzlay(ngrid,nlayer)     ! altitude at the middle of the layers
+      REAL zzlev(ngrid,nlayer+1)   ! altitude at layer boundaries
 !      REAL latvl1,lonvl1             ! Viking Lander 1 point (for diagnostic)
 
 c     Tendancies due to various processes:
-      REAL dqsurf(ngridmx,nq)
-      REAL zdtlw(ngridmx,nlayermx)     ! (K/s)
-      REAL zdtsw(ngridmx,nlayermx)     ! (K/s)
-!      REAL cldtlw(ngridmx,nlayermx)     ! (K/s) LW heating rate for clear area
-!      REAL cldtsw(ngridmx,nlayermx)     ! (K/s) SW heating rate for clear area
-      REAL zdtnirco2(ngridmx,nlayermx) ! (K/s)
-      REAL zdtnlte(ngridmx,nlayermx)   ! (K/s)
-      REAL zdtsurf(ngridmx)            ! (K/s)
-      REAL zdtcloud(ngridmx,nlayermx)
-      REAL zdvdif(ngridmx,nlayermx),zdudif(ngridmx,nlayermx)  ! (m.s-2)
-      REAL zdhdif(ngridmx,nlayermx), zdtsdif(ngridmx)         ! (K/s)
-      REAL zdvadj(ngridmx,nlayermx),zduadj(ngridmx,nlayermx)  ! (m.s-2)
-      REAL zdhadj(ngridmx,nlayermx)                           ! (K/s)
-      REAL zdtgw(ngridmx,nlayermx)                            ! (K/s)
-      REAL zdugw(ngridmx,nlayermx),zdvgw(ngridmx,nlayermx)    ! (m.s-2)
-      REAL zdtc(ngridmx,nlayermx),zdtsurfc(ngridmx)
-      REAL zdvc(ngridmx,nlayermx),zduc(ngridmx,nlayermx)
-
-      REAL zdqdif(ngridmx,nlayermx,nq), zdqsdif(ngridmx,nq)
-      REAL zdqsed(ngridmx,nlayermx,nq), zdqssed(ngridmx,nq)
-      REAL zdqdev(ngridmx,nlayermx,nq), zdqsdev(ngridmx,nq)
-      REAL zdqadj(ngridmx,nlayermx,nq)
-      REAL zdqc(ngridmx,nlayermx,nq)
-      REAL zdqcloud(ngridmx,nlayermx,nq)
-      REAL zdqscloud(ngridmx,nq)
-      REAL zdqchim(ngridmx,nlayermx,nq)
-      REAL zdqschim(ngridmx,nq)
-
-      REAL zdteuv(ngridmx,nlayermx)    ! (K/s)
-      REAL zdtconduc(ngridmx,nlayermx) ! (K/s)
-      REAL zdumolvis(ngridmx,nlayermx)
-      REAL zdvmolvis(ngridmx,nlayermx)
-      real zdqmoldiff(ngridmx,nlayermx,nq)
+      REAL dqsurf(ngrid,nq)
+      REAL zdtlw(ngrid,nlayer)     ! (K/s)
+      REAL zdtsw(ngrid,nlayer)     ! (K/s)
+!      REAL cldtlw(ngrid,nlayer)     ! (K/s) LW heating rate for clear area
+!      REAL cldtsw(ngrid,nlayer)     ! (K/s) SW heating rate for clear area
+      REAL zdtnirco2(ngrid,nlayer) ! (K/s)
+      REAL zdtnlte(ngrid,nlayer)   ! (K/s)
+      REAL zdtsurf(ngrid)            ! (K/s)
+      REAL zdtcloud(ngrid,nlayer)
+      REAL zdvdif(ngrid,nlayer),zdudif(ngrid,nlayer)  ! (m.s-2)
+      REAL zdhdif(ngrid,nlayer), zdtsdif(ngrid)         ! (K/s)
+      REAL zdvadj(ngrid,nlayer),zduadj(ngrid,nlayer)  ! (m.s-2)
+      REAL zdhadj(ngrid,nlayer)                           ! (K/s)
+      REAL zdtgw(ngrid,nlayer)                            ! (K/s)
+      REAL zdugw(ngrid,nlayer),zdvgw(ngrid,nlayer)    ! (m.s-2)
+      REAL zdtc(ngrid,nlayer),zdtsurfc(ngrid)
+      REAL zdvc(ngrid,nlayer),zduc(ngrid,nlayer)
+
+      REAL zdqdif(ngrid,nlayer,nq), zdqsdif(ngrid,nq)
+      REAL zdqsed(ngrid,nlayer,nq), zdqssed(ngrid,nq)
+      REAL zdqdev(ngrid,nlayer,nq), zdqsdev(ngrid,nq)
+      REAL zdqadj(ngrid,nlayer,nq)
+      REAL zdqc(ngrid,nlayer,nq)
+      REAL zdqcloud(ngrid,nlayer,nq)
+      REAL zdqscloud(ngrid,nq)
+      REAL zdqchim(ngrid,nlayer,nq)
+      REAL zdqschim(ngrid,nq)
+
+      REAL zdteuv(ngrid,nlayer)    ! (K/s)
+      REAL zdtconduc(ngrid,nlayer) ! (K/s)
+      REAL zdumolvis(ngrid,nlayer)
+      REAL zdvmolvis(ngrid,nlayer)
+      real zdqmoldiff(ngrid,nlayer,nq)
 
 c     Local variable for local intermediate calcul:
-      REAL zflubid(ngridmx)
-      REAL zplanck(ngridmx),zpopsk(ngridmx,nlayermx)
-      REAL zdum1(ngridmx,nlayermx)
-      REAL zdum2(ngridmx,nlayermx)
+      REAL zflubid(ngrid)
+      REAL zplanck(ngrid),zpopsk(ngrid,nlayer)
+      REAL zdum1(ngrid,nlayer)
+      REAL zdum2(ngrid,nlayer)
       REAL ztim1,ztim2,ztim3, z1,z2
       REAL ztime_fin
-      REAL zdh(ngridmx,nlayermx)
+      REAL zdh(ngrid,nlayer)
       INTEGER length
       PARAMETER (length=100)
@@ -298 +303 @@
 c local variables only used for diagnostic (output in file "diagfi" or "stats")
 c -----------------------------------------------------------------------------
-      REAL ps(ngridmx), zt(ngridmx,nlayermx)
-      REAL zu(ngridmx,nlayermx),zv(ngridmx,nlayermx)
-      REAL zq(ngridmx,nlayermx,nq)
-      REAL fluxtop_sw_tot(ngridmx), fluxsurf_sw_tot(ngridmx)
+      REAL ps(ngrid), zt(ngrid,nlayer)
+      REAL zu(ngrid,nlayer),zv(ngrid,nlayer)
+      REAL zq(ngrid,nlayer,nq)
+      REAL fluxtop_sw_tot(ngrid), fluxsurf_sw_tot(ngrid)
       character*2 str2
 !      character*5 str5
-      real zdtdif(ngridmx,nlayermx), zdtadj(ngridmx,nlayermx)
-      REAL tauscaling(ngridmx)   ! Convertion factor for qdust and Ndust
-      SAVE tauscaling            ! in case iradia NE 1
-      real rdust(ngridmx,nlayermx) ! dust geometric mean radius (m)
+      real zdtdif(ngrid,nlayer), zdtadj(ngrid,nlayer)
+      REAL,SAVE,ALLOCATABLE :: tauscaling(:)   ! Convertion factor for qdust and Ndust
+      real rdust(ngrid,nlayer) ! dust geometric mean radius (m)
       integer igmin, lmin
       logical tdiag
 
-      real co2col(ngridmx)        ! CO2 column
+      real co2col(ngrid)        ! CO2 column
       ! pplev and pplay are dynamical inputs and must not be modified in the physics.
       ! instead, use zplay and zplev :
-      REAL zplev(ngrid,nlayermx+1),zplay(ngrid,nlayermx) 
+      REAL zplev(ngrid,nlayer+1),zplay(ngrid,nlayer) 
 !      REAL zstress(ngrid),cd
-      real tmean, zlocal(nlayermx)
-      real rho(ngridmx,nlayermx)  ! density
-      real vmr(ngridmx,nlayermx)  ! volume mixing ratio
-      real rhopart(ngridmx,nlayermx) ! number density of a given species
-      real colden(ngridmx,nq)     ! vertical column of tracers
-      REAL mtot(ngridmx)          ! Total mass of water vapor (kg/m2)
-      REAL icetot(ngridmx)        ! Total mass of water ice (kg/m2)
-      REAL Nccntot(ngridmx)       ! Total number of ccn (nbr/m2)
-      REAL Mccntot(ngridmx)       ! Total mass of ccn (kg/m2)
-      REAL rave(ngridmx)          ! Mean water ice effective radius (m)
-      REAL opTES(ngridmx,nlayermx)! abs optical depth at 825 cm-1
-      REAL tauTES(ngridmx)        ! column optical depth at 825 cm-1
+      real tmean, zlocal(nlayer)
+      real rho(ngrid,nlayer)  ! density
+      real vmr(ngrid,nlayer)  ! volume mixing ratio
+      real rhopart(ngrid,nlayer) ! number density of a given species
+      real colden(ngrid,nq)     ! vertical column of tracers
+      REAL mtot(ngrid)          ! Total mass of water vapor (kg/m2)
+      REAL icetot(ngrid)        ! Total mass of water ice (kg/m2)
+      REAL Nccntot(ngrid)       ! Total number of ccn (nbr/m2)
+      REAL Mccntot(ngrid)       ! Total mass of ccn (kg/m2)
+      REAL rave(ngrid)          ! Mean water ice effective radius (m)
+      REAL opTES(ngrid,nlayer)  ! abs optical depth at 825 cm-1
+      REAL tauTES(ngrid)        ! column optical depth at 825 cm-1
       REAL Qabsice                ! Water ice absorption coefficient
-      REAL taucloudtes(ngridmx)! Cloud opacity at infrared
+      REAL taucloudtes(ngrid)  ! Cloud opacity at infrared
                                !   reference wavelength using
                                !   Qabs instead of Qext
                                !   (direct comparison with TES)
                                
-      REAL dqdustsurf(ngridmx) ! surface q dust flux (kg/m2/s)
-      REAL dndustsurf(ngridmx) ! surface n dust flux (number/m2/s)
-      REAL ndust(ngridmx,nlayermx) ! true n dust (kg/kg)
-      REAL qdust(ngridmx,nlayermx) ! true q dust (kg/kg)
-      REAL nccn(ngridmx,nlayermx)  ! true n ccn (kg/kg)
-      REAL qccn(ngridmx,nlayermx)  ! true q ccn (kg/kg)
+      REAL dqdustsurf(ngrid) ! surface q dust flux (kg/m2/s)
+      REAL dndustsurf(ngrid) ! surface n dust flux (number/m2/s)
+      REAL ndust(ngrid,nlayer) ! true n dust (kg/kg)
+      REAL qdust(ngrid,nlayer) ! true q dust (kg/kg)
+      REAL nccn(ngrid,nlayer)  ! true n ccn (kg/kg)
+      REAL qccn(ngrid,nlayer)  ! true q ccn (kg/kg)
 
 c Test 1d/3d scavenging
-      real h2otot(ngridmx)
-      REAL satu(ngridmx,nlayermx)  ! satu ratio for output
-      REAL zqsat(ngridmx,nlayermx) ! saturation
-
-      REAL time_phys
+      real h2otot(ngrid)
+      REAL satu(ngrid,nlayer)  ! satu ratio for output
+      REAL zqsat(ngrid,nlayer) ! saturation
+
+      REAL,SAVE :: time_phys
 
 ! Added for new NLTE scheme
 
-      real co2vmr_gcm(ngridmx,nlayermx)
-      real n2vmr_gcm(ngridmx,nlayermx)
-      real ovmr_gcm(ngridmx,nlayermx)
-      real covmr_gcm(ngridmx,nlayermx)
+      real co2vmr_gcm(ngrid,nlayer)
+      real n2vmr_gcm(ngrid,nlayer)
+      real ovmr_gcm(ngrid,nlayer)
+      real covmr_gcm(ngrid,nlayer)
 
 
 c Variables for PBL
-      REAL zz1(ngridmx)
-      REAL lmax_th_out(ngridmx),zmax_th(ngridmx)
-      REAL, SAVE :: wstar(ngridmx)
-      REAL, SAVE :: hfmax_th(ngridmx)
-      REAL pdu_th(ngridmx,nlayermx),pdv_th(ngridmx,nlayermx)
-      REAL pdt_th(ngridmx,nlayermx),pdq_th(ngridmx,nlayermx,nq)
-      INTEGER lmax_th(ngridmx),dimout,n_out,n
+      REAL zz1(ngrid)
+      REAL lmax_th_out(ngrid),zmax_th(ngrid)
+      REAL,SAVE,ALLOCATABLE :: wstar(:)
+      REAL,SAVE,ALLOCATABLE :: hfmax_th(:)
+      REAL pdu_th(ngrid,nlayer),pdv_th(ngrid,nlayer)
+      REAL pdt_th(ngrid,nlayer),pdq_th(ngrid,nlayer,nq)
+      INTEGER lmax_th(ngrid),dimout,n_out,n
       CHARACTER(50) zstring
-      REAL dtke_th(ngridmx,nlayermx+1)
-      REAL zcdv(ngridmx), zcdh(ngridmx)
+      REAL dtke_th(ngrid,nlayer+1)
+      REAL zcdv(ngrid), zcdh(ngrid)
       REAL, ALLOCATABLE, DIMENSION(:,:) :: T_out
       REAL, ALLOCATABLE, DIMENSION(:,:) :: u_out ! Interpolated teta and u at z_out
-      REAL u_out1(ngridmx)
-      REAL T_out1(ngridmx)
+      REAL u_out1(ngrid)
+      REAL T_out1(ngrid)
       REAL, ALLOCATABLE, DIMENSION(:) :: z_out     ! height of interpolation between z0 and z1 [meters]
-      REAL ustar(ngridmx),tstar(ngridmx)  ! friction velocity and friction potential temp
-      REAL L_mo(ngridmx),vhf(ngridmx),vvv(ngridmx)
-!      REAL zu2(ngridmx)
-      REAL sensibFlux(ngridmx)
+      REAL ustar(ngrid),tstar(ngrid)  ! friction velocity and friction potential temp
+      REAL L_mo(ngrid),vhf(ngrid),vvv(ngrid)
+!      REAL zu2(ngrid)
+      REAL sensibFlux(ngrid)
 
 c=======================================================================
@@ -388 +392 @@
         ! allocate local (saved) arrays:
         allocate(qsurf(ngrid,nq))
+        allocate(tsoil(ngrid,nsoilmx))
+        allocate(tsurf(ngrid))
+        allocate(aerosol(ngrid,nlayer,naerkind))
+        allocate(co2ice(ngrid))
+        allocate(albedo(ngrid,2))
+        allocate(emis(ngrid))
+        allocate(dtrad(ngrid,nlayer))
+        allocate(fluxrad_sky(ngrid))
+        allocate(fluxrad(ngrid))
+        allocate(capcal(ngrid))
+        allocate(fluxgrd(ngrid))
+        allocate(q2(ngrid,nlayer+1))
+        allocate(tauscaling(ngrid))
+        allocate(wstar(ngrid))
+        allocate(hfmax_th(ngrid))
         
 c        variables set to 0
@@ -406 +425 @@
 ! Read netcdf initial physical parameters.
          CALL phyetat0 ("startfi.nc",0,0,
-     &         nsoilmx,nq,
+     &         nsoilmx,ngrid,nlayer,nq,
      &         day_ini,time_phys,
      &         tsurf,tsoil,emis,q2,qsurf,co2ice)
@@ -469 +488 @@
 
          if (.not.callthermos .and. .not.photochem) then
-                 do l=1,nlayermx
-                  do ig=1,ngridmx
+                 do l=1,nlayer
+                  do ig=1,ngrid
                    rnew(ig,l)=r
                    cpnew(ig,l)=cpp
@@ -482 +501 @@
          if(thermochem) call chemthermos_readini
 
-        IF (tracer.AND.water.AND.(ngridmx.NE.1)) THEN
+        IF (tracer.AND.water.AND.(ngrid.NE.1)) THEN
           write(*,*)"physiq: water_param Surface water ice albedo:", 
      .                  albedo_h2o_ice
@@ -488 +507 @@
 
 #ifndef MESOSCALE
-         if (callslope) call getslopes(phisfi)
+         if (callslope) call getslopes(ngrid,phisfi)
                            
-         call physdem0("restartfi.nc",long,lati,nsoilmx,nq,
+         call physdem0("restartfi.nc",long,lati,nsoilmx,ngrid,nlayer,nq,
      .                 ptimestep,pday,time_phys,area,
      .                 albedodat,inertiedat,zmea,zstd,zsig,zgam,zthe)
@@ -503 +522 @@
 c ---------------------------------------------------
 c
-      IF (ngrid.NE.ngridmx) THEN
-         PRINT*,'STOP in PHYSIQ'
-         PRINT*,'Probleme de dimensions :'
-         PRINT*,'ngrid     = ',ngrid
-         PRINT*,'ngridmx   = ',ngridmx
-         STOP
-      ENDIF
 
 c     Initialize various variables
@@ -580 +592 @@
 
       if(photochem.or.callthermos) then
-         call concentrations(nq,zplay,pt,pdt,pq,pdq,ptimestep)
+         call concentrations(ngrid,nlayer,nq,
+     &                       zplay,pt,pdt,pq,pdq,ptimestep)
       endif
 #endif
@@ -812 +825 @@
 c Richardson based surface layer model.
         IF ( .not.calltherm .and. callrichsl ) THEN
-          DO ig=1, ngridmx
+          DO ig=1, ngrid
              IF (zh(ig,1) .lt. tsurf(ig)) THEN
                wstar(ig)=1.
@@ -1226 +1239 @@
      $                       surfdust, surfice)
 !           call photochemistry
-            call calchim(nq,
+            call calchim(ngrid,nlayer,nq,
      &                   ptimestep,zplay,zplev,pt,pdt,dist_sol,mu0,
      $                   zzlev,zzlay,zday,pq,pdq,zdqchim,zdqschim,
@@ -1293 +1306 @@
 
       if (callthermos) then
-        call thermosphere(zplev,zplay,dist_sol,
+        call thermosphere(ngrid,nlayer,nq,zplev,zplay,dist_sol,
      $     mu0,ptimestep,ptime,zday,tsurf,zzlev,zzlay,
      &     pt,pq,pu,pv,pdt,pdq,
@@ -1331 +1344 @@
 
 
-      IF (tracer.AND.water.AND.(ngridmx.NE.1)) THEN
+      IF (tracer.AND.water.AND.(ngrid.NE.1)) THEN
 #ifndef MESOSCALE
          if (caps.and.(obliquit.lt.27.)) then
@@ -1356 +1369 @@
            endif
          enddo  ! of do ig=1,ngrid
-      ENDIF  ! of IF (tracer.AND.water.AND.(ngridmx.NE.1))
+      ENDIF  ! of IF (tracer.AND.water.AND.(ngrid.NE.1))
 
 c
@@ -1415 +1428 @@
       ! Potential Temperature
 
-       DO ig=1,ngridmx
-          DO l=1,nlayermx
+       DO ig=1,ngrid
+          DO l=1,nlayer
               zh(ig,l) = zt(ig,l)*(zplev(ig,1)/zplay(ig,l))**rcp
           ENDDO
@@ -1553 +1566 @@
             
             
-          call physdem1("restartfi.nc",nsoilmx,nq,
+          call physdem1("restartfi.nc",nsoilmx,ngrid,nlayer,nq,
      .                ptimestep,ztime_fin,
      .                tsurf,tsoil,co2ice,emis,q2,qsurf)
@@ -1598 +1611 @@
              tauTES(:)=0
              do ig=1,ngrid 
-               do l=1,nlayermx
+               do l=1,nlayer
                  mtot(ig) = mtot(ig) + 
      &                      zq(ig,l,igcm_h2o_vap) * 
@@ -1619 +1632 @@
 c               if (icetot(ig)*1e3.lt.0.01) rave(ig)=0.
              enddo
-             call watersat(ngridmx*nlayermx,zt,zplay,zqsat)
+             call watersat(ngrid*nlayer,zt,zplay,zqsat)
              satu(:,:) = zq(:,:,igcm_h2o_vap)/zqsat(:,:)
 
@@ -1627 +1640 @@
                rave(:)=0
                do ig=1,ngrid 
-                 do l=1,nlayermx
+                 do l=1,nlayer
                     Nccntot(ig) = Nccntot(ig) + 
      &              zq(ig,l,igcm_ccn_number)*tauscaling(ig)
@@ -1649 +1662 @@
                rave(:)=0
                do ig=1,ngrid 
-                 do l=1,nlayermx
+                 do l=1,nlayer
                  rave(ig) = rave(ig) + 
      &                      zq(ig,l,igcm_h2o_ice) *
@@ -1722 +1735 @@
            if (tracer) then
              if (water) then
-               vmr=zq(1:ngridmx,1:nlayermx,igcm_h2o_vap)
-     &      *mmean(1:ngridmx,1:nlayermx)/mmol(igcm_h2o_vap)
+               vmr=zq(1:ngrid,1:nlayer,igcm_h2o_vap)
+     &      *mmean(1:ngrid,1:nlayer)/mmol(igcm_h2o_vap)
                call wstats(ngrid,"vmr_h2ovap",
      &                    "H2O vapor volume mixing ratio","mol/mol",
      &                    3,vmr)
-               vmr=zq(1:ngridmx,1:nlayermx,igcm_h2o_ice)
-     &      *mmean(1:ngridmx,1:nlayermx)/mmol(igcm_h2o_ice)
+               vmr=zq(1:ngrid,1:nlayer,igcm_h2o_ice)
+     &      *mmean(1:ngrid,1:nlayer)/mmol(igcm_h2o_ice)
                call wstats(ngrid,"vmr_h2oice",
      &                    "H2O ice volume mixing ratio","mol/mol",
      &                    3,vmr)
-               vmr=zqsat(1:ngridmx,1:nlayermx)
-     &      *mmean(1:ngridmx,1:nlayermx)/mmol(igcm_h2o_vap)
+               vmr=zqsat(1:ngrid,1:nlayer)
+     &      *mmean(1:ngrid,1:nlayer)/mmol(igcm_h2o_vap)
                call wstats(ngrid,"vmr_h2osat",
      &                    "saturation volume mixing ratio","mol/mol",
@@ -1766 +1779 @@
      &                      2,tauTES)
                else
-                 call wstats(ngridmx,'tauTES',
+                 call wstats(ngrid,'tauTES',
      &                   'tau abs 825 cm-1',
      &                  '',2,taucloudtes)
@@ -1776 +1789 @@
            if (dustbin.ne.0) then
           
-             call wstats(ngridmx,'tau','taudust','SI',2,tau(1,1))
+             call wstats(ngrid,'tau','taudust','SI',2,tau(1,1))
              
              if (doubleq) then
-c            call wstats(ngridmx,'qsurf','qsurf',
+c            call wstats(ngrid,'qsurf','qsurf',
 c     &                       'kg.m-2',2,qsurf(1,igcm_dust_mass))
-c            call wstats(ngridmx,'Nsurf','N particles',
+c            call wstats(ngrid,'Nsurf','N particles',
 c     &                       'N.m-2',2,qsurf(1,igcm_dust_number))
-c            call wstats(ngridmx,'dqsdev','ddevil lift',
+c            call wstats(ngrid,'dqsdev','ddevil lift',
 c    &                       'kg.m-2.s-1',2,zdqsdev(1,1))
-c            call wstats(ngridmx,'dqssed','sedimentation',
+c            call wstats(ngrid,'dqssed','sedimentation',
 c     &                       'kg.m-2.s-1',2,zdqssed(1,1))
-c            call wstats(ngridmx,'dqsdif','diffusion',
+c            call wstats(ngrid,'dqsdif','diffusion',
 c     &                       'kg.m-2.s-1',2,zdqsdif(1,1))
-               call wstats(ngridmx,'dqsdust',
+               call wstats(ngrid,'dqsdust',
      &                        'deposited surface dust mass',
      &                        'kg.m-2.s-1',2,dqdustsurf)
-               call wstats(ngridmx,'dqndust',
+               call wstats(ngrid,'dqndust',
      &                        'deposited surface dust number',
      &                        'number.m-2.s-1',2,dndustsurf)
-               call wstats(ngridmx,'reffdust','reffdust',
+               call wstats(ngrid,'reffdust','reffdust',
      &                        'm',3,rdust*ref_r0)
-               call wstats(ngridmx,'dustq','Dust mass mr',
+               call wstats(ngrid,'dustq','Dust mass mr',
      &                        'kg/kg',3,qdust)
-               call wstats(ngridmx,'dustN','Dust number',
+               call wstats(ngrid,'dustN','Dust number',
      &                        'part/kg',3,ndust)
              else
                do iq=1,dustbin
                  write(str2(1:2),'(i2.2)') iq
-                 call wstats(ngridmx,'q'//str2,'mix. ratio',
+                 call wstats(ngrid,'q'//str2,'mix. ratio',
      &                         'kg/kg',3,zq(1,1,iq))
-                 call wstats(ngridmx,'qsurf'//str2,'qsurf',
+                 call wstats(ngrid,'qsurf'//str2,'qsurf',
      &                         'kg.m-2',2,qsurf(1,iq))
                end do
@@ -1812 +1825 @@
 
              if (scavenging) then
-               call wstats(ngridmx,'ccnq','CCN mass mr',
+               call wstats(ngrid,'ccnq','CCN mass mr',
      &                        'kg/kg',3,qccn)
-               call wstats(ngridmx,'ccnN','CCN number',
+               call wstats(ngrid,'ccnN','CCN number',
      &                        'part/kg',3,nccn)
              endif ! (scavenging)
@@ -1895 +1908 @@
         qsurfice(1:ngrid) = qsurf(1:ngrid,igcm_h2o_ice)
         vmr=1.e6 * zq(1:ngrid,1:nlayer,igcm_h2o_ice)
-     .           *mmean(1:ngridmx,1:nlayermx) / mmol(igcm_h2o_ice)
+     .           *mmean(1:ngrid,1:nlayer) / mmol(igcm_h2o_ice)
       ENDIF
       !! Dust quantity integration along the vertical axe
@@ -1901 +1914 @@
       IF (igcm_dust_mass .ne. 0) THEN
       do ig=1,ngrid
-       do l=1,nlayermx
+       do l=1,nlayer
         dustot(ig) = dustot(ig) +
      &               zq(ig,l,igcm_dust_mass)
@@ -1953 +1966 @@
 c        call WRITEDIAGFI(ngrid,"ssurf","Surface stress","N.m-2",2,
 c    &                  zstress)
-c        call WRITEDIAGFI(ngridmx,'sw_htrt','sw heat. rate',
+c        call WRITEDIAGFI(ngrid,'sw_htrt','sw heat. rate',
 c    &                   'w.m-2',3,zdtsw)
-c        call WRITEDIAGFI(ngridmx,'lw_htrt','lw heat. rate',
+c        call WRITEDIAGFI(ngrid,'lw_htrt','lw heat. rate',
 c    &                   'w.m-2',3,zdtlw)
             if (.not.activice) then
-               CALL WRITEDIAGFI(ngridmx,'tauTESap',
+               CALL WRITEDIAGFI(ngrid,'tauTESap',
      &                         'tau abs 825 cm-1',
      &                         '',2,tauTES)
              else
-               CALL WRITEDIAGFI(ngridmx,'tauTES',
+               CALL WRITEDIAGFI(ngrid,'tauTES',
      &                         'tau abs 825 cm-1',
      &                         '',2,taucloudtes)
@@ -1998 +2011 @@
          ! Compute co2 column
          co2col(:)=0
-         do l=1,nlayermx
+         do l=1,nlayer
            do ig=1,ngrid
              co2col(ig)=co2col(ig)+
@@ -2016 +2029 @@
 #ifdef MESOINI
             !!!! waterice = q01, voir readmeteo.F90
-            call WRITEDIAGFI(ngridmx,'q01',noms(igcm_h2o_ice),
+            call WRITEDIAGFI(ngrid,'q01',noms(igcm_h2o_ice),
      &                      'kg/kg',3,
-     &                       zq(1:ngridmx,1:nlayermx,igcm_h2o_ice))
+     &                       zq(1:ngrid,1:nlayer,igcm_h2o_ice))
             !!!! watervapor = q02, voir readmeteo.F90
-            call WRITEDIAGFI(ngridmx,'q02',noms(igcm_h2o_vap),
+            call WRITEDIAGFI(ngrid,'q02',noms(igcm_h2o_vap),
      &                      'kg/kg',3,
-     &                       zq(1:ngridmx,1:nlayermx,igcm_h2o_vap))
+     &                       zq(1:ngrid,1:nlayer,igcm_h2o_vap))
             !!!! surface waterice qsurf02 (voir readmeteo)
-            call WRITEDIAGFI(ngridmx,'qsurf02','surface tracer',
+            call WRITEDIAGFI(ngrid,'qsurf02','surface tracer',
      &                      'kg.m-2',2,
-     &                       qsurf(1:ngridmx,igcm_h2o_ice))
+     &                       qsurf(1:ngrid,igcm_h2o_ice))
 #endif
 
-            CALL WRITEDIAGFI(ngridmx,'mtot',
+            CALL WRITEDIAGFI(ngrid,'mtot',
      &                       'total mass of water vapor',
      &                       'kg/m2',2,mtot)
-            CALL WRITEDIAGFI(ngridmx,'icetot',
+            CALL WRITEDIAGFI(ngrid,'icetot',
      &                       'total mass of water ice',
      &                       'kg/m2',2,icetot)
-            vmr=zq(1:ngridmx,1:nlayermx,igcm_h2o_ice)
-     &      *mmean(1:ngridmx,1:nlayermx)/mmol(igcm_h2o_ice)
-            call WRITEDIAGFI(ngridmx,'vmr_h2oice','h2o ice vmr',
+            vmr=zq(1:ngrid,1:nlayer,igcm_h2o_ice)
+     &      *mmean(1:ngrid,1:nlayer)/mmol(igcm_h2o_ice)
+            call WRITEDIAGFI(ngrid,'vmr_h2oice','h2o ice vmr',
      &                       'mol/mol',3,vmr)
-            vmr=zq(1:ngridmx,1:nlayermx,igcm_h2o_vap)
-     &      *mmean(1:ngridmx,1:nlayermx)/mmol(igcm_h2o_vap)
-            call WRITEDIAGFI(ngridmx,'vmr_h2ovap','h2o vap vmr',
+            vmr=zq(1:ngrid,1:nlayer,igcm_h2o_vap)
+     &      *mmean(1:ngrid,1:nlayer)/mmol(igcm_h2o_vap)
+            call WRITEDIAGFI(ngrid,'vmr_h2ovap','h2o vap vmr',
      &                       'mol/mol',3,vmr)
-            CALL WRITEDIAGFI(ngridmx,'reffice',
+            CALL WRITEDIAGFI(ngrid,'reffice',
      &                       'Mean reff',
      &                       'm',2,rave)
@@ -2052 +2065 @@
      &                    "mass condensation nuclei","kg/m2",
      &                    2,Mccntot)
-            call WRITEDIAGFI(ngridmx,'rice','Ice particle size',
+            call WRITEDIAGFI(ngrid,'rice','Ice particle size',
      &                       'm',3,rice)
-            call WRITEDIAGFI(ngridmx,'h2o_ice_s',
+            call WRITEDIAGFI(ngrid,'h2o_ice_s',
      &                       'surface h2o_ice',
      &                       'kg.m-2',2,qsurf(1,igcm_h2o_ice))
-            CALL WRITEDIAGFI(ngridmx,'albedo',
+            CALL WRITEDIAGFI(ngrid,'albedo',
      &                         'albedo',
      &                         '',2,albedo(1,1))
               if (tifeedback) then
-                 call WRITEDIAGSOIL(ngridmx,"soiltemp",
+                 call WRITEDIAGSOIL(ngrid,"soiltemp",
      &                              "Soil temperature","K",
      &                              3,tsoil)
-                 call WRITEDIAGSOIL(ngridmx,'soilti',
+                 call WRITEDIAGSOIL(ngrid,'soilti',
      &                       'Soil Thermal Inertia',
      &                       'J.s-1/2.m-2.K-1',3,inertiesoil)
@@ -2074 +2087 @@
              iq=nq
 c            write(str2(1:2),'(i2.2)') iq
-c            call WRITEDIAGFI(ngridmx,'dqs'//str2,'dqscloud',
+c            call WRITEDIAGFI(ngrid,'dqs'//str2,'dqscloud',
 c    &                       'kg.m-2',2,zdqscloud(1,iq))
-c            call WRITEDIAGFI(ngridmx,'dqch'//str2,'var chim',
+c            call WRITEDIAGFI(ngrid,'dqch'//str2,'var chim',
 c    &                       'kg/kg',3,zdqchim(1,1,iq))
-c            call WRITEDIAGFI(ngridmx,'dqd'//str2,'var dif',
+c            call WRITEDIAGFI(ngrid,'dqd'//str2,'var dif',
 c    &                       'kg/kg',3,zdqdif(1,1,iq))
-c            call WRITEDIAGFI(ngridmx,'dqa'//str2,'var adj',
+c            call WRITEDIAGFI(ngrid,'dqa'//str2,'var adj',
 c    &                       'kg/kg',3,zdqadj(1,1,iq))
-c            call WRITEDIAGFI(ngridmx,'dqc'//str2,'var c',
+c            call WRITEDIAGFI(ngrid,'dqc'//str2,'var c',
 c    &                       'kg/kg',3,zdqc(1,1,iq))
            endif  !(water.and..not.photochem)
@@ -2091 +2104 @@
 c        ----------------------------------------------------------
 
-        call WRITEDIAGFI(ngridmx,'tauref',
+        call WRITEDIAGFI(ngrid,'tauref',
      &                    'Dust ref opt depth','NU',2,tauref)
 
          if (tracer.and.(dustbin.ne.0)) then
-          call WRITEDIAGFI(ngridmx,'tau','taudust','SI',2,tau(1,1))
+          call WRITEDIAGFI(ngrid,'tau','taudust','SI',2,tau(1,1))
            if (doubleq) then
-c            call WRITEDIAGFI(ngridmx,'qsurf','qsurf',
+c            call WRITEDIAGFI(ngrid,'qsurf','qsurf',
 c     &                       'kg.m-2',2,qsurf(1,igcm_dust_mass))
-c            call WRITEDIAGFI(ngridmx,'Nsurf','N particles',
+c            call WRITEDIAGFI(ngrid,'Nsurf','N particles',
 c     &                       'N.m-2',2,qsurf(1,igcm_dust_number))
-c            call WRITEDIAGFI(ngridmx,'dqsdev','ddevil lift',
+c            call WRITEDIAGFI(ngrid,'dqsdev','ddevil lift',
 c    &                       'kg.m-2.s-1',2,zdqsdev(1,1))
-c            call WRITEDIAGFI(ngridmx,'dqssed','sedimentation',
+c            call WRITEDIAGFI(ngrid,'dqssed','sedimentation',
 c     &                       'kg.m-2.s-1',2,zdqssed(1,1))
-c            call WRITEDIAGFI(ngridmx,'dqsdif','diffusion',
+c            call WRITEDIAGFI(ngrid,'dqsdif','diffusion',
 c     &                       'kg.m-2.s-1',2,zdqsdif(1,1))
-             call WRITEDIAGFI(ngridmx,'dqsdust',
+             call WRITEDIAGFI(ngrid,'dqsdust',
      &                        'deposited surface dust mass',
      &                        'kg.m-2.s-1',2,dqdustsurf)
-             call WRITEDIAGFI(ngridmx,'dqndust',
+             call WRITEDIAGFI(ngrid,'dqndust',
      &                        'deposited surface dust number',
      &                        'number.m-2.s-1',2,dndustsurf)
-             call WRITEDIAGFI(ngridmx,'reffdust','reffdust',
+             call WRITEDIAGFI(ngrid,'reffdust','reffdust',
      &                        'm',3,rdust*ref_r0)
-             call WRITEDIAGFI(ngridmx,'dustq','Dust mass mr',
+             call WRITEDIAGFI(ngrid,'dustq','Dust mass mr',
      &                        'kg/kg',3,qdust)
-             call WRITEDIAGFI(ngridmx,'dustN','Dust number',
+             call WRITEDIAGFI(ngrid,'dustN','Dust number',
      &                        'part/kg',3,ndust)
 #ifdef MESOINI
 !     !!! to initialize mesoscale we need scaled variables
 !     !!! because this must correspond to starting point for tracers
-!             call WRITEDIAGFI(ngridmx,'dustq','Dust mass mr',
-!     &           'kg/kg',3,pq(1:ngridmx,1:nlayermx,igcm_dust_mass))
-!             call WRITEDIAGFI(ngridmx,'dustN','Dust number',
-!     &           'part/kg',3,pq(1:ngridmx,1:nlayermx,igcm_dust_number))
-!             call WRITEDIAGFI(ngridmx,'ccn','Nuclei mass mr',
-!     &           'kg/kg',3,pq(1:ngridmx,1:nlayermx,igcm_ccn_mass))
-!             call WRITEDIAGFI(ngridmx,'ccnN','Nuclei number',
-!     &           'part/kg',3,pq(1:ngridmx,1:nlayermx,igcm_ccn_number))
-              call WRITEDIAGFI(ngridmx,'dustq','Dust mass mr',
+!             call WRITEDIAGFI(ngrid,'dustq','Dust mass mr',
+!     &           'kg/kg',3,pq(1:ngrid,1:nlayer,igcm_dust_mass))
+!             call WRITEDIAGFI(ngrid,'dustN','Dust number',
+!     &           'part/kg',3,pq(1:ngrid,1:nlayer,igcm_dust_number))
+!             call WRITEDIAGFI(ngrid,'ccn','Nuclei mass mr',
+!     &           'kg/kg',3,pq(1:ngrid,1:nlayer,igcm_ccn_mass))
+!             call WRITEDIAGFI(ngrid,'ccnN','Nuclei number',
+!     &           'part/kg',3,pq(1:ngrid,1:nlayer,igcm_ccn_number))
+              call WRITEDIAGFI(ngrid,'dustq','Dust mass mr',
      &                        'kg/kg',3,pq(1,1,igcm_dust_mass))
-              call WRITEDIAGFI(ngridmx,'dustN','Dust number',
+              call WRITEDIAGFI(ngrid,'dustN','Dust number',
      &                        'part/kg',3,pq(1,1,igcm_dust_number))
-              call WRITEDIAGFI(ngridmx,'ccn','Nuclei mass mr',
+              call WRITEDIAGFI(ngrid,'ccn','Nuclei mass mr',
      &                        'kg/kg',3,pq(1,1,igcm_ccn_mass))
-              call WRITEDIAGFI(ngridmx,'ccnN','Nuclei number',
+              call WRITEDIAGFI(ngrid,'ccnN','Nuclei number',
      &                        'part/kg',3,pq(1,1,igcm_ccn_number))
 #endif
@@ -2142 +2155 @@
              do iq=1,dustbin
                write(str2(1:2),'(i2.2)') iq
-               call WRITEDIAGFI(ngridmx,'q'//str2,'mix. ratio',
+               call WRITEDIAGFI(ngrid,'q'//str2,'mix. ratio',
      &                         'kg/kg',3,zq(1,1,iq))
-               call WRITEDIAGFI(ngridmx,'qsurf'//str2,'qsurf',
+               call WRITEDIAGFI(ngrid,'qsurf'//str2,'qsurf',
      &                         'kg.m-2',2,qsurf(1,iq))
              end do
@@ -2150 +2163 @@
 
            if (scavenging) then
-             call WRITEDIAGFI(ngridmx,'ccnq','CCN mass mr',
+             call WRITEDIAGFI(ngrid,'ccnq','CCN mass mr',
      &                        'kg/kg',3,qccn)
-             call WRITEDIAGFI(ngridmx,'ccnN','CCN number',
+             call WRITEDIAGFI(ngrid,'ccnN','CCN number',
      &                        'part/kg',3,nccn)
            endif ! (scavenging)
 
 c          if (submicron) then
-c            call WRITEDIAGFI(ngridmx,'dustsubm','subm mass mr',
+c            call WRITEDIAGFI(ngrid,'dustsubm','subm mass mr',
 c    &                        'kg/kg',3,pq(1,1,igcm_dust_submicron))
 c          endif ! (submicron)
@@ -2169 +2182 @@
          if(callthermos) then 
 
-            call WRITEDIAGFI(ngridmx,"q15um","15 um cooling","K/s",
+            call WRITEDIAGFI(ngrid,"q15um","15 um cooling","K/s",
      $           3,zdtnlte)
-            call WRITEDIAGFI(ngridmx,"quv","UV heating","K/s",
+            call WRITEDIAGFI(ngrid,"quv","UV heating","K/s",
      $           3,zdteuv)
-            call WRITEDIAGFI(ngridmx,"cond","Thermal conduction","K/s",
+            call WRITEDIAGFI(ngrid,"cond","Thermal conduction","K/s",
      $           3,zdtconduc)
-            call WRITEDIAGFI(ngridmx,"qnir","NIR heating","K/s",
+            call WRITEDIAGFI(ngrid,"qnir","NIR heating","K/s",
      $           3,zdtnirco2)
 
@@ -2208 +2221 @@
 !        endif
 
-        call WRITEDIAGFI(ngridmx,'zmax_th',
+        call WRITEDIAGFI(ngrid,'zmax_th',
      &              'hauteur du thermique','m',
      &                         2,zmax_th)
-        call WRITEDIAGFI(ngridmx,'hfmax_th',
+        call WRITEDIAGFI(ngrid,'hfmax_th',
      &              'maximum TH heat flux','K.m/s',
      &                         2,hfmax_th)
-        call WRITEDIAGFI(ngridmx,'wstar',
+        call WRITEDIAGFI(ngrid,'wstar',
      &              'maximum TH vertical velocity','m/s',
      &                         2,wstar)
@@ -2265 +2278 @@
          if(calltherm) then
 
-        call WRITEDIAGFI(ngridmx,'lmax_th',
+        call WRITEDIAGFI(ngrid,'lmax_th',
      &              'hauteur du thermique','point',
      &                         0,lmax_th_out)
-        call WRITEDIAGFI(ngridmx,'zmax_th',
+        call WRITEDIAGFI(ngrid,'zmax_th',
      &              'hauteur du thermique','m',
      &                         0,zmax_th)
-        call WRITEDIAGFI(ngridmx,'hfmax_th',
+        call WRITEDIAGFI(ngrid,'hfmax_th',
      &              'maximum TH heat flux','K.m/s',
      &                         0,hfmax_th)
-        call WRITEDIAGFI(ngridmx,'wstar',
+        call WRITEDIAGFI(ngrid,'wstar',
      &              'maximum TH vertical velocity','m/s',
      &                         0,wstar)
@@ -2280 +2293 @@
          co2col(:)=0.
          if (tracer) then
-         do l=1,nlayermx
+         do l=1,nlayer
            do ig=1,ngrid
              co2col(ig)=co2col(ig)+
@@ -2305 +2318 @@
 !         call WRITEDIAGFI(ngrid,"dtrad","rad. heat. rate",              &
 !     &              "K.s-1",1,dtrad/zpopsk)
-!        call WRITEDIAGFI(ngridmx,'sw_htrt','sw heat. rate',
+!        call WRITEDIAGFI(ngrid,'sw_htrt','sw heat. rate',
 !     &                   'w.m-2',1,zdtsw/zpopsk)
-!        call WRITEDIAGFI(ngridmx,'lw_htrt','lw heat. rate',
+!        call WRITEDIAGFI(ngrid,'lw_htrt','lw heat. rate',
 !     &                   'w.m-2',1,zdtlw/zpopsk)
          call WRITEDIAGFI(ngrid,"co2ice","co2 ice thickness"
@@ -2313 +2326 @@
 
 ! or output in diagfi.nc (for testphys1d)
-         call WRITEDIAGFI(ngridmx,'ps','Surface pressure','Pa',0,ps)
-         call WRITEDIAGFI(ngridmx,'temp','Temperature',
+         call WRITEDIAGFI(ngrid,'ps','Surface pressure','Pa',0,ps)
+         call WRITEDIAGFI(ngrid,'temp','Temperature',
      &                       'K',1,zt)
      
@@ -2321 +2334 @@
             do iq=1,nq
 c              CALL writeg1d(ngrid,nlayer,zq(1,1,iq),noms(iq),'kg/kg') 
-               call WRITEDIAGFI(ngridmx,trim(noms(iq)),
+               call WRITEDIAGFI(ngrid,trim(noms(iq)),
      &              trim(noms(iq)),'kg/kg',1,zq(1,1,iq))
             end do
            if (doubleq) then
-             call WRITEDIAGFI(ngridmx,'rdust','rdust',
+             call WRITEDIAGFI(ngrid,'rdust','rdust',
      &                        'm',1,rdust)
            endif
            if (water.AND.tifeedback) then
-             call WRITEDIAGFI(ngridmx,"soiltemp",
+             call WRITEDIAGFI(ngrid,"soiltemp",
      &                              "Soil temperature","K",
      &                              1,tsoil)
-             call WRITEDIAGFI(ngridmx,'soilti',
+             call WRITEDIAGFI(ngrid,'soilti',
      &                       'Soil Thermal Inertia',
      &                       'J.s-1/2.m-2.K-1',1,inertiesoil)
@@ -2345 +2358 @@
 
              tauTES=0
-             do l=1,nlayermx
+             do l=1,nlayer
                Qabsice = min(
      &             max(0.4e6*rice(1,l)*(1.+nuice_ref)-0.05 ,0.),1.2
@@ -2355 +2368 @@
                tauTES=tauTES+ opTES(1,l)
              enddo
-             CALL WRITEDIAGFI(ngridmx,'tauTESap',
+             CALL WRITEDIAGFI(ngrid,'tauTESap',
      &                         'tau abs 825 cm-1',
      &                         '',0,tauTES)
            else
 
-             CALL WRITEDIAGFI(ngridmx,'tauTES',
+             CALL WRITEDIAGFI(ngrid,'tauTES',
      &                         'tau abs 825 cm-1',
      &                         '',0,taucloudtes)
@@ -2377 +2390 @@
            h2otot = h2otot+mtot+icetot
 
-             CALL WRITEDIAGFI(ngridmx,'h2otot',
+             CALL WRITEDIAGFI(ngrid,'h2otot',
      &                         'h2otot',
      &                         'kg/m2',0,h2otot)
-             CALL WRITEDIAGFI(ngridmx,'mtot',
+             CALL WRITEDIAGFI(ngrid,'mtot',
      &                         'mtot',
      &                         'kg/m2',0,mtot)
-             CALL WRITEDIAGFI(ngridmx,'icetot',
+             CALL WRITEDIAGFI(ngrid,'icetot',
      &                         'icetot',
      &                         'kg/m2',0,icetot)
@@ -2401 +2414 @@
 
               Nccntot= 0
-              call watersat(ngridmx*nlayermx,zt,zplay,zqsat)
-               do l=1,nlayermx
+              call watersat(ngrid*nlayer,zt,zplay,zqsat)
+               do l=1,nlayer
                    Nccntot = Nccntot + 
      &              zq(1,l,igcm_ccn_number)*tauscaling(1)
@@ -2413 +2426 @@
                call WRITEDIAGFI(ngrid,"satu","vap in satu","kg/kg",1,
      &                    satu)
-               CALL WRITEDIAGFI(ngridmx,'Nccntot',
+               CALL WRITEDIAGFI(ngrid,'Nccntot',
      &                         'Nccntot',
      &                         'nbr/m2',0,Nccntot)
 
-             call WRITEDIAGFI(ngridmx,'zdqsed_dustq'
+             call WRITEDIAGFI(ngrid,'zdqsed_dustq'
      & ,'sedimentation q','kg.m-2.s-1',1,zdqsed(1,:,igcm_dust_mass))
-             call WRITEDIAGFI(ngridmx,'zdqsed_dustN'
+             call WRITEDIAGFI(ngrid,'zdqsed_dustN'
      &,'sedimentation N','Nbr.m-2.s-1',1,
      &                                 zdqsed(1,:,igcm_dust_number))
@@ -2436 +2449 @@
            endif ! of if (scavenging)
 
-           CALL WRITEDIAGFI(ngridmx,'reffice',
+           CALL WRITEDIAGFI(ngrid,'reffice',
      &                      'reffice',
      &                      'm',0,rave)
 
            do iq=1,nq
-             call WRITEDIAGFI(ngridmx,trim(noms(iq))//'_s',
+             call WRITEDIAGFI(ngrid,trim(noms(iq))//'_s',
      &            trim(noms(iq))//'_s','kg/kg',0,qsurf(1,iq))
            end do
      
-        call WRITEDIAGFI(ngridmx,'zdqcloud_ice','cloud ice',
+        call WRITEDIAGFI(ngrid,'zdqcloud_ice','cloud ice',
      &            'kg.m-2.s-1',1,zdqcloud(1,:,igcm_h2o_ice))
-        call WRITEDIAGFI(ngridmx,'zdqcloud_vap','cloud vap',
+        call WRITEDIAGFI(ngrid,'zdqcloud_vap','cloud vap',
      &            'kg.m-2.s-1',1,zdqcloud(1,:,igcm_h2o_vap))
-        call WRITEDIAGFI(ngridmx,'zdqcloud','cloud ice',
+        call WRITEDIAGFI(ngrid,'zdqcloud','cloud ice',
      &            'kg.m-2.s-1',1,zdqcloud(1,:,igcm_h2o_ice)
      &                          +zdqcloud(1,:,igcm_h2o_vap))

trunk/LMDZ.MARS/libf/phymars/read_dust_scenario.F90

@@ -4 +4 @@
 
 use netcdf
+use comgeomfi_h, only: lati, long
 implicit none
 
 #include "dimensions.h"
 #include "dimphys.h"
-#include "comgeomfi.h"
+!#include "comgeomfi.h"
 #include "datafile.h"
 #include "callkeys.h"

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))

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

@@ -3 +3 @@
      &          timestep,tsurf,tsoil,
      &          capcal,fluxgrd)
+      use comsoil_h, only: layer, mlayer, volcapa
+      use surfdat_h, only: watercaptag, inert_h2o_ice
       implicit none
 
@@ -11 +13 @@
 !  
 !  Note: depths of layers and mid-layers, soil thermal inertia and 
-!        heat capacity are commons in comsoil.h
+!        heat capacity are commons in comsoil_h
 !-----------------------------------------------------------------------
 
@@ -17 +19 @@
 #include "dimphys.h"
 
-#include"comsoil.h"
+!#include"comsoil.h"
 
-#include"surfdat.h"
+!#include"surfdat.h"
 #include"callkeys.h"
 
@@ -38 +40 @@
 
 ! local saved variables:
-!      real,save :: layer(ngridmx,nsoilmx)      ! layer depth
-      real,save :: mthermdiff(ngridmx,0:nsoilmx-1) ! mid-layer thermal diffusivity
-      real,save :: thermdiff(ngridmx,nsoilmx-1) ! inter-layer thermal diffusivity
-      real,save :: coefq(0:nsoilmx-1)           ! q_{k+1/2} coefficients
-      real,save :: coefd(ngridmx,nsoilmx-1)     ! d_k coefficients
-      real,save :: alph(ngridmx,nsoilmx-1)      ! alpha_k coefficients
-      real,save :: beta(ngridmx,nsoilmx-1)      ! beta_k coefficients
+      real,save,allocatable :: mthermdiff(:,:)  ! mid-layer thermal diffusivity
+      real,save,allocatable :: thermdiff(:,:)   ! inter-layer thermal diffusivity
+      real,save,allocatable :: coefq(:)         ! q_{k+1/2} coefficients
+      real,save,allocatable :: coefd(:,:)       ! d_k coefficients
+      real,save,allocatable :: alph(:,:)        ! alpha_k coefficients
+      real,save,allocatable :: beta(:,:)        ! beta_k coefficients
       real,save :: mu
       
@@ -51 +52 @@
 
 ! 0. Initialisations and preprocessing step
+      if (firstcall) then
+        ! allocate local saved arrays:
+        allocate(mthermdiff(ngrid,0:nsoil-1))
+        allocate(thermdiff(ngrid,nsoil-1))
+        allocate(coefq(0:nsoil-1))
+        allocate(coefd(ngrid,nsoil-1))
+        allocate(alph(ngrid,nsoil-1))
+        allocate(beta(ngrid,nsoil-1))
+      endif
+      
       if (firstcall.or.tifeedback) then
       ! note: firstcall is set to .true. or .false. by the caller

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

@@ -2 +2 @@
 
       use netcdf
+      use comsoil_h, only: layer, mlayer, inertiedat, volcapa
       implicit none
 
@@ -31 +32 @@
 !======================================================================
 
-#include "dimensions.h"
-#include "dimphys.h"
-
-#include "comsoil.h"
-!#include "netcdf.inc"
 !======================================================================
 !  arguments
 !  ---------
 !  inputs:
-      integer nid       ! Input Netcdf file ID 
-      integer ngrid     ! # of horizontal grid points
-      integer nsoil     ! # of soil layers
-      real tsurf(ngrid) ! surface temperature
-      integer indextime ! position on time axis
+      integer,intent(in) :: nid ! Input Netcdf file ID 
+      integer,intent(in) :: ngrid       ! # of horizontal grid points
+      integer,intent(in) :: nsoil       ! # of soil layers
+      real,intent(in) :: tsurf(ngrid)   ! surface temperature
+      integer,intent(in) :: indextime   ! position on time axis
 !  output:
-      real tsoil(ngridmx,nsoilmx)       ! soil temperature
+      real,intent(out) :: tsoil(ngrid,nsoil)    ! soil temperature
 
 !======================================================================
@@ -184 +180 @@
       enddo
 
-! 2. Volumetric heat capacity (note: it is declared in comsoil.h)
+! 2. Volumetric heat capacity (note: it is declared in comsoil_h)
 ! ---------------------------
 ! "volcapa" is (so far) 0D and written in "controle" table of startfi file 
@@ -217 +213 @@
 !      endif
 
-! 3. Thermal inertia (note: it is declared in comsoil.h)
+! 3. Thermal inertia (note: it is declared in comsoil_h)
 ! ------------------
 
@@ -306 +302 @@
         corner(2)=1
         corner(3)=indextime
-        edges(1)=ngridmx
-        edges(2)=nsoilmx
+        edges(1)=ngrid
+        edges(2)=nsoil
         edges(3)=1
         !ierr=nf90_get_var(nid,nvarid,tsoil,corner,edges)

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

@@ -2 +2 @@
 
       use tracer_mod, only: nqmx, igcm_h2o_ice, rho_ice
+      use comsoil_h, only: layer, inertiedat
+      use surfdat_h, only: watercaptag, inert_h2o_ice
       IMPLICIT NONE
 
@@ -12 +14 @@
 c   - One layer of surface water ice (the thickness is given
 c     by the variable icecover (in kg of ice per m2) and the thermal
-c     inertia is prescribed by inert_h2o_ice (see surfdat.h and inifis)); 
+c     inertia is prescribed by inert_h2o_ice (see surfdat_h and inifis)); 
 c   - A transitional layer of mixed thermal inertia;
 c   - A last layer of regolith below the ice cover whose thermal inertia
@@ -25 +27 @@
 #include "dimensions.h"
 #include "dimphys.h"
-#include "comsoil.h"
+!#include "comsoil.h"
 !#include "tracer.h"
-#include "surfdat.h"
+!#include "surfdat.h"
 
 c Local variables

trunk/LMDZ.MARS/libf/phymars/suaer.F90

@@ -1 +1 @@
 SUBROUTINE suaer
+use dimradmars_mod, only: longrefvis, longrefir, nsizemax, long1vis, &
+                         long2vis, long3vis, long1ir, long2ir, long1co2, &
+                         long2co2, nsun, nir
+use yomaer_h, only: radiustab, gvis, omegavis, QVISsQREF, gIR, omegaIR, &
+                    QIRsQREF, QREFvis, QREFir, omegaREFvis, omegaREFir, &
+                    nsize
 IMPLICIT NONE
 !==================================================================
@@ -34 +40 @@
 #include "callkeys.h"
 #include "datafile.h"
-#include "dimensions.h"
-#include "dimphys.h"
-#include "dimradmars.h"     
-#include "yomaer.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
+!#include "dimradmars.h"     
+!#include "yomaer.h"
+! naerkind is set in scatterers.h (built when compiling with makegcm -s #)
+#include"scatterers.h"
 #include "aerkind.h"
 
@@ -350 +358 @@
    write(*,*) "       nsizemax=",nsizemax
    write(*,*) "       you must increase the value of nsizemax"
-   write(*,*) "       in dimradmars.h !"
+   write(*,*) "       in dimradmars_mod !"
    stop
  endif
@@ -362 +370 @@
 !   and not epref, which is a different parameter);
 !   Reference wavelengths are defined for each aerosol in
-!   dimradmars.h.
+!   dimradmars_mod.
 
   CALL aerave ( nwvl,&
@@ -420 +428 @@
 !   and not epref, which is a different parameter);
 !   Reference wavelengths are defined for each aerosol in
-!   dimradmars.h.
+!   dimradmar_mod.
 
   CALL aerave ( nwvl,&
@@ -448 +456 @@
 !         Single scattering properties
 !           in each of the "nir" bands
-!           (cf. dimradmars.h)
+!           (cf. dimradmars_mod)
 
 ! iir=1 : central 15um CO2 bands   

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

@@ -4 +4 @@
       use netcdf
       use tracer_mod, only: nqmx, noms, dryness
+      use comgeomfi_h, only: long, lati
+      use surfdat_h, only: watercaptag, frost_albedo_threshold,
+     &                     albedo_h2o_ice, inert_h2o_ice, albedodat,
+     &                     albedice
       IMPLICIT NONE
 c=======================================================================
@@ -14 +18 @@
 c   -------------
 #include "dimensions.h"
-#include "dimphys.h"
-#include "surfdat.h"
+!#include "dimphys.h"
+!#include "surfdat.h"
 #include "callkeys.h"
 !#include "tracer.h"
-#include "comgeomfi.h"
+!#include "comgeomfi.h"
 #include "comcstfi.h"
 
@@ -84 +88 @@
          alternate = 0
          
-         if (ngridmx .ne. 1) then
+         if (ngrid .ne. 1) then
            watercaptag(:) = .false.
            longwatercaptag(:) = .false.
@@ -98 +102 @@
 #ifdef MESOSCALE
 
-      do ig=1,ngridmx
+      do ig=1,ngrid
 
          !write(*,*) "all qsurf to zero. dirty."
@@ -123 +127 @@
 
 
-      IF (ngridmx .eq. 1) THEN ! special case for 1d --> do nothing
-      
-         print*, 'ngridmx = 1, do no put ice caps in surfini.F'
+      IF (ngrid .eq. 1) THEN ! special case for 1d --> do nothing
+      
+         print*, 'ngrid = 1, do no put ice caps in surfini.F'
 
       ELSE IF (icelocationmode .eq. 1) THEN
@@ -187 +191 @@
       !print*,'jjm,iim',jjm,iim ! jjm =  nb lati , iim = nb longi
 
-      ! loop over the GCM grid - except for poles (ig=1 and ngridmx)
-      do ig=2,ngridmx-1
+      ! loop over the GCM grid - except for poles (ig=1 and ngrid)
+      do ig=2,ngrid-1
       
         ! loop over the surface file grid      
@@ -212 +216 @@
      &     lonice(1+mod(ig-2,iim),:) + nb_ice(ig,:) ! lonice is USELESS ...
 
-      enddo ! of do ig=2,ngridmx-1
+      enddo ! of do ig=2,ngrid-1
      
 
@@ -220 +224 @@
       latice(1,:)   = nb_ice(1,:)
       lonice(1,:)   = nb_ice(1,:)
-      latice(jjm,:) = nb_ice(ngridmx,:)
-      lonice(iim,:) = nb_ice(ngridmx,:)
+      latice(jjm,:) = nb_ice(ngrid,:)
+      lonice(iim,:) = nb_ice(ngrid,:)
       
      
@@ -319 +323 @@
 
             
-        else if (ngridmx .ne. 1) then
+        else if (ngrid .ne. 1) then
         
       print*,'No predefined ice location for this resolution :',iim,jjm
@@ -328 +332 @@
         endif
 
-        do ig=1,ngridmx
+        do ig=1,ngrid
           if (longwatercaptag(ig)) watercaptag(ig) = .true.
         enddo
@@ -337 +341 @@
         print*,'Surfini: ice caps defined by lat and lon values'
 
-         do ig=1,ngridmx
+         do ig=1,ngrid
          
 c-------- Towards olympia planitia water caps -----------
@@ -392 +396 @@
 c--------------------------------------------------------
 c--------------------------------------------------------
-      end do ! of (ngridmx)
+      end do ! of (ngrid)
 
 
@@ -406 +410 @@
         ! print caps locations - useful for plots too 
         print*,'latitude | longitude | ig'
-        do ig=1,ngridmx
+        do ig=1,ngrid
           dryness (ig) = icedryness
 

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

@@ -5 +5 @@
      &                QVISsQREF3d,omegaVIS3d,gVIS3d)
 
+      use dimradmars_mod, only: ndlo2, ndlon, nflev, nsun
+      use yomlw_h, only: nlaylte, gcp
       IMPLICIT NONE
       
-#include "dimensions.h"
-#include "dimphys.h"
-#include "dimradmars.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
+!#include "dimradmars.h"
 
-#include "yomaer.h"
-#include "yomlw.h"
+!#include "yomaer.h"
+!#include "yomlw.h"
+! naerkind is set in scatterers.h (built when compiling with makegcm -s #)
+#include"scatterers.h"
 #include "callkeys.h"
 c     
@@ -42 +46 @@
 c   aerosol               aerosol extinction optical depth
 c                         at reference wavelength "longrefvis" set
-c                         in dimradmars.h , in each layer, for one of
+c                         in dimradmars_mod , in each layer, for one of
 c                         the "naerkind" kind of aerosol optical properties.
 c    Pfract :        day fraction of the time interval
@@ -134 +138 @@
 C------------------------------------------------------------------
 c  2 spectral interval in solar spectrum :
-c  - INU=1: between wavelength "long1vis" and "long2vis" set in dimradmars.h
-c  - INU=2: between wavelength "long2vis" and "long3vis" set in dimradmars.h
+c  - INU=1: between wavelength "long1vis" and "long2vis" set in dimradmars_mod
+c  - INU=2: between wavelength "long2vis" and "long3vis" set in dimradmars_mod
 
       DO INU = 1,2

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

@@ -4 +4 @@
      S     ,  PFD,PFU )
 
+      use dimradmars_mod, only: sunfr, ndlo2, nsun, ndlon, nflev
+      use yomlw_h, only: nlaylte
       IMPLICIT NONE
 C     
-#include "dimensions.h"
-#include "dimphys.h"
-#include "dimradmars.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
+!#include "dimradmars.h"
 #include "callkeys.h"
-
-#include "yomaer.h"
-#include "yomlw.h"
+! naerkind is set in scatterers.h (built when compiling with makegcm -s #)
+#include"scatterers.h"
+!#include "yomaer.h"
+!#include "yomlw.h"
 
 C     
@@ -37 +40 @@
 c   aerosol               aerosol extinction optical depth
 c                         at reference wavelength "longrefvis" set
-c                         in dimradmars.h , in each layer, for one of
+c                         in dimradmars_mod , in each layer, for one of
 c                         the "naerkind" kind of aerosol optical properties.
 c    albedo   hemispheric surface albedo
@@ -378 +381 @@
       SUBROUTINE DEDD (KDLON,PGG,PREF,PRMUZ,PTO1,PW
      S                ,      PRE1,PRE2,PTR1,PTR2         )
+      use dimradmars_mod, only: ndlo2
       implicit none
 C
-#include "dimensions.h"
-#include "dimphys.h"
-#include "dimradmars.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
+!#include "dimradmars.h"
 C
 C**** *DEDD* - DELTA-EDDINGTON IN A CLOUDY LAYER

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

@@ -4 +4 @@
      S     ,  PFD,PFU )
 
+      use dimradmars_mod, only: sunfr, ndlo2, nsun, nflev, ndlon
+      use yomlw_h, only: nlaylte
+      
       IMPLICIT NONE
 C     
-#include "dimensions.h"
-#include "dimphys.h"
-#include "dimradmars.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
+!#include "dimradmars.h"
 #include "callkeys.h"
-
-#include "yomaer.h"
-#include "yomlw.h"
+! naerkind is set in scatterers.h (built when compiling with makegcm -s #)
+#include"scatterers.h"
+!#include "yomaer.h"
+!#include "yomlw.h"
 
 C     
@@ -36 +40 @@
 c   aerosol               aerosol extinction optical depth
 c                         at reference wavelength "longrefvis" set
-c                         in dimradmars.h , in each layer, for one of
+c                         in dimradmars_mod , in each layer, for one of
 c                         the "naerkind" kind of aerosol optical properties.
 c    albedo   hemispheric surface albedo

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

@@ -43 +43 @@
 c
 c=======================================================================
- 
+
+      use comsoil_h, only: volcapa ! soil volumetric heat capacity
+      use surfdat_h, only: z0_default, emissiv, emisice, albedice,
+     &                     iceradius, dtemisice, iceradius
+      use yomaer_h, only: tauvis
       implicit none
  
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 #include "comcstfi.h"
-#include "comgeomfi.h"
+!#include "comgeomfi.h"
 #include "planete.h"
-#include "surfdat.h"
-#include "comsoil.h"
+!#include "surfdat.h"
+!#include "comsoil.h"
 #include "netcdf.inc"
-#include "dimradmars.h"
-#include "yomaer.h"
+!#include "dimradmars.h"
+!#include "yomaer.h"
 
 c-----------------------------------------------------------------------
@@ -165 +169 @@
 c  Initialization of some physical constants
 c informations on physics grid
-      if(ngridmx.ne.tab_cntrl(tab0+1)) then
-         print*,'tabfi: WARNING !!! tab_cntrl(tab0+1).ne.ngridmx'
-         print*,tab_cntrl(tab0+1),ngridmx
-      endif
+!      if(ngridmx.ne.tab_cntrl(tab0+1)) then
+!         print*,'tabfi: WARNING !!! tab_cntrl(tab0+1).ne.ngridmx'
+!         print*,tab_cntrl(tab0+1),ngridmx
+!      endif
       lmax = nint(tab_cntrl(tab0+2))
       day_ini = tab_cntrl(tab0+3)
@@ -225 +229 @@
       write(*,*) 'Reading tab_cntrl when calling tabfi before changes'
       write(*,*) '*****************************************************'
-      write(*,5) '(1)      = ngridmx?',tab_cntrl(tab0+1),real(ngridmx)
+      write(*,5) '(1)      = ngridmx?',tab_cntrl(tab0+1)!,real(ngridmx)
       write(*,5) '(2)            lmax',tab_cntrl(tab0+2),real(lmax)
       write(*,5) '(3)         day_ini',tab_cntrl(tab0+3),real(day_ini)
@@ -491 +495 @@
       write(*,*) 'Reading tab_cntrl when calling tabfi AFTER changes'
       write(*,*) '*****************************************************'
-      write(*,5) '(1)      = ngridmx?',tab_cntrl(tab0+1),real(ngridmx)
+      write(*,5) '(1)      = ngridmx?',tab_cntrl(tab0+1)!,real(ngridmx)
       write(*,5) '(2)            lmax',tab_cntrl(tab0+2),real(lmax)
       write(*,5) '(3)         day_ini',tab_cntrl(tab0+3),real(day_ini)

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

@@ -4 +4 @@
       USE ioipsl_getincom, only: getin
       use infotrac, only: nqtot, tnom
+      use comsoil_h, only: volcapa, layer, mlayer, inertiedat
+      use comgeomfi_h, only: lati, long, area
+      use comdiurn_h, only: sinlat
+      use surfdat_h, only: albedodat, z0_default, emissiv, emisice,
+     &                     albedice, iceradius, dtemisice, z0,
+     &                     zmea, zstd, zsig, zgam, zthe, phisfi,
+     &                     watercaptag
+      use slope_mod, only: theta_sl, psi_sl
+      use yomaer_h, only: tauvis
       IMPLICIT NONE
 
@@ -27 +36 @@
 #include "dimensions.h"
 #include "dimphys.h"
-#include "dimradmars.h"
-#include "comgeomfi.h"
-#include "surfdat.h"
-#include "slope.h"
-#include "comsoil.h"
-#include "comdiurn.h"
+!#include "dimradmars.h"
+!#include "comgeomfi.h"
+!#include "surfdat.h"
+!#include "slope.h"
+!#include "comsoil.h"
+!#include "comdiurn.h"
 #include "callkeys.h"
 #include "comcstfi.h"
 #include "planete.h"
-#include "comsaison.h"
-#include "yomaer.h"
+!#include "comsaison.h"
+!#include "yomaer.h"
 #include "control.h"
 #include "comvert.h"
@@ -91 +100 @@
       Logical  tracerdyn
       integer :: nq=1 ! number of tracers
+      real :: latitude, longitude
 
       character*2 str2
@@ -447 +457 @@
 c  latitude/longitude
 c  ------------------
-      lati(1)=0 ! default value for lati(1)
+      latitude=0 ! default value for latitude
       PRINT *,'latitude (in degrees) ?'
-      call getin("latitude",lati(1))
-      write(*,*) " latitude = ",lati(1)
-      lati(1)=lati(1)*pi/180.E+0
-      long(1)=0.E+0
-      long(1)=long(1)*pi/180.E+0
+      call getin("latitude",latitude)
+      write(*,*) " latitude = ",latitude
+      latitude=latitude*pi/180.E+0
+      longitude=0.E+0
+      longitude=longitude*pi/180.E+0
+
+!  "inifis" does some initializations (some of which have already been
+!  done above!) and loads parameters set in callphys.def
+!  and allocates some arrays 
+!Mars possible matter with dtphys in input and include!!!
+      CALL inifis(1,llm,nq,day0,daysec,dtphys,
+     &            latitude,longitude,1.0,rad,g,r,cpp)
+
 
 c  Initialize albedo / soil thermal inertia
@@ -502 +520 @@
 c   everything is controled by surface pressure
       phisfi(1)=0.E+0
-
-c  "inifis" does some initializations (some of which have already been
-c  done above!) and loads parameters set in callphys.def
-
-!Mars possible matter with dtphys in input and include!!!
-      CALL inifis(1,llm,nq,day0,daysec,dtphys,
-     .            lati,long,area,rad,g,r,cpp)
 
 c   Initialization to take into account prescribed winds
@@ -629 +640 @@
 c Check if the surface is a water ice reservoir 
 c --------------------------------------------------
-      watercaptag(ngridmx)=.false. ! Default: no water ice reservoir
+      watercaptag(1)=.false. ! Default: no water ice reservoir
       print *,'Water ice cap on ground ?'
       call getin("watercaptag",watercaptag)
@@ -652 +663 @@
 c  It is needed to transfert physics variables to "physiq"...
 
-      call physdem0("startfi.nc",long,lati,nsoilmx,nq,
+      call physdem0("startfi.nc",long,lati,nsoilmx,ngridmx,llm,nq,
      .              dtphys,float(day0),time,area,
      .              albedodat,inertiedat,zmea,zstd,zsig,zgam,zthe)
-      call physdem1("startfi.nc",nsoilmx,nq,
+      call physdem1("startfi.nc",nsoilmx,ngridmx,llm,nq,
      .              dtphys,time,
      .              tsurf,tsoil,co2ice,emis,q2,qsurf)

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

@@ -30 +30 @@
 c    -------------
 c
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 #include "comcstfi.h"
 #include "callkeys.h"
-#include "dimradmars.h"
+!#include "dimradmars.h"
 !#include "tracer.h"
+! naerkind is set in scatterers.h (built when compiling with makegcm -s #)
+#include"scatterers.h"
 #include "aerkind.h"
-#include "yomaer.h"
+!#include "yomaer.h"
 
 c-----------------------------------------------------------------------
@@ -45 +47 @@
       INTEGER ngrid,nlayer
 c     Ice geometric mean radius (m)
-      REAL :: rice(ngridmx,nlayermx)
+      REAL :: rice(ngrid,nlayer)
 c     Estimated effective variance of the size distribution (n.u.)
-      REAL :: nuice(ngridmx,nlayermx)
+      REAL :: nuice(ngrid,nlayer)
 c     Tracer mass mixing ratio (kg/kg)
       REAL pq(ngrid,nlayer,nqmx)
-      REAL rdust(ngridmx,nlayermx) ! Dust geometric mean radius (m)
+      REAL rdust(ngrid,nlayer) ! Dust geometric mean radius (m)
       
       REAL pplay(ngrid,nlayer) ! altitude at the middle of the layers
@@ -60 +62 @@
 
 c     Aerosol effective radius used for radiative transfer (meter)
-      REAL :: reffrad(ngridmx,nlayermx,naerkind)
+      REAL :: reffrad(ngrid,nlayer,naerkind)
 c     Aerosol effective variance used for radiative transfer (n.u.)
-      REAL :: nueffrad(ngridmx,nlayermx,naerkind)
+      REAL :: nueffrad(ngrid,nlayer,naerkind)
 
 c     Local variables:
@@ -79 +81 @@
 c     For microphysics only:      
       REAL Mo,No                       ! Mass and number of ccn
-      REAL rhocloud(ngridmx,nlayermx)  ! Cloud density (kg.m-3)
-      REAL tauscaling(ngridmx)         ! Convertion factor for qccn and Nccn
-
-      LOGICAL firstcall
-      DATA firstcall/.true./
-      SAVE firstcall
+      REAL rhocloud(ngrid,nlayer)  ! Cloud density (kg.m-3)
+      REAL tauscaling(ngrid)         ! Convertion factor for qccn and Nccn
+
+      LOGICAL,SAVE :: firstcall=.true. , firstcall_alloc=.true.
 
       REAL CBRT
       EXTERNAL CBRT
 
-      REAL,SAVE :: nueffdust(ngridmx,nlayermx) ! Dust effective variance
+      REAL,SAVE,ALLOCATABLE :: nueffdust(:,:) ! Dust effective variance
 
 c     Local saved variables:
 c     ---------------------
 
+        if (firstcall_alloc) then
+          !allocate local saved arrays:
+          allocate(nueffdust(ngrid,nlayer))
+          firstcall_alloc=.false.
+        endif
 
 c==================================================================

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

@@ -1 @@
-      SUBROUTINE vdif_kc(dt,g,zlev,zlay,u,v,teta,cd,q2,km,kn,zq)
-
-      use tracer_mod, only: nqmx, noms
+      SUBROUTINE vdif_kc(ngrid,nlay,nq,dt,g,
+     &                   zlev,zlay,u,v,teta,cd,q2,km,kn,zq)
+
+      use tracer_mod, only: noms
       IMPLICIT NONE
 c.......................................................................
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 !#include "tracer.h"
 #include "callkeys.h"
@@ -32 +33 @@
 c.......................................................................
       REAL dt,g
-      REAL zlev(ngridmx,nlayermx+1)
-      REAL zlay(ngridmx,nlayermx)
-      REAL u(ngridmx,nlayermx)
-      REAL v(ngridmx,nlayermx)
-      REAL teta(ngridmx,nlayermx)
-      REAL cd(ngridmx)
-      REAL q2(ngridmx,nlayermx+1)
-      REAL km(ngridmx,nlayermx+1)
-      REAL kn(ngridmx,nlayermx+1)
-      REAL zq(ngridmx,nlayermx,nqmx)
+      REAL zlev(ngrid,nlay+1)
+      REAL zlay(ngrid,nlay)
+      REAL u(ngrid,nlay)
+      REAL v(ngrid,nlay)
+      REAL teta(ngrid,nlay)
+      REAL cd(ngrid)
+      REAL q2(ngrid,nlay+1)
+      REAL km(ngrid,nlay+1)
+      REAL kn(ngrid,nlay+1)
+      REAL zq(ngrid,nlay,nq)
 c.......................................................................
 c
@@ -54 +55 @@
 c
 c.......................................................................
-      INTEGER nlay,nlev,ngrid
-      REAL unsdz(ngridmx,nlayermx)
-      REAL unsdzdec(ngridmx,nlayermx+1)
-      REAL q(ngridmx,nlayermx+1)
+      INTEGER,INTENT(IN) :: nlay,ngrid,nq
+      INTEGER nlev
+      REAL unsdz(ngrid,nlay)
+      REAL unsdzdec(ngrid,nlay+1)
+      REAL q(ngrid,nlay+1)
 c.......................................................................
 c
@@ -67 +69 @@
 c
 c.......................................................................
-      REAL kmpre(ngridmx,nlayermx+1)
+      REAL kmpre(ngrid,nlay+1)
       REAL qcstat
       REAL q2cstat
@@ -75 +77 @@
 c
 c.......................................................................
-      REAL long(ngridmx,nlayermx+1)
+      REAL long(ngrid,nlay+1)
 c.......................................................................
 c
@@ -98 +100 @@
       REAL mcstat
       REAL m2cstat
-      REAL m(ngridmx,nlayermx+1)
-      REAL mpre(ngridmx,nlayermx+1)
-      REAL m2(ngridmx,nlayermx+1)
-      REAL n2(ngridmx,nlayermx+1)
+      REAL m(ngrid,nlay+1)
+      REAL mpre(ngrid,nlay+1)
+      REAL m2(ngrid,nlay+1)
+      REAL n2(ngrid,nlay+1)
 c.......................................................................
 c
@@ -123 +125 @@
       LOGICAL gnsup
       REAL gm
-c      REAL ri(ngridmx,nlayermx+1)
-      REAL sn(ngridmx,nlayermx+1)
-      REAL snq2(ngridmx,nlayermx+1)
-      REAL sm(ngridmx,nlayermx+1)
-      REAL smq2(ngridmx,nlayermx+1)
+c      REAL ri(ngrid,nlay+1)
+      REAL sn(ngrid,nlay+1)
+      REAL snq2(ngrid,nlay+1)
+      REAL sm(ngrid,nlay+1)
+      REAL smq2(ngrid,nlay+1)
 c.......................................................................
 c
@@ -186 +188 @@
       PARAMETER (q2min=1.E-3)
       PARAMETER (q2max=1.E+2)
-      PARAMETER (nlay=nlayermx)
-      PARAMETER (nlev=nlayermx+1)
-      PARAMETER (ngrid=ngridmx)
 c
       PARAMETER (
@@ -219 +218 @@
       save firstcall
       data firstcall/.true./
-      REAL zhc(ngridmx,nlayermx)
+      REAL zhc(ngrid,nlay)
 c.......................................................................
 c  Initialization
@@ -228 +227 @@
         if (tracer) then
 !     Prepare Special treatment if one of the tracers is CO2 gas
-           do iq=1,nqmx
+           do iq=1,nq
              if (noms(iq).eq."co2") then
                 ico2=iq
@@ -246 +245 @@
       endif !of if firstcall
 
+      nlev=nlay+1
+      
 c.......................................................................
 c  Special treatment for co2

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

@@ -13 +13 @@
       use tracer_mod, only: noms, igcm_dust_mass, igcm_dust_number,
      &                      igcm_dust_submicron, igcm_h2o_vap,
-     &                      igcm_h2o_ice, dryness, alpha_lift, nqmx
+     &                      igcm_h2o_ice, dryness, alpha_lift
+      use surfdat_h, only: watercaptag, frost_albedo_threshold
       IMPLICIT NONE
 
@@ -36 +37 @@
 c   -------------
 
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 #include "comcstfi.h"
 #include "callkeys.h"
-#include "surfdat.h"
-#include "comgeomfi.h"
+!#include "surfdat.h"
+!#include "comgeomfi.h"
 !#include "tracer.h"
 #include "microphys.h"
@@ -85 +86 @@
 c   ------
 
-      REAL ust(ngridmx),tst(ngridmx)
+      REAL ust(ngrid),tst(ngrid)
  
       INTEGER ilev,ig,ilay,nlev
 
-      REAL z4st,zdplanck(ngridmx)
-      REAL zkv(ngridmx,nlayermx+1),zkh(ngridmx,nlayermx+1)
-      REAL zkq(ngridmx,nlayermx+1)
-      REAL zcdv(ngridmx),zcdh(ngridmx)
-      REAL zcdv_true(ngridmx),zcdh_true(ngridmx)    ! drag coeff are used by the LES to recompute u* and hfx
-      REAL zu(ngridmx,nlayermx),zv(ngridmx,nlayermx)
-      REAL zh(ngridmx,nlayermx)
-      REAL ztsrf2(ngridmx)
-      REAL z1(ngridmx),z2(ngridmx)
-      REAL za(ngridmx,nlayermx),zb(ngridmx,nlayermx)
-      REAL zb0(ngridmx,nlayermx)
-      REAL zc(ngridmx,nlayermx),zd(ngridmx,nlayermx)
+      REAL z4st,zdplanck(ngrid)
+      REAL zkv(ngrid,nlay+1),zkh(ngrid,nlay+1)
+      REAL zkq(ngrid,nlay+1)
+      REAL zcdv(ngrid),zcdh(ngrid)
+      REAL zcdv_true(ngrid),zcdh_true(ngrid)    ! drag coeff are used by the LES to recompute u* and hfx
+      REAL zu(ngrid,nlay),zv(ngrid,nlay)
+      REAL zh(ngrid,nlay)
+      REAL ztsrf2(ngrid)
+      REAL z1(ngrid),z2(ngrid)
+      REAL za(ngrid,nlay),zb(ngrid,nlay)
+      REAL zb0(ngrid,nlay)
+      REAL zc(ngrid,nlay),zd(ngrid,nlay)
       REAL zcst1
-      REAL zu2(ngridmx)
+      REAL zu2(ngrid)
 
       EXTERNAL SSUM,SCOPY
@@ -111 +112 @@
 c     variable added for CO2 condensation:
 c     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
-      REAL hh , zhcond(ngridmx,nlayermx)
-      REAL latcond,tcond1mb
-      REAL acond,bcond
-      SAVE acond,bcond
-      DATA latcond,tcond1mb/5.9e5,136.27/
+      REAL hh , zhcond(ngrid,nlay)
+      REAL,PARAMETER :: latcond=5.9e5
+      REAL,PARAMETER :: tcond1mb=136.27
+      REAL,SAVE :: acond,bcond
       
 c     For latent heat release from ground ice sublimation    
-!      REAL tsrf_lw(ngridmx)
+!      REAL tsrf_lw(ngrid)
 !      REAL alpha
       REAL T1,T2
@@ -127 +127 @@
 c    ~~~~~~~ 
       INTEGER iq
-      REAL zq(ngridmx,nlayermx,nqmx)
-      REAL zq1temp(ngridmx)
-      REAL rho(ngridmx) ! near surface air density
-      REAL qsat(ngridmx)
+      REAL zq(ngrid,nlay,nq)
+      REAL zq1temp(ngrid)
+      REAL rho(ngrid) ! near surface air density
+      REAL qsat(ngrid)
 
       REAL kmixmin
@@ -138 +138 @@
 
       INTEGER j,l
-      REAL zcondicea(ngrid,nlayermx)
-      REAL zt(ngridmx,nlayermx),ztcond(ngridmx,nlayermx+1)
-      REAL betam(ngridmx,nlayermx),dmice(ngridmx,nlayermx)
-      REAL pdtc(ngrid,nlayermx)
-      REAL zhs(ngridmx,nlayermx)
-      REAL ccond
-      SAVE ccond
+      REAL zcondicea(ngrid,nlay)
+      REAL zt(ngrid,nlay),ztcond(ngrid,nlay+1)
+      REAL betam(ngrid,nlay),dmice(ngrid,nlay)
+      REAL pdtc(ngrid,nlay)
+      REAL zhs(ngrid,nlay)
+      REAL,SAVE :: ccond
 
 c     Theta_m formulation for mass-variation scheme :
 c     ~~~~~~~
 
-      INTEGER ico2,llnt(ngridmx)
-      SAVE ico2
-      REAL m_co2, m_noco2, A , B
-      SAVE A, B, m_co2, m_noco2
-      REAL vmr_co2(ngridmx,nlayermx)
+      INTEGER,SAVE :: ico2
+      INTEGER llnt(ngrid)
+      REAL,SAVE :: m_co2, m_noco2, A , B
+      REAL vmr_co2(ngrid,nlay)
       REAL qco2,mmean
 
-      REAL sensibFlux(ngridmx)
+      REAL,INTENT(OUT) :: sensibFlux(ngrid)
 
 #ifdef MESOSCALE
@@ -165 +163 @@
 
       IF (firstcall) THEN
-         IF(ngrid.NE.ngridmx) THEN
-            PRINT*,'STOP dans vdifc'
-            PRINT*,'probleme de dimensions :'
-            PRINT*,'ngrid  =',ngrid
-            PRINT*,'ngridmx  =',ngridmx
-            STOP
-         ENDIF
 c        To compute: Tcond= 1./(bcond-acond*log(.0095*p)) (p in pascal)
          bcond=1./tcond1mb
@@ -372 +363 @@
 ! Some usefull diagnostics for the new surface layer parametrization :
 
-!        call WRITEDIAGFI(ngridmx,'pcdv',
+!        call WRITEDIAGFI(ngrid,'pcdv',
 !     &              'momentum drag','no units',
 !     &                         2,zcdv_true)
-!        call WRITEDIAGFI(ngridmx,'pcdh',
+!        call WRITEDIAGFI(ngrid,'pcdh',
 !     &              'heat drag','no units',
 !     &                         2,zcdh_true)
-!        call WRITEDIAGFI(ngridmx,'ust',
+!        call WRITEDIAGFI(ngrid,'ust',
 !     &              'friction velocity','m/s',2,ust)
-!       call WRITEDIAGFI(ngridmx,'tst',
+!       call WRITEDIAGFI(ngrid,'tst',
 !     &              'friction temperature','K',2,tst)
-!        call WRITEDIAGFI(ngridmx,'rm-1',
+!        call WRITEDIAGFI(ngrid,'rm-1',
 !     &              'aerodyn momentum conductance','m/s',
 !     &                         2,zcdv)
-!        call WRITEDIAGFI(ngridmx,'rh-1',
+!        call WRITEDIAGFI(ngrid,'rh-1',
 !     &              'aerodyn heat conductance','m/s',
 !     &                         2,zcdh)
@@ -693 +684 @@
 c       Calcul du flux vertical au bas de la premiere couche (dust) :
 c       -----------------------------------------------------------
-        do ig=1,ngridmx  
+        do ig=1,ngrid  
           rho(ig) = zb0(ig,1) /ptimestep
 c          zb(ig,1) = 0.
@@ -740 +731 @@
 c       ----------------------------------------
         if (water) then 
-            call watersat(ngridmx,ptsrf,pplev(1,1),qsat)
+            call watersat(ngrid,ptsrf,pplev(1,1),qsat)
         end if
 

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

@@ -1 @@
-      SUBROUTINE vlz_fi(ngrid,q,pente_max,masse,w,wq)
+      SUBROUTINE vlz_fi(ngrid,nlay,q,pente_max,masse,w,wq)
 c
 c     Auteurs:   P.Le Van, F.Hourdin, F.Forget 
@@ -16 +16 @@
       IMPLICIT NONE
 c
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 
 c
@@ -23 +23 @@
 c   Arguments:
 c   ----------
-      integer ngrid
-      real masse(ngrid,llm),pente_max
-      REAL q(ngrid,llm)
-      REAL w(ngrid,llm)
-      REAL wq(ngrid,llm+1)
+      integer,intent(in) :: ngrid ! number of atmospheric columns
+      integer,intent(in) :: nlay ! number of atmospheric layers
+      real masse(ngrid,nlay),pente_max
+      REAL q(ngrid,nlay)
+      REAL w(ngrid,nlay)
+      REAL wq(ngrid,nlay+1)
 c
 c      Local 
@@ -35 +36 @@
 c
 
-      real dzq(ngridmx,llm),dzqw(ngridmx,llm),adzqw(ngridmx,llm),dzqmax
+      real dzq(ngrid,nlay),dzqw(ngrid,nlay),adzqw(ngrid,nlay),dzqmax
       real newmasse
       real sigw, Mtot, MQtot
@@ -47 +48 @@
 c    sens de W
 
-      do l=2,llm
+      do l=2,nlay
          do ij=1,ngrid
             dzqw(ij,l)=q(ij,l-1)-q(ij,l)
@@ -54 +55 @@
       enddo
 
-      do l=2,llm-1
+      do l=2,nlay-1
          do ij=1,ngrid
 #ifdef CRAY
@@ -73 +74 @@
       do ij=1,ngrid
          dzq(ij,1)=0.
-         dzq(ij,llm)=0.
+         dzq(ij,nlay)=0.
       enddo
 c ---------------------------------------------------------------
@@ -83 +84 @@
 c      No flux at the model top:
        do ij=1,ngrid
-          wq(ij,llm+1)=0.
+          wq(ij,nlay+1)=0.
        enddo
 
@@ -89 +90 @@
 c      ===============================
 
-       do l = 1,llm          ! loop different than when w<0
+       do l = 1,nlay          ! loop different than when w<0
         do  ij = 1,ngrid
 
@@ -107 +108 @@
             Mtot = masse(ij,m)
             MQtot = masse(ij,m)*q(ij,m)
-            if(m.ge.llm)goto 88
+            if(m.ge.nlay)goto 88
             do while(w(ij,l).gt.(Mtot+masse(ij,m+1)))
                 m=m+1
                 Mtot = Mtot + masse(ij,m)
                 MQtot = MQtot + masse(ij,m)*q(ij,m)
-                if(m.ge.llm)goto 88
+                if(m.ge.nlay)goto 88
             end do
  88         continue
-            if (m.lt.llm) then
+            if (m.lt.nlay) then
                 sigw=(w(ij,l)-Mtot)/masse(ij,m+1)
                 wq(ij,l)=(MQtot + (w(ij,l)-Mtot)*
@@ -137 +138 @@
        end do
 
-       do l = 1,llm-1  ! loop different than when w>0
+       do l = 1,nlay-1  ! loop different than when w>0
         do  ij = 1,ngrid
          if(w(ij,l+1).le.0)then
@@ -176 +177 @@
  99    continue
 
-      do l=1,llm
+      do l=1,nlay
          do ij=1,ngrid
 

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

@@ -34 +34 @@
 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   Inputs:
@@ -58 +60 @@
       real pdq(ngrid,nlay,nq)    ! tendence avant condensation  (kg/kg.s-1)
 
-      REAL tau(ngridmx,naerkind) ! Column dust optical depth at each point
-      REAL tauscaling(ngridmx)   ! Convertion factor for dust amount
-      real rdust(ngridmx,nlay)   ! Dust geometric mean radius (m)
+      REAL tau(ngrid,naerkind) ! Column dust optical depth at each point
+      REAL tauscaling(ngrid)   ! Convertion factor for dust amount
+      real rdust(ngrid,nlay)   ! Dust geometric mean radius (m)
 
 c   Outputs:
@@ -73 +75 @@
       REAL nuice(ngrid,nlay)   ! Estimated effective variance
                                !   of the size distribution
-      real rsedcloud(ngridmx,nlay) ! Cloud sedimentation radius
-      real rhocloud(ngridmx,nlay)  ! Cloud density (kg.m-3)
+      real rsedcloud(ngrid,nlay) ! Cloud sedimentation radius
+      real rhocloud(ngrid,nlay)  ! Cloud density (kg.m-3)
 
 c   local:
@@ -106 +108 @@
 
       IF (firstcall) THEN
-        IF(ngrid.NE.ngridmx) THEN
-            PRINT*,'STOP dans watercloud'
-            PRINT*,'probleme de dimensions :'
-            PRINT*,'ngrid  =',ngrid
-            PRINT*,'ngridmx  =',ngridmx
-            STOP
-        ENDIF
          
         if (nq.gt.nqmx) then
@@ -445 +440 @@
 c     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 c     Then that should not affect the ice particle radius
-      do ig=1,ngridmx
+      do ig=1,ngrid
         if(pdpsrf(ig)*ptimestep.gt.0.9*(pplev(ig,1)-pplev(ig,2)))then
           if(pdpsrf(ig)*ptimestep.gt.0.9*(pplev(ig,1)-pplev(ig,3)))

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

@@ -39 +39 @@
 !
 !=================================================================
- 
+      use surfdat_h, only: phisfi
       implicit none
 
 ! Commons
 #include "dimensions.h"
-#include "dimphys.h"
+!#include "dimphys.h"
 #include "paramet.h"
 #include "control.h"
@@ -52 +52 @@
 #include "netcdf.inc"
 #include "temps.h"
-#include "surfdat.h"
+!#include "surfdat.h"
 
 ! Arguments on input:
@@ -192 +192 @@
       endif ! if (firstnom.eq.'1234567890')
 
-      if (ngridmx.eq.1) then
+      if (ngrid.eq.1) then
         ! in testphys1d, for the 1d version of the GCM, iphysiq and irythme
         ! are undefined; so set them to 1

trunk/LMDZ.MARS/libf/phymars/writediagsoil.F90

@@ -12 +12 @@
 ! Modifs: Aug.2010 Ehouarn: enforce outputs to be real*4
 
+use comsoil_h, only: nsoilmx
+
 implicit none
 
 #include"dimensions.h"
-#include"dimphys.h"
+!#include"dimphys.h"
 #include"paramet.h"
 #include"control.h"
-#include"comsoil.h"
+!#include"comsoil.h"
 #include"netcdf.inc"
 
@@ -29 +31 @@
 integer,intent(in) :: dimpx ! dimension of the variable (3,2 or 0)
 real,dimension(ngrid,nsoilmx),intent(in) :: px ! variable
-! Note: nsoilmx is a common parameter set in 'dimphys.h'
+! Note: nsoilmx is a parameter set in 'comsoil_h'
 
 ! Local variables:
 real*4,dimension(iip1,jjp1,nsoilmx) :: data3 ! to store 3D data
-! Note iip1,jjp1 known from paramet.h; nsoilmx known from dimphys.h
+! Note iip1,jjp1 known from paramet.h; nsoilmx known from comsoil_h
 real*4,dimension(iip1,jjp1) :: data2 ! to store 2D data
 real*4 :: data0 ! to store 0D data
@@ -80 +82 @@
   
   ! Define dimensions and axis attributes
-  call iniwritesoil(nid)
+  call iniwritesoil(nid,ngrid)
   
   ! set zitau to -1 to be compatible with zitau incrementation step below