Changeset 2351 for LMDZ5/trunk/libf/phydev

Timestamp:

Aug 25, 2015, 5:14:59 PM (9 years ago)

Author:

Ehouarn Millour

Message:

More on physics/dynamics separation and cleanup:

• Set things up so that all physics-related initializations are done via iniphysiq.
• Created a "geometry_mod.F90" module in phy_common to store information on the loacl grid (i.e. replaces comgeomphy) and moreover give these variables more obvious names (e.g.: rlond => longitude, rlatd => latitude, airephy => cell_area).
• removed obsolete comgeomphy.h and comgeomphy.F90

EM

Location:

LMDZ5/trunk/libf/phydev

Files:

• comgeomphy.F90 (deleted)
• init_phys_lmdz.F90 (deleted)
• phyaqua_mod.F90 (modified) (3 diffs)
• physiq.F90 (modified) (4 diffs)

LMDZ5/trunk/libf/phydev/phyaqua_mod.F90

@@ -8 +8 @@
 CONTAINS
 
-  SUBROUTINE iniaqua(nlon, latfi, lonfi, iflag_phys)
+  SUBROUTINE iniaqua(nlon, iflag_phys)
 
   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -17 +17 @@
   USE phys_state_var_mod, ONLY: rlat, rlon, phys_state_var_init
   USE mod_phys_lmdz_para, ONLY: klon_omp
-  USE comgeomphy, ONLY: rlond, rlatd
+  USE geometry_mod, ONLY: longitude_deg, latitude_deg
   IMPLICIT NONE
       
   INTEGER,INTENT(IN) :: nlon,iflag_phys
-  REAL,INTENT(IN) :: lonfi(nlon),latfi(nlon)
 
   ! local variables
@@ -31 +30 @@
   CALL phys_state_var_init()
 
-  rlat(1:klon_omp)=rlatd(1:klon_omp)*180./pi
-  rlon(1:klon_omp)=rlond(1:klon_omp)*180./pi
+  rlat(1:klon_omp)=latitude_deg(1:klon_omp)
+  rlon(1:klon_omp)=longitude_deg(1:klon_omp)
 
 

LMDZ5/trunk/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 &
@@ -12 +12 @@
       USE dimphy, only : klon,klev
       USE infotrac_phy, only : nqtot
-      USE comgeomphy, only : rlatd
+      USE geometry_mod, only : latitude
       USE comcstphy, only : rg
       USE iophy, only : histbeg_phy,histwrite_phy
@@ -53 +53 @@
       real,intent(out) :: d_ps(klon) ! physics tendency on surface pressure
       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
@@ -157 +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