Changeset 185 for trunk/LMDZ.MARS/libf/phymars/physiq.F

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/physiq.F (modified) (12 diffs)

trunk/LMDZ.MARS/libf/phymars/physiq.F

@@ -206 +206 @@
 
       CHARACTER*80 fichier 
-      INTEGER l,ig,ierr,igout,iq,i, tapphys
+      INTEGER l,ig,ierr,igout,iq,i, tapphys,k
+      LOGICAL end_of_file
 
       REAL fluxsurf_lw(ngridmx)      !incident LW (IR) surface flux (W.m-2)
@@ -302 +303 @@
 c Variables from thermal
 
-      REAL lmax_th_out(ngrid)
-      REAL wmax_th(ngrid),hfmax_th(ngrid)
-      REAL pdu_th(ngrid,nlayer),pdv_th(ngrid,nlayer)
-      REAL pdt_th(ngrid,nlayer),pdq_th(ngrid,nlayer,nq)
-      INTEGER lmax_th(ngrid)
-      REAL dtke_th(ngrid,nlayer+1)
-      REAL dummycol(ngrid)
-      REAL hfx(ngrid)
+      REAL lmax_th_out(ngridmx),zmax_th(ngridmx)
+      REAL wmax_th(ngridmx)
+      REAL ,SAVE :: hfmax_th(ngridmx)
+      REAL pdu_th(ngridmx,nlayermx),pdv_th(ngridmx,nlayermx)
+      REAL pdt_th(ngridmx,nlayermx),pdq_th(ngridmx,nlayermx,nqmx)
+      INTEGER lmax_th(ngridmx)
+      REAL dtke_th(ngridmx,nlayermx+1)
+      REAL dummycol(ngridmx)
 
 c=======================================================================
@@ -562 +563 @@
            ENDIF
 
-
-
         ENDIF ! of if(mod(icount-1,iradia).eq.0)
 
@@ -578 +577 @@
                fluxrad(ig)=fluxrad_sky(ig)-zplanck(ig)
            ENDDO
-
 
          DO l=1,nlayer
@@ -624 +622 @@
             enddo
          enddo
-         
+
 c        Calling vdif (Martian version WITH CO2 condensation)
          CALL vdifc(ngrid,nlayer,nq,co2ice,zpopsk,
@@ -634 +632 @@
      &        zdqdif,zdqsdif)
 
-          hfx(:) = zflubid(:)-capcal(:)*zdtsdif(:)
-
          DO l=1,nlayer
             DO ig=1,ngrid
@@ -647 +643 @@
          ENDDO
 
-         DO ig=1,ngrid
-            zdtsurf(ig)=zdtsurf(ig)+zdtsdif(ig)
-         ENDDO
+          DO ig=1,ngrid
+             zdtsurf(ig)=zdtsurf(ig)+zdtsdif(ig)
+          ENDDO
 
          if (tracer) then 
@@ -680 +676 @@
       if(calltherm) then
  
-        call calltherm_interface(ngrid,nlayer,firstcall,
+        call calltherm_interface(firstcall,
      $ long,lati,zzlev,zzlay,
      $ ptimestep,pu,pv,pt,pq,pdu,pdv,pdt,pdq,q2,
-     $ pplay,pplev,pphi,nq,zpopsk,
-     $ pdu_th,pdv_th,pdt_th,pdq_th,lmax_th,dtke_th,hfmax_th,wmax_th)
+     $ pplay,pplev,pphi,zpopsk,
+     $ pdu_th,pdv_th,pdt_th,pdq_th,lmax_th,zmax_th,
+     $ dtke_th,hfmax_th,wmax_th)
  
          DO l=1,nlayer
@@ -767 +764 @@
      $              co2ice,albedo,emis,
      $              zdtc,zdtsurfc,pdpsrf,zduc,zdvc,zdqc,
-     $              fluxsurf_sw,zls) 
+     $              fluxsurf_sw,zls) 
 
          DO l=1,nlayer
@@ -1482 +1479 @@
         lmax_th_out(:)=real(lmax_th(:))
 
-        call WRITEDIAGFI(ngridmx,'hfx',
-     &              'sensible heat flux','W.m-2',
-     &                         2,hfx)
-
         call WRITEDIAGFI(ngridmx,'lmax_th',
      &              'hauteur du thermique','K',
@@ -1534 +1527 @@
 ! THERMALS STUFF 1D
 
-        call WRITEDIAGFI(ngridmx,'hfx',
-     &              'sensible heat flux','W.m-2',
-     &                         0,hfx)
          if(calltherm) then
 
@@ -1580 +1570 @@
      &                  tsurf)
 
-           call WRITEDIAGFI(ngrid,"fluxsurf_sw",
-     &                "Solar radiative flux to surface","W.m-2",0,
-     &                fluxsurf_sw_tot)
-
          call WRITEDIAGFI(ngrid,"pplay","Pressure","Pa",1,zplay)
          call WRITEDIAGFI(ngrid,"pplev","Pressure","Pa",1,zplev)