Changeset 429 for LMDZ.3.3/trunk

Timestamp:

Nov 14, 2002, 1:08:23 PM (22 years ago)

Author:

lmdz

Message:

pb comgeomphy. En fait, diagphy n'est pas utilise par la version chimiste
mais on est obligé de l'inclure pour que cvsweb se porte bien
LF

File:

• LMDZ.3.3/trunk/libf/phylmd/diagphy.F (modified) (10 diffs)

LMDZ.3.3/trunk/libf/phylmd/diagphy.F

@@ -1 @@
-      SUBROUTINE diagphy(tit,iprt
+      SUBROUTINE diagphy(airephy,tit,iprt
      $    , tops, topl, sols, soll, sens
      $    , evap, rain_fall, snow_fall, ts
@@ -12 +12 @@
 C
 C Arguments: 
+C airephy-------input-R-  grid area
 C tit---------input-A15- Comment to be added in PRINT (CHARACTER*15)
 C iprt--------input-I-  PRINT level ( <=0 : no PRINT)
@@ -45 +46 @@
 #include "dimensions.h"
 #include "dimphy.h"
-#include "comgeophy.h"
 #include "YOMCST.h"
 #include "YOETHF.h"
 C
 C     Input variables
+      real airephy(klon)
       CHARACTER*15 tit
       INTEGER iprt
@@ -127 +128 @@
      $    tit, pas, fs_bound, d_etp_tot, fq_bound, d_qt_tot
 C
+      IF (iprt.ge.1) write(6,6668) 
+     $    tit, pas, d_etp_tot+d_ec_tot-fs_bound, d_qt_tot-fq_bound
+C
       IF (iprt.ge.2) write(6,6667) 
      $    tit, pas, stops,stopl,ssols,ssoll,ssens,slat,evap_tot
@@ -133 +137 @@
       return
 
- 6666 format('Flux Budget ',a15,1i6,2f8.2,2(1pE13.5))
- 6667 format('Boundary Flux ',a15,1i6,6f8.2,2(1pE13.5))
+ 6666 format('Phys. Flux Budget ',a15,1i6,2f8.2,2(1pE13.5))
+ 6667 format('Phys. Boundary Flux ',a15,1i6,6f8.2,2(1pE13.5))
+ 6668 format('Phys. Total Budget ',a15,1i6,f8.2,2(1pE13.5))
 
       end
 
 C======================================================================
-      SUBROUTINE diagetpq(tit,iprt,idiag,idiag2,dtime
+      SUBROUTINE diagetpq(airephy,tit,iprt,idiag,idiag2,dtime
      e  ,t,q,ql,qs,u,v,paprs,pplay
      s  , d_h_vcol, d_qt, d_qw, d_ql, d_qs, d_ec)
@@ -160 +165 @@
 c======================================================================
 C Arguments: 
+C airephy-------input-R-  grid area
 C tit-----imput-A15- Comment added in PRINT (CHARACTER*15)
 C iprt----input-I-  PRINT level ( <=1 : no PRINT)
@@ -192 +198 @@
 C
 C     other (COMMON...)
-C     RG : gravity
-C     airephy(klon) : mesh surface
+C     RCPD, RCPV, ....
 C
 C J.L. Dufresne, July 2002
@@ -202 +207 @@
 #include "dimensions.h"
 #include "dimphy.h"
-#include "comgeophy.h"
 #include "YOMCST.h"
 #include "YOETHF.h"
 C
 c     Input variables
+      real airephy(klon)
       CHARACTER*15 tit
       INTEGER iprt,idiag, idiag2
@@ -292 +297 @@
 C         Cinetic Energy
           zec_col(i) =  zec_col(i)
-     $        +0.5*SQRT(u(i,k)**2+v(i,k)**2)*zairm(i,k)
+     $        +0.5*(u(i,k)**2+v(i,k)**2)*zairm(i,k)
 C         Air enthalpy
           zh_dair_col(i) = zh_dair_col(i) 
@@ -376 +381 @@
       IF (iprt.ge.2) THEN
         WRITE(6,9000) tit,pas(idiag),d_qt,d_qw,d_ql,d_qs
- 9000   format('Watter Mass Budget (kg/m2/s)',A15
+ 9000   format('Phys. Watter Mass Budget (kg/m2/s)',A15
      $      ,1i6,10(1pE14.6))
         WRITE(6,9001) tit,pas(idiag), d_h_vcol
- 9001   format('Enthalpy Budget (W/m2) ',A15,1i6,10(F8.2))
+ 9001   format('Phys. Enthalpy Budget (W/m2) ',A15,1i6,10(F8.2))
         WRITE(6,9002) tit,pas(idiag), d_ec
- 9002   format('Cinetic Energy Budget (W/m2) ',A15,1i6,10(F8.2))
+ 9002   format('Phys. Cinetic Energy Budget (W/m2) ',A15,1i6,10(F8.2))
       END IF 
 C