Changeset 2037 for LMDZ5/trunk/libf/phylmd

Timestamp:

May 6, 2014, 4:56:20 PM (11 years ago)

Author:

lguez

Message:

PVteta computed by PVtheta was not used. Also there were a couple of
problems with PVtheta:

-- PVtheta calls tetalevel in phylmd, and interpolates at

Earth-specific values of potential temperature.

-- PVtheta calls tourabs, and the computation of rot in tourabs should

be modified (it is not correct when there is a zoom).

-- Even when there is no zoom, the computation of rot in tourabs

should probably be modified: directly combine vcov and ucov, as in
tourpot, instead of dividing by cv and cu.

Location:

LMDZ5/trunk/libf/phylmd

Files:

• lmdz1d.F90 (modified) (2 diffs)
• phys_output_mod.F90 (modified) (3 diffs)
• physiq.F90 (modified) (4 diffs)
• tetalevel.F90 (deleted)

LMDZ5/trunk/libf/phylmd/lmdz1d.F90

@@ -209 +209 @@
       integer jjmp1
       parameter (jjmp1=jjm+1-1/jjm)
-      INTEGER nbteta
-      PARAMETER(nbteta=3)
       REAL dudyn(iim+1,jjmp1,llm)
-      REAL PVteta(1,nbteta)
       INTEGER read_climoz 
 !Al1
@@ -803 +800 @@
      &              u,v,temp,q,omega2,                                      &
      &              du_phys,dv_phys,dt_phys,dq,dpsrf,                        &
-     &              dudyn,PVteta)
+     &              dudyn)
         firstcall=.false.
 

LMDZ5/trunk/libf/phylmd/phys_output_mod.F90

@@ -26 +26 @@
 
   SUBROUTINE phys_output_open(rlon,rlat,pim,tabij,ipt,jpt,plon,plat, &
-       jjmp1,nlevSTD,clevSTD,rlevSTD,nbteta, &
-       ctetaSTD, dtime, ok_veget, &
+       jjmp1,nlevSTD,clevSTD,rlevSTD, dtime, ok_veget, &
        type_ocean, iflag_pbl,ok_mensuel,ok_journe, &
        ok_hf,ok_instan,ok_LES,ok_ade,ok_aie, read_climoz, &
@@ -82 +81 @@
 
     INTEGER                               :: jjmp1
-    INTEGER                               :: nbteta, nlevSTD, radpas
+    INTEGER                               :: nlevSTD, radpas
     LOGICAL                               :: ok_mensuel, ok_journe, ok_hf, ok_instan
     LOGICAL                               :: ok_LES,ok_ade,ok_aie,flag_aerosol_strat
@@ -106 +105 @@
     CHARACTER(LEN=2)                      :: bb3
     CHARACTER(LEN=6)                      :: type_ocean
-    CHARACTER(LEN=3)                      :: ctetaSTD(nbteta)
     INTEGER, DIMENSION(iim*jjmp1)         ::  ndex2d
     INTEGER, DIMENSION(iim*jjmp1*klev)    :: ndex3d

LMDZ5/trunk/libf/phylmd/physiq.F90

@@ -8 +8 @@
      flxmass_w, &
      d_u, d_v, d_t, d_qx, d_ps &
-     , dudyn &
-     , PVteta)
+     , dudyn)
 
   USE ioipsl, only: histbeg, histvert, histdef, histend, histsync, &
@@ -104 +103 @@
   !! d_qx----output-R-tendance physique de "qx" (kg/kg/s)
   !! d_ps----output-R-tendance physique de la pression au sol
-  !!IM
-  !! PVteta--output-R-vorticite potentielle a des thetas constantes
   !!======================================================================
   include "dimensions.h"
@@ -250 +247 @@
   !IM definition dynamique o_trac dans phys_output_open
   !      type(ctrl_out) :: o_trac(nqtot)
-  !
-  !IM Amip2 PV a theta constante 
-  !
-  INTEGER nbteta
-  PARAMETER(nbteta=3)
-  CHARACTER*3 ctetaSTD(nbteta)
-  DATA ctetaSTD/'350','380','405'/
-  SAVE ctetaSTD
-  !$OMP THREADPRIVATE(ctetaSTD)
-  REAL rtetaSTD(nbteta)
-  DATA rtetaSTD/350., 380., 405./
-  SAVE rtetaSTD
-  !$OMP THREADPRIVATE(rtetaSTD)     
-  !
-  REAL PVteta(klon,nbteta)
-  !
-  !MI Amip2 PV a theta constante
-
-  !ym      INTEGER klevp1, klevm1
-  !ym      PARAMETER(klevp1=klev+1,klevm1=klev-1)
-  !ym      include "raddim.h"
-  !
-  !
-  !IM Amip2
+
   ! variables a une pression donnee
   !
@@ -1256 +1230 @@
      call phys_output_open(rlon,rlat,nCFMIP,tabijGCM, &
           iGCM,jGCM,lonGCM,latGCM, &
-          jjmp1,nlevSTD,clevSTD,rlevSTD, &
-          nbteta, ctetaSTD, dtime,ok_veget, &
+          jjmp1,nlevSTD,clevSTD,rlevSTD, dtime,ok_veget, &
           type_ocean,iflag_pbl,ok_mensuel,ok_journe, &
           ok_hf,ok_instan,ok_LES,ok_ade,ok_aie,  &