Changeset 185 for trunk/LMDZ.MARS/libf/phymars/calltherm_mars.F90

Timestamp:

Jul 1, 2011, 5:22:34 PM (14 years ago)

Author:

acolaitis

Message:

17/06/2011 == AC

• Added new settings for the Martian thermals from new LES observations
• Revamped thermcell's module variables to allow it's removal
• Minor changes in physiq and meso_physiq for the call to thermals
• Switched from dynamic to static memory allocation for all thermals variable

to gain computation speed

• Thermals now output maximum speed, maximum heat flux, and maximum height in thermal plumes

File:

• trunk/LMDZ.MARS/libf/phymars/calltherm_mars.F90 (modified) (9 diffs)

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

@@ -2 +2 @@
 ! $Id: calltherm.F90 1428 2010-09-13 08:43:37Z fairhead $
 !
-      subroutine calltherm_mars(ngrid,nlayer,dtime,nq,zzlev,zzlay  &
+      subroutine calltherm_mars(dtime,zzlev,zzlay  &
      &      ,pplay,paprs,pphi  &
      &      ,u_seri,v_seri,t_seri,pq_therm,q2_therm  &
      &      ,d_u_ajs,d_v_ajs,d_t_ajs,d_q_ajs,dq2_therm  &
-     &      ,fm_therm,entr_therm,detr_therm,lmax,&
+     &      ,fm_therm,entr_therm,detr_therm,lmax,zmax,&
      &   zw2,fraca,zpopsk,ztla,heatFlux,heatFlux_down,&
      &     buoyancyOut,buoyancyEst,hfmax,wmax)
 
-       USE thermcell, only : nsplit_thermals,r_aspect_thermals
        USE ioipsl_getincom
       implicit none
 
-      INTEGER, INTENT(IN) :: ngrid,nlayer
+#include "dimensions.h"
+#include "dimphys.h"
+
       REAL dtime
-      LOGICAL logexpr0, logexpr2(ngrid,nlayer), logexpr1(ngrid)
+      LOGICAL logexpr0, logexpr2(ngridmx,nlayermx), logexpr1(ngridmx)
       REAL fact
-      INTEGER nbptspb,nq
-
-      REAL, INTENT(IN) :: zzlay(ngrid,nlayer)
-      REAL, INTENT(IN) :: zzlev(ngrid,nlayer+1)
-
-      REAL u_seri(ngrid,nlayer),v_seri(ngrid,nlayer)
-      REAL t_seri(ngrid,nlayer),pq_therm(ngrid,nlayer,nq)
-      REAL q2_therm(ngrid,nlayer)
-      REAL paprs(ngrid,nlayer+1)
-      REAL pplay(ngrid,nlayer)
-      REAL pphi(ngrid,nlayer)
-      real zlev(ngrid,nlayer+1) 
+      INTEGER nbptspb
+
+      REAL, INTENT(IN) :: zzlay(ngridmx,nlayermx)
+      REAL, INTENT(IN) :: zzlev(ngridmx,nlayermx+1)
+
+      REAL u_seri(ngridmx,nlayermx),v_seri(ngridmx,nlayermx)
+      REAL t_seri(ngridmx,nlayermx),pq_therm(ngridmx,nlayermx,nqmx)
+      REAL q2_therm(ngridmx,nlayermx)
+      REAL paprs(ngridmx,nlayermx+1)
+      REAL pplay(ngridmx,nlayermx)
+      REAL pphi(ngridmx,nlayermx)
+      real zlev(ngridmx,nlayermx+1) 
 !test: on sort lentr et a* pour alimenter KE
-      REAL zw2(ngrid,nlayer+1),fraca(ngrid,nlayer+1)
-      REAL zzw2(ngrid,nlayer+1)
+      REAL zw2(ngridmx,nlayermx+1),fraca(ngridmx,nlayermx+1)
+      REAL zzw2(ngridmx,nlayermx+1)
 
 !FH Update Thermiques
-      REAL d_t_ajs(ngrid,nlayer), d_q_ajs(ngrid,nlayer,nq)
-      REAL d_u_ajs(ngrid,nlayer),d_v_ajs(ngrid,nlayer)
-      REAL dq2_therm(ngrid,nlayer), dq2_the(ngrid,nlayer)
-      real fm_therm(ngrid,nlayer+1)
-      real entr_therm(ngrid,nlayer),detr_therm(ngrid,nlayer)
+      REAL d_t_ajs(ngridmx,nlayermx), d_q_ajs(ngridmx,nlayermx,nqmx)
+      REAL d_u_ajs(ngridmx,nlayermx),d_v_ajs(ngridmx,nlayermx)
+      REAL dq2_therm(ngridmx,nlayermx), dq2_the(ngridmx,nlayermx)
+      real fm_therm(ngridmx,nlayermx+1)
+      real entr_therm(ngridmx,nlayermx),detr_therm(ngridmx,nlayermx)
 
 !********************************************************
 !     declarations
-      real zpopsk(ngrid,nlayer)
-      real ztla(ngrid,nlayer)
-      real wmax(ngrid)
-      real hfmax(ngrid)
-      integer lmax(ngrid)
+      real zpopsk(ngridmx,nlayermx)
+      real ztla(ngridmx,nlayermx)
+      real wmax(ngridmx)
+      real hfmax(ngridmx)
+      integer lmax(ngridmx)
+      real zmax(ngridmx)
 
 !nouvelles variables pour la convection
@@ -56 +58 @@
 
 ! variables locales
-      REAL d_t_the(ngrid,nlayer), d_q_the(ngrid,nlayer,nq)
-      REAL d_u_the(ngrid,nlayer),d_v_the(ngrid,nlayer)
+      REAL d_t_the(ngridmx,nlayermx), d_q_the(ngridmx,nlayermx,nqmx)
+      REAL d_u_the(ngridmx,nlayermx),d_v_the(ngridmx,nlayermx)
 !
-      integer isplit
-      real zfm_therm(ngrid,nlayer+1),zdt
-      real zentr_therm(ngrid,nlayer),zdetr_therm(ngrid,nlayer)
-      real heatFlux(ngrid,nlayer)
-      real heatFlux_down(ngrid,nlayer)
-      real buoyancyOut(ngrid,nlayer)
-      real buoyancyEst(ngrid,nlayer)
-      real zheatFlux(ngrid,nlayer)
-      real zheatFlux_down(ngrid,nlayer)
-      real zbuoyancyOut(ngrid,nlayer)
-      real zbuoyancyEst(ngrid,nlayer)
+      integer isplit,nsplit_thermals
+      real r_aspect_thermals
+
+      real zfm_therm(ngridmx,nlayermx+1),zdt
+      real zentr_therm(ngridmx,nlayermx),zdetr_therm(ngridmx,nlayermx)
+      real heatFlux(ngridmx,nlayermx)
+      real heatFlux_down(ngridmx,nlayermx)
+      real buoyancyOut(ngridmx,nlayermx)
+      real buoyancyEst(ngridmx,nlayermx)
+      real zheatFlux(ngridmx,nlayermx)
+      real zheatFlux_down(ngridmx,nlayermx)
+      real zbuoyancyOut(ngridmx,nlayermx)
+      real zbuoyancyEst(ngridmx,nlayermx)
 
       character (len=20) :: modname='calltherm'
@@ -77 +81 @@
       logical, save :: first=.true.
 
+      REAL tstart,tstop
+
+
 !  Modele du thermique
 !  ===================
-
-         nsplit_thermals=20
+ 
+         r_aspect_thermals=3.
+         nsplit_thermals=40
          call getin("nsplit_thermals",nsplit_thermals)
 
@@ -98 +106 @@
          do isplit=1,nsplit_thermals
 
+!         call cpu_time(tstart)
+
+
 ! On reinitialise les flux de masse a zero pour le cumul en
 ! cas de splitting
@@ -116 +127 @@
          d_v_the(:,:)=0.
          dq2_the(:,:)=0.
-         if (nq .ne. 0) then
+         if (nqmx .ne. 0) then
             d_q_the(:,:,:)=0.
          endif
 
-             CALL thermcell_main_mars(ngrid,nlayer,nq,zdt  &
+             CALL thermcell_main_mars(zdt  &
      &      ,pplay,paprs,pphi,zzlev,zzlay  &
      &      ,u_seri,v_seri,t_seri,pq_therm,q2_therm  &
      &      ,d_u_the,d_v_the,d_t_the,d_q_the,dq2_the  &
-     &      ,zfm_therm,zentr_therm,zdetr_therm,lmax  &
+     &      ,zfm_therm,zentr_therm,zdetr_therm,lmax,zmax  &
      &      ,r_aspect_thermals &
      &      ,zzw2,fraca,zpopsk &
@@ -138 +149 @@
             dq2_the(:,:)=dq2_the(:,:)*fact            
 
-            if (nq .ne. 0) then
+            if (nqmx .ne. 0) then
                d_q_the(:,:,:)=d_q_the(:,:,:)*fact
             endif
@@ -175 +186 @@
             q2_therm(:,:) = q2_therm(:,:) + dq2_therm(:,:)
 
+
+!         call cpu_time(tstop)
+!         print*,'elapsed time in thermals : ',tstop-tstart
+
          enddo ! isplit
 
@@ -180 +195 @@
 !****************************************************************
 
-!          do i=1,ngrid
-!             do k=1,nlayer
+!          do i=1,ngridmx
+!             do k=1,nlayermx
 !                if (ztla(i,k) .lt. 1.e-10) fraca(i,k) =0.
 !               print*,'youpi je sers a quelque chose !'
@@ -187 +202 @@
 !          enddo
         
-          DO i=1,ngrid
+          DO i=1,ngridmx
             hfmax(i)=MAXVAL(heatFlux(i,:)+heatFlux_down(i,:))
             wmax(i)=MAXVAL(zw2(i,:))