Changeset 2408 for LMDZ5/branches/testing/libf/phydev/physiq.F90

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phydev/physiq.F90 (modified) (7 diffs)

LMDZ5/branches/testing/libf/phydev/physiq.F90

@@ -5 +5 @@
      &            debut,lafin,jD_cur, jH_cur,pdtphys, &
      &            paprs,pplay,pphi,pphis,presnivs, &
-     &            u,v,t,qx, &
+     &            u,v,rot,t,qx, &
      &            flxmass_w, &
      &            d_u, d_v, d_t, d_qx, d_ps &
@@ -11 +11 @@
 
       USE dimphy, only : klon,klev
-      USE infotrac, only : nqtot
-      USE comgeomphy, only : rlatd
+      USE infotrac_phy, only : nqtot
+      USE geometry_mod, only : latitude
       USE comcstphy, only : rg
       USE iophy, only : histbeg_phy,histwrite_phy
@@ -18 +18 @@
       USE mod_phys_lmdz_para, only : jj_nb
       USE phys_state_var_mod, only : phys_state_var_init
+      USE mod_grid_phy_lmdz, ONLY: nbp_lon,nbp_lat
 
 #ifdef CPP_XIOS
@@ -26 +27 @@
 
       IMPLICIT none
-#include "dimensions.h"
-
-      integer,parameter :: jjmp1=jjm+1-1/jjm
-      integer,parameter :: iip1=iim+1
 !
 ! Routine argument:
@@ -55 +52 @@
       real,intent(out) :: d_qx(klon,klev,nqtot) ! physics tendency on tracers
       real,intent(out) :: d_ps(klon) ! physics tendency on surface pressure
-      real,intent(in) :: dudyn(iim+1,jjmp1,klev) ! Not used
+      real,intent(in) :: dudyn(nbp_lon+1,nbp_lat,klev) ! Not used
+      REAL, intent(in):: rot(klon, klev) ! Not used
+      ! relative vorticity, in s-1, needed for frontal waves 
 
 integer,save :: itau=0 ! counter to count number of calls to physics
@@ -114 +113 @@
   ! define variables which will be written in "histins.nc" file
   call histdef(nid_hist,'temperature','Atmospheric temperature','K', &
-               iim,jj_nb,nhori,klev,1,klev,zvertid,32, &
+               nbp_lon,jj_nb,nhori,klev,1,klev,zvertid,32, &
                'inst(X)',t_ops,t_wrt)
   call histdef(nid_hist,'u','Eastward Zonal Wind','m/s', &
-               iim,jj_nb,nhori,klev,1,klev,zvertid,32, &
+               nbp_lon,jj_nb,nhori,klev,1,klev,zvertid,32, &
                'inst(X)',t_ops,t_wrt)
   call histdef(nid_hist,'v','Northward Meridional Wind','m/s', &
-               iim,jj_nb,nhori,klev,1,klev,zvertid,32, &
+               nbp_lon,jj_nb,nhori,klev,1,klev,zvertid,32, &
                'inst(X)',t_ops,t_wrt)
   call histdef(nid_hist,'ps','Surface Pressure','Pa', &
-               iim,jj_nb,nhori,1,1,1,zvertid,32, &
+               nbp_lon,jj_nb,nhori,1,1,1,zvertid,32, &
                'inst(X)',t_ops,t_wrt)
   ! end definition sequence
@@ -160 +159 @@
 ! newtonian relaxation towards temp_newton()
 do k=1,klev
-  temp_newton(1:klon,k)=280.+cos(rlatd(1:klon))*40.-pphi(1:klon,k)/rg*6.e-3
+  temp_newton(1:klon,k)=280.+cos(latitude(1:klon))*40.-pphi(1:klon,k)/rg*6.e-3
   d_t(1:klon,k)=(temp_newton(1:klon,k)-t(1:klon,k))/1.e5
 enddo