Changeset 2351 for LMDZ5/trunk/libf/phymar

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/phymar

Files:

• comgeomphy.F90 (deleted)
• init_phys_lmdz.F90 (deleted)
• phyaqua_mod.F90 (moved) (moved from LMDZ5/trunk/libf/phymar/phyaqua.F) (1 diff)
• physiq.F90 (modified) (7 diffs)

LMDZ5/trunk/libf/phymar/phyaqua_mod.F90

@@ -2 +2 @@
 ! $Id: $
 !
+MODULE phyaqua_mod
 
-      subroutine iniaqua(nlon,latfi,lonfi,iflag_phys)
+  IMPLICIT NONE
 
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!  Create an initial state (startphy.nc) for the physics
-!  Usefull for idealised cases (e.g. aquaplanets or testcases)
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+CONTAINS
 
-      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
-      implicit none
+  SUBROUTINE iniaqua(nlon, iflag_phys)
+
+  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+  !  Create an initial state (startphy.nc) for the physics
+  !  Usefull for idealised cases (e.g. aquaplanets or testcases)
+  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+  USE phys_state_var_mod, ONLY: rlat, rlon, phys_state_var_init
+  USE mod_phys_lmdz_para, ONLY: klon_omp
+  USE geometry_mod, ONLY: longitude_deg, latitude_deg
+  IMPLICIT NONE
       
-      integer,intent(in) :: nlon,iflag_phys
-      real,intent(in) :: lonfi(nlon),latfi(nlon)
+  INTEGER,INTENT(IN) :: nlon,iflag_phys
 
-! local variables
-      real :: pi
+  ! local variables
+  REAL :: pi
 
-! initializations:
-      pi=2.*asin(1.)
+  ! initializations:
+  pi=2.*ASIN(1.)
 
-      call phys_state_var_init()
+  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)
 
 
-! Here you could create an initial condition for the physics
-! ...
-! ... fill in the fields...
-! ...
-! ... and create a "startphy.nc" file
+  ! Here you could create an initial condition for the physics
+  ! ...
+  ! ... fill in the fields...
+  ! ...
+  ! ... and create a "startphy.nc" file
       CALL phyredem ("startphy.nc")
 
-      end
+  END SUBROUTINE iniaqua
 
+END MODULE phyaqua_mod

LMDZ5/trunk/libf/phymar/physiq.F90

@@ -11 +11 @@
      &            debut,lafin,jD_cur, jH_cur,pdtphys, &
      &            paprs,pplay,pphi,pphis,ppresnivs, &
-     &            u,v,t,qx, &
+     &            u,v,rot,t,qx, &
      &            flxmass_w, &
      &            d_u, d_v, d_t, d_qx, d_ps &
@@ -18 +18 @@
       USE dimphy, only : klon,klev,klevp1
       USE infotrac_phy, only : nqtot
-      USE comgeomphy, only : rlatd,rlond,airephy
+      USE geometry_mod, only : latitude,longitude,cell_area
       !USE comcstphy, only : rg
       USE iophy, only : histbeg_phy,histwrite_phy
@@ -498 +498 @@
 
 DO i=1,klon
-  IF (rlond(i) .LT. 0) THEN
-    lonh_HOST(i)=rlond(i)*12./rpi+24. ! from radians to hours
+  IF (longitude(i) .LT. 0) THEN
+    lonh_HOST(i)=longitude(i)*12./rpi+24. ! from radians to hours
    ELSE
-    lonh_HOST(i)=rlond(i)*12./rpi ! from radians to hours
+    lonh_HOST(i)=longitude(i)*12./rpi ! from radians to hours
   ENDIF
 ENDDO
-latr_HOST(:)=rlatd(:) ! from radians to radians
+latr_HOST(:)=latitude(:) ! from radians to radians
 
 !PRINT*, 'lonh_HOST(:)=',lonh_HOST(:)
@@ -689 +689 @@
 PRINT*, 'Initialisation de la temperature de surface avec les SST aquaplanète'
           DO i = 1,klon
-            Ts___HOST(i)=273.+27.*(1-sin(1.5*rlatd(i))**2)
-            IF ((rlatd(i).GT.1.0471975).OR.(rlatd(i).LT.-1.0471975)) THEN
+            Ts___HOST(i)=273.+27.*(1-sin(1.5*latitude(i))**2)
+            IF ((latitude(i).GT.1.0471975).OR.(latitude(i).LT.-1.0471975)) THEN
               Ts___HOST(i)=273.
             ENDIF
@@ -791 +791 @@
 DO k = 1, klev
   i=klev+1-k
-  !omega(i,k) = RG*flxmass_w(i,k) / airephy(i) ! omega en Pa/s
-  Wa___HOST(:,i)=flxmass_w(:,k) / airephy(:) * (gZam_HOST(:,i+1) - gZam_HOST(:,i))/(paprs(:,k+1)-paprs(:,k)) ! Equilibre hydrostatique
+  !omega(i,k) = RG*flxmass_w(i,k) / cell_area(i) ! omega en Pa/s
+  Wa___HOST(:,i)=flxmass_w(:,k) / cell_area(:) * (gZam_HOST(:,i+1) - gZam_HOST(:,i))/(paprs(:,k+1)-paprs(:,k)) ! Equilibre hydrostatique
 END DO
 Wa___HOST(:,klev)=0 ! Vitesse nulle à la surface.
@@ -853 +853 @@
 !IF (debut) THEN
   DO i=1,klon
-    sst__HOST(i)=273.+27.*(1-sin(1.5*rlatd(i))**2)
-    IF ((rlatd(i).GT.1.0471975).OR.(rlatd(i).LT.-1.0471975)) THEN
+    sst__HOST(i)=273.+27.*(1-sin(1.5*latitude(i))**2)
+    IF ((latitude(i).GT.1.0471975).OR.(latitude(i).LT.-1.0471975)) THEN
       sst__HOST(i)=273.
     ENDIF
@@ -908 +908 @@
       ikl0 = i
       PRINT*,'Attention : NaN at'
-      PRINT*,'longitude=',rlond(i)*180/rpi
-      PRINT*,'latitude=',rlatd(i)*180/rpi
+      PRINT*,'longitude=',longitude(i)*180/rpi
+      PRINT*,'latitude=',latitude(i)*180/rpi
     ENDIF
   ENDDO