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

Timestamp:

Apr 2, 2016, 4:09:43 PM (9 years ago)

Author:

emillour

Message:

Mars GCM:

• Got rid of references to "dimensions.h" from physics packages: use nbp_lon (=iim), nbp_lat (==jjp1) and nbp_lev from module mod_grid_phy_lmdz (in phy_common) instead.
• Added "ioipsl_getin_p_mod.F90" (getin_p routine) in phy_common to correctly read in parameters from *.def files in a parallel environment.

EM

Location:

trunk/LMDZ.MARS/libf/aeronomars

Files:

• inichim_newstart.F90 (modified) (9 diffs)
• moldiff_red.F90 (modified) (6 diffs)
• surfacearea.F (modified) (1 diff)

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

@@ -4 +4 @@
       use tracer_mod
       USE comvert_mod, ONLY: aps,bps
+      USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, nbp_lev
       implicit none
 
@@ -26 +27 @@
 !  ----------
 !
-!  pq(iip1,jjp1,llm,nq)  Advected fields, ie chemical species here
+!  pq(nbp_lon+1,nbp_lat,nbp_lev,nq)  Advected fields, ie chemical species here
 !  qsurf(ngrid,nq)     Amount of tracer on the surface (kg/m2)
-!  ps(iip1,jjp1)           Surface pressure (Pa)
+!  ps(nbp_lon+1,nbp_lat)           Surface pressure (Pa)
 !  flagh2o                 flag for initialisation of h2o (1: yes / 0: no)
 !  flagthermo              flag for initialisation of thermosphere only (1: yes / 0: no)
@@ -34 +35 @@
 !=======================================================================
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "callkeys.h"
-#include "datafile.h"
+      include "callkeys.h"
+      include "datafile.h"
 
 ! inputs :
@@ -43 +42 @@
       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)   
+      real,intent(in) :: ps(nbp_lon+1,nbp_lat)            ! surface pressure in the gcm (Pa)   
       integer,intent(in) :: flagh2o               ! flag for h2o initialisation
       integer,intent(in) :: flagthermo            ! flag for thermosphere initialisation only
@@ -49 +48 @@
 ! outputs :
 
-      real,intent(out) :: pq(iip1,jjp1,llm,nq)  ! advected fields, ie chemical species
+      real,intent(out) :: pq(nbp_lon+1,nbp_lat,nbp_lev,nq)  ! advected fields, ie chemical species
       real,intent(out) :: qsurf(ngrid,nq)     ! surface values (kg/m2) of tracers
 
@@ -56 +55 @@
       integer :: iq, i, j, l, n, nbqchem
       integer :: count, ierr, dummy
-      real    :: mmean(iip1,jjp1,llm)             ! mean molecular mass (g)
+      real    :: mmean(nbp_lon+1,nbp_lat,nbp_lev)             ! mean molecular mass (g)
       real    :: pgcm                             ! pressure at each layer in the gcm (Pa)
 
@@ -547 +546 @@
 ! 3. initialization of tracers
 
-      do i = 1,iip1
-         do j = 1,jjp1
-            do l = 1,llm
+      do i = 1,nbp_lon+1
+         do j = 1,nbp_lat
+            do l = 1,nbp_lev
 
                pgcm = aps(l) + bps(l)*ps(i,j)  ! gcm pressure
@@ -596 +595 @@
       if (igcm_ch4 /= 0) then
          vmr = 10.e-9       
-         do i = 1,iip1
-            do j = 1,jjp1
-               do l = 1,llm
+         do i = 1,nbp_lon+1
+            do j = 1,nbp_lat
+               do l = 1,nbp_lev
                   pq(i,j,l,igcm_ch4) = vmr*mmol(igcm_ch4)/mmean(i,j,l)
                end do
@@ -623 +622 @@
          end if
 
-         do i = 1,iip1
-            do j = 1,jjp1
-               do l = 1,llm
+         do i = 1,nbp_lon+1
+            do j = 1,nbp_lat
+               do l = 1,nbp_lev
                   ! all ions to 0     
                   pq(i,j,l,igcm_co2plus)  = 0.

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

@@ -7 +7 @@
 implicit none
 
-!#include "dimensions.h"
-!#include "dimphys.h"
-!#include "comcstfi.h"
-!#include "callkeys.h"
-!#include "comdiurn.h"
-!#include "chimiedata.h"
-!#include "tracer.h"
-!#include "conc.h"
-#include "diffusion.h"
+include "diffusion.h"
 
 ! July 2014 JYC ADD BALISTIC Transport coupling to compute wup for H and H2
@@ -937 +929 @@
         use tracer_mod, only: nqmx
         IMPLICIT NONE
-!#include "dimensions.h"
 
         INTEGER,INTENT(IN) :: nl,nq
@@ -973 +964 @@
         use tracer_mod, only: nqmx
         IMPLICIT NONE
-!#include "dimensions.h"
 
         INTEGER :: nl,nq,l
@@ -1058 +1048 @@
         use tracer_mod, only: nqmx
         IMPLICIT NONE
-!#include "dimensions.h"
         
         INTEGER :: nl,nq,il,l,i,iq,nlx,iz,ig
@@ -1400 +1389 @@
         use tracer_mod, only: nqmx
         IMPLICIT NONE
-!#include "dimensions.h"
         INTEGER :: nl,nq,nlx,il,nn,iP,ig,compteur
         INTEGER,DIMENSION(1) :: indP
@@ -1502 +1490 @@
         use tracer_mod, only: nqmx
         IMPLICIT NONE
-!#include "dimensions.h"
         INTEGER :: nl,nq,nlx,il,nn,iP,ig,compteur
         INTEGER,DIMENSION(1) :: indP

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

@@ -19 +19 @@
 !==========================================================================
 
-#include "dimensions.h"
-#include "callkeys.h"
-#include "chimiedata.h"
+      include "callkeys.h"
+      include "chimiedata.h"
 
 ! input