Changeset 1529 for trunk/LMDZ.GENERIC/libf/phystd/mass_redistribution.F90

Timestamp:

Apr 5, 2016, 10:51:51 AM (9 years ago)

Author:

emillour

Message:

Generic GCM: Towards a cleaner separation between physics and dynamics

• 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.
• Removed module "comhdiff_mod.F90", as it is only used by module surf_heat_transp_mod.F90, moved module variables there.
• Addedin "surf_heat_transp_mod" local versions of some arrays and routines (from dyn3d) required to compute gradient, divergence, etc. on the global dynamics grid. As before, the slab ocean only works in serial.

EM

File:

• trunk/LMDZ.GENERIC/libf/phystd/mass_redistribution.F90 (modified) (6 diffs)

trunk/LMDZ.GENERIC/libf/phystd/mass_redistribution.F90

@@ -1 @@
-      SUBROUTINE mass_redistribution(ngrid,nlayer,nq,ptimestep,   &
+SUBROUTINE mass_redistribution(ngrid,nlayer,nq,ptimestep,   &
                        rnat,pcapcal,pplay,pplev,pt,ptsrf,pq,pqs,     &
                        pu,pv,pdt,pdtsrf,pdq,pdu,pdv,pdmassmr,  &
@@ -224 +224 @@
 !        Van Leer scheme:
          w(1:nlayer+1)=-zmflux(1:nlayer+1)*ptimestep
-         call vl1d(zzt,2.,zzmass,w,ztm) 
-         call vl1d(zzu ,2.,zzmass,w,zum) 
-         call vl1d(zzv ,2.,zzmass,w,zvm) 
+         call vl1d(nlayer,zzt,2.,zzmass,w,ztm) 
+         call vl1d(nlayer,zzu,2.,zzmass,w,zum) 
+         call vl1d(nlayer,zzv,2.,zzmass,w,zvm) 
          do iq=1,nq
            zq1(1:nlayer)=zzq(1:nlayer,iq)
@@ -232 +232 @@
 !               print*,iq
 !               print*,zq1
-           call vl1d(zq1,2.,zzmass,w,zqm1)
+           call vl1d(nlayer,zq1,2.,zzmass,w,zqm1)
            do l=2,nlayer
               zzq(l,iq)=zq1(l)
@@ -281 +281 @@
       END DO  ! loop on ig 
 
-      return
-      end
-
-
+CONTAINS
 
 ! *****************************************************************
-      SUBROUTINE vl1d(q,pente_max,zzmass,w,qm)
+      SUBROUTINE vl1d(llm,q,pente_max,zzmass,w,qm)
 !
 !    
@@ -299 +296 @@
 !
 !   --------------------------------------------------------------------
+      
       IMPLICIT NONE
-
-#include "dimensions.h"
 
 !   Arguments:
 !   ----------
+      integer,intent(in) :: llm
       real zzmass(llm),pente_max
       REAL q(llm),qm(llm+1)
@@ -406 +403 @@
 !         end if
 
-      return
-      end
+       END SUBROUTINE vl1d
+
+END SUBROUTINE mass_redistribution