Changeset 1212 for trunk/LMDZ.MARS/libf/phymars/thermcell_main_mars.F90

Timestamp:

Mar 24, 2014, 9:46:50 AM (11 years ago)

Author:

aslmd

Message:

LMDZ.MARS + MESOSCALE

A quite major commit, at least for MESOSCALE.
In a word: any ngrid deserves to be free.

• no need to recompile when changing number of horizontal grid points or number of processors
• latest version of LMDZ.MARS physics can be used
• WARNING! Nesting is still yet to be fixed (since r1027)

Also some small bug fixes to LMDZ.MARS.

Changes in LMDZ.MARS

---

--> fixed a potential bug in thermal plume model because zlmax was computed both in thermcell_main_mars and calltherm_interface... so made it an OUT argument of calltherm_interface. also: changed the name to limz. and added precompiling flags to avoid the use of planetwide in MESOSCALE. in MESOSCALE we just go high enough (nlayer-5) and do not care about computational cost (although we certainly gain from not using MAXVAL).
--> moved allocations upward in inifis. does not change anything for GCM, but make MESOSCALE modifications simpler, and overall make inifis better organized: first allocations, then reading callphys.def file.
--> added precompiling flags around lines that are both useless for MESOSCALE (notably I/O) and recently adapted to parallel computations in the GCM
--> tidied up what is MESOSCALE vs. GCM in surfini

Changes in MESOSCALE

---

--> changed makemeso to allow dynamically set nx ny nprocs
--> changed makemeso to remove links to Fortran code adapted to parallel GCM and useless for mesoscale
--> changed ngridmx to ngrid in inifis includes

File:

• trunk/LMDZ.MARS/libf/phymars/thermcell_main_mars.F90 (modified) (15 diffs)

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

@@ -37 +37 @@
      &                  ,pu,pv,pt,pq,pq2  &
      &                  ,pdtadj,pdqadj  &
-     &                  ,fm,entr,detr,lmax,zmax  &
+     &                  ,fm,entr,detr,lmax,zmax,limz  &
      &                  ,zw2,fraca &
      &                  ,zpopsk,heatFlux,heatFlux_down &
@@ -43 +43 @@
 
       USE comtherm_h
+#ifndef MESOSCALE
       use planetwide_mod, only: planetwide_maxval
+#endif
 
       IMPLICIT NONE
@@ -85 +87 @@
       REAL, INTENT(OUT) :: heatFlux_down(ngrid,nlayer) ! interface heat flux from downdraft
 
+      INTEGER, INTENT(OUT) :: limz ! limit vertical index for integration
+
 ! ============== LOCAL ================
       REAL :: pdqadj(ngrid,nlayer,nq) !tracer change from thermals dq/dt, only for CO2 (the rest can be advected outside of the loop)
@@ -153 +157 @@
       REAL denom(ngrid)
       REAL zlevinter(ngrid)
-      INTEGER zlmax
 
 ! =========================================
@@ -765 +768 @@
 ! ===========================================================================
 
-      !zlmax=MAXVAL(lmax(:))+2 ! OK, but in serial mode only; use planet
-      call planetwide_maxval(lmax,zlmax)
-      zlmax=zlmax+2
+#ifdef MESOSCALE
+      limz= nlayer-5 ! the most important is limz > max(PBLheight)+2
+                     ! nlayer-5 is more than enough!
+#else
+      call planetwide_maxval(lmax,limz)
+      limz=limz+2
+#endif
       
-      if (zlmax .ge. nlayer) then
+      if (limz .ge. nlayer) then
         print*,'thermals have reached last layer of the model'
         print*,'this is not good !'
-        zlmax=nlayer
+        limz=nlayer
       endif
 ! alim_star_clos is the source profile used for closure. It consists of the
@@ -794 +801 @@
 
 ! llmax is the index of the heighest thermal in the simulation domain
-      !llmax=1
-      !do ig=1,ngrid
-      !   if (lalim(ig)>llmax) llmax=lalim(ig)
-      !enddo
+#ifdef MESOSCALE
+      !! AS: THIS IS PARALLEL SENSITIVE!!!!! to be corrected?
+      llmax=1
+      do ig=1,ngrid
+         if (lalim(ig)>llmax) llmax=lalim(ig)
+      enddo
+#else
       call planetwide_maxval(lalim,llmax)
+#endif
 
 ! Integral of a**2/(rho* Delta z), see equation 13 of appendix 4.2 in paper
@@ -856 +867 @@
 !-------------------------------------------------------------------------
 
-      do l=1,zlmax
+      do l=1,limz
          entr(:,l)=f(:)*(entr_star(:,l)+alim_star(:,l))
          detr(:,l)=f(:)*detr_star(:,l)
@@ -863 +874 @@
 ! Reconstruct the updraft mass flux everywhere
 
-      do l=1,zlmax
+      do l=1,limz
          do ig=1,ngrid
             if (l.lt.lmax(ig)) then
@@ -890 +901 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-      do l=1,zlmax !loop on the levels
+      do l=1,limz !loop on the levels
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
@@ -992 +1003 @@
 !-----------------------------------------------------------------------
 
-      do l=1,zlmax
+      do l=1,limz
          do ig=1,ngrid
             eee0=entr(ig,l)
@@ -1140 +1151 @@
 !------------------------------------------------------------------
       fraca(:,:)=0.
-      do l=2,zlmax
+      do l=2,limz
          do ig=1,ngrid
             if (zw2(ig,l).gt.1.e-10) then
@@ -1161 +1172 @@
       if (igcm_co2.ne.0) then
       detrmod(:,:)=0.
-      do k=1,zlmax
+      do k=1,limz
          do ig=1,ngrid
             detrmod(ig,k)=fm(ig,k)-fm(ig,k+1) &
@@ -1174 +1185 @@
       call thermcell_dqup(ngrid,nlayer,ptimestep     &
      &     ,fm,entr,detrmod,  &
-     &    masse,pq(:,:,igcm_co2),pdqadj(:,:,igcm_co2),ndt,zlmax)
+     &    masse,pq(:,:,igcm_co2),pdqadj(:,:,igcm_co2),ndt,limz)
 
 ! Compute the ratio between theta and theta_m
       
-       do l=1,zlmax
+       do l=1,limz
           do ig=1,ngrid
              ratiom(ig,l)=1./(A*(pq(ig,l,igcm_co2)+pdqadj(ig,l,igcm_co2)*ptimestep)+B)
@@ -1191 +1202 @@
 
       pdtadj(:,:)=0.
-      do l=1,zlmax
+      do l=1,limz
          do ig=1,ngrid
          pdtadj(ig,l)=(zdthladj(ig,l)+zdthladj_down(ig,l))*zpopsk(ig,l)*ratiom(ig,l)
@@ -1225 +1236 @@
         buoyancyEst(:,:)=0.
         heatFlux_down(:,:)=0.
-      do l=1,zlmax
+      do l=1,limz
        do ig=1,ngrid
         heatFlux(ig,l)=fm(ig,l)*(teta_th_int(ig,l)-teta_env_int(ig,l))/(rhobarz(ig,l))