Changeset 1313 for trunk/LMDZ.MARS/libf/phymars

Timestamp:

Jul 11, 2014, 12:34:45 PM (11 years ago)

Author:

emillour

Message:

Mars GCM: corrections wrt previous commit (physiq.F is in fixed form!).
EM

File:

• trunk/LMDZ.MARS/libf/phymars/physiq.F (modified) (2 diffs)

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

@@ -280 +280 @@
       REAL ztime_fin
       REAL zdh(ngrid,nlayer)
+      REAL zh(ngrid,nlayer)      ! potential temperature (K)
       REAL pw(ngrid,nlayer) ! vertical velocity (m/s) (>0 when downwards)
       INTEGER length
@@ -578 +579 @@
 #endif
 
-     ! Compute vertical velocity (m/s) from vertical mass flux
-     ! w = F / (rho*area) and rho = r*T/P
-     ! but first linearly interpolate mass flux to mid-layers
-     do l=1,nlayer-1
+      ! Compute vertical velocity (m/s) from vertical mass flux
+      ! w = F / (rho*area) and rho = r*T/P
+      ! but first linearly interpolate mass flux to mid-layers
+      do l=1,nlayer-1
        pw(1:ngrid,l)=0.5*(flxw(1:ngrid,l)+flxw(1:ngrid,l+1))
-     enddo
-     pw(1:ngrid,nlayer)=0.5*flxw(1:ngrid,nlayer) ! since flxw(nlayer+1)=0
-     do l=1,nlayer
-       pw(1:ngrid,l)=(pw(1:ngrid,l)*pplay(1:ngrid,l)) /  &
-                     (r*pt(1:ngrid,l)*area(1:ngrid))
+      enddo
+      pw(1:ngrid,nlayer)=0.5*flxw(1:ngrid,nlayer) ! since flxw(nlayer+1)=0
+      do l=1,nlayer
+       pw(1:ngrid,l)=(pw(1:ngrid,l)*pplay(1:ngrid,l)) / 
+     &               (r*pt(1:ngrid,l)*area(1:ngrid))
        ! NB: here we use r and nor rnew since this diagnostic comes
        ! from the dynamics
-     enddo
+      enddo
 
 c-----------------------------------------------------------------------