Changeset 1032 for trunk/LMDZ.MARS/libf/phymars/thermcell_dqup.F90

Timestamp:

Sep 6, 2013, 8:51:56 AM (11 years ago)

Author:

aslmd

Message:

LMDZ.MARS cleaned and commented version of the thermal plume model with automatic arrays.

File:

• trunk/LMDZ.MARS/libf/phymars/thermcell_dqup.F90 (modified) (5 diffs)

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

@@ -1 @@
-! ---------------------------------------------------------------------
-! Arnaud Colaitis 2011-01-05
-! --------------------------------------------------------------------
       subroutine thermcell_dqup(ngrid,nlayer,ptimestep,fm,entr,detr,  &
      &    masse0,q_therm,dq_therm,ndt,zlmax)
@@ -16 +13 @@
 !
 !=======================================================================
-
-#include "dimensions.h" !contains global GCM grid dimension informations
-#include "dimphys.h" !similar to dimensions.h, and based on it; includes
-                     ! "ngridmx": number of horizontal grid points
-                     ! "nlayermx": number of atmospheric layers
+! Arnaud Colaitis 2011-01-05 (modified 2011-2013)
+! SEE COMMENTS IN CALLTHERM_INTERFACE
+!=======================================================================
 
 ! ============================ INPUTS ============================
@@ -26 +21 @@
       INTEGER, INTENT(IN) :: ngrid,nlayer ! number of grid points and number of levels
       REAL, INTENT(IN) :: ptimestep ! timestep (s)
-      REAL, INTENT(IN) :: fm(ngridmx,nlayermx+1) ! upward mass flux
-      REAL, INTENT(IN) :: entr(ngridmx,nlayermx) ! entrainment mass flux
-      REAL, INTENT(IN) :: detr(ngridmx,nlayermx) ! detrainment mass flux
-      REAL, INTENT(IN) :: q_therm(ngridmx,nlayermx) ! initial profil of q 
-      REAL, INTENT(IN) :: masse0(ngridmx,nlayermx) ! mass of cells
+      REAL, INTENT(IN) :: fm(ngrid,nlayer+1) ! upward mass flux
+      REAL, INTENT(IN) :: entr(ngrid,nlayer) ! entrainment mass flux
+      REAL, INTENT(IN) :: detr(ngrid,nlayer) ! detrainment mass flux
+      REAL, INTENT(IN) :: q_therm(ngrid,nlayer) ! initial profil of q 
+      REAL, INTENT(IN) :: masse0(ngrid,nlayer) ! mass of cells
       INTEGER, INTENT(IN) :: ndt ! number of subtimesteps
       INTEGER, INTENT(IN) :: zlmax ! index of maximum layer
@@ -36 +31 @@
 ! ============================ OUTPUTS ===========================
 
-      REAL, INTENT(OUT) :: dq_therm(ngridmx,nlayermx)  ! dq/dt -> derivative
+      REAL, INTENT(OUT) :: dq_therm(ngrid,nlayer)  ! dq/dt -> derivative
 
 ! ============================ LOCAL =============================
 
-      REAL q(ngridmx,nlayermx)
-      REAL qa(ngridmx,nlayermx)
+      REAL q(ngrid,nlayer)
+      REAL qa(ngrid,nlayer)
       INTEGER ig,k,i
-      REAL invflux0(ngridmx,nlayermx)
+      REAL invflux0(ngrid,nlayer)
       REAL ztimestep
 
@@ -65 +60 @@
 
         do k=2,zlmax
-           do ig=1,ngridmx
+           do ig=1,ngrid
               if ((fm(ig,k+1)+detr(ig,k))*ptimestep.gt.  &
      &        1.e-5*masse0(ig,k)) then