Changeset 1545 for trunk/LMDZ.TITAN/libf

Timestamp:

May 2, 2016, 8:31:27 AM (9 years ago)

Author:

emillour

Message:

Venus and Titan GCMs:

Adaptation wrt previous changes for Titan and Venus where
longitude and latitude arrays (in phycommon/geometry_mod) were overwritten
with values from startphy.nc files, where values are given in degrees.
For the sake of homegeneity with other physics package, revert to "default"
behaviour: longitude/latitude are in radians and longitude_deg/latitude_deg
are in degrees.
Also added checking in phyetat0 that the longitude/latitude read in the
restartphy.nc files match the ones provided by the dynamics.

EM

Location:

trunk/LMDZ.TITAN/libf/phytitan

Files:

• iophy.F90 (modified) (1 diff)
• muphys3D.F (modified) (1 diff)
• pg2.old (modified) (3 diffs)
• phyetat0.F90 (modified) (5 diffs)
• phyredem.F90 (modified) (2 diffs)
• physiq.F (modified) (7 diffs)
• radtitan.F (modified) (2 diffs)

trunk/LMDZ.TITAN/libf/phytitan/iophy.F90

@@ -29 +29 @@
   USE ioipsl
   implicit none
-    real,dimension(klon),intent(in) :: rlon
-    real,dimension(klon),intent(in) :: rlat
+    real,dimension(klon),intent(in) :: rlon ! longitudes, in degrees
+    real,dimension(klon),intent(in) :: rlat ! latitudes, in degrees
 
     REAL,dimension(klon_glo)        :: rlat_glo

trunk/LMDZ.TITAN/libf/phytitan/muphys3D.F

@@ -65 +65 @@
          use dimphy
 c         use radcommon_h, only : volume,rayon,vrat,drayon,dvolume
-         USE geometry_mod,  only: latitude
+         USE geometry_mod,  only: latitude ! in radians
 
          IMPLICIT NONE

trunk/LMDZ.TITAN/libf/phytitan/pg2.old

@@ -42 +42 @@
 
       use dimphy
-      USE geometry_mod, ONLY: latitude
+      USE geometry_mod, ONLY: latitude_deg
 #include "dimensions.h"
 #include "microtab.h"
@@ -180 +180 @@
       lati(1)     = 0.5*RPI
       DO ig=2,ngrid-1
-        lati(ig)  = latitude(2+(ig-2)*iim)*RPI/180.
+        lati(ig)  = latitude_deg(2+(ig-2)*iim)*RPI/180.
       ENDDO
       lati(ngrid) = -0.5*RPI
@@ -197 +197 @@
 c     print*,"ENTREE PG2 PREMIER APPEL"
 c     print*,airetot,' airetot?= ',4.*RPI*RA*RA
-c     print*,1,latitude(1),aire(1),aire(1)/airetot,' aires'
+c     print*,1,latitude_deg(1),aire(1),aire(1)/airetot,' aires'
 c     DO ig=2,ngrid-1
-c     print*,ig,latitude(2+(ig-2)*iim),aire(ig),aire(ig)/airetot,' aires'
+c     print*,ig,latitude_deg(2+(ig-2)*iim),aire(ig),aire(ig)/airetot,' aires'
 c     ENDDO
-c     print*,ngrid,latitude(klon),aire(ngrid),aire(ngrid)/airetot,' aires'
+c     print*,ngrid,latitude_deg(klon),aire(ngrid),aire(ngrid)/airetot,' aires'
 c     stop
       

trunk/LMDZ.TITAN/libf/phytitan/phyetat0.F90

@@ -13 +13 @@
       USE iostart
       USE infotrac
-      USE geometry_mod,  only: latitude,longitude
+      USE geometry_mod,  only: latitude_deg,longitude_deg
       USE time_phylmdz_mod, only: itau_phy, raz_date
 
@@ -33 +33 @@
 integer :: i,isoil
 CHARACTER(len=2) :: str2
+REAL :: lon_startphy(klon), lat_startphy(klon)
 
 ! les variables globales lues dans le fichier restart
@@ -75 +76 @@
       ENDIF
 
-! read latitudes
-call get_field("latitude",latitude,found)
-      IF (.not.found) THEN
-         PRINT*, 'phyetat0: Le champ <latitude> est absent'
-         CALL abort
-      ENDIF
-
-! read longitudes
-call get_field("longitude",longitude,found)
-      IF (.not.found) THEN
-         PRINT*, 'phyetat0: Le champ <longitude> est absent'
-         CALL abort
-      ENDIF
+! read latitudes and make a sanity check (because already known from dyn)
+call get_field("latitude",lat_startphy,found)
+IF (.not.found) THEN
+  PRINT*, 'phyetat0: Le champ <latitude> est absent'
+  CALL abort
+ENDIF
+DO i=1,klon
+  IF (ABS(lat_startphy(i)-latitude_deg(i))>=0.01) THEN
+    WRITE(*,*) "phyetat0: Warning! Latitude discrepancy wrt startphy file:",&
+               " i=",i," lat_startphy(i)=",lat_startphy(i),&
+               " latitude_deg(i)=",latitude_deg(i)
+    CALL abort
+  ENDIF
+ENDDO
+
+! read longitudes and make a sanity check (because already known from dyn)
+call get_field("longitude",lon_startphy,found)
+IF (.not.found) THEN
+  PRINT*, 'phyetat0: Le champ <longitude> est absent'
+  CALL abort
+ENDIF
+DO i=1,klon
+  IF (ABS(lon_startphy(i)-longitude_deg(i))>=0.01) THEN
+    WRITE(*,*) "phyetat0: Warning! Longitude discrepancy wrt startphy file:",&
+               " i=",i," lon_startphy(i)=",lon_startphy(i),&
+               " longitude_deg(i)=",longitude_deg(i)
+    CALL abort
+  ENDIF
+ENDDO
 
 ! read in other variables here ...
@@ -319 +336 @@
       resch4(1) = 0.    ! pole nord = 1 point
       DO i=2,klon
-          if ((latitude(i).ge.75..and.latitude(i).le.85.).or.  &
-              (latitude(i).ge.-85.and.latitude(i).le.-75.)) then
+          if ((latitude_deg(i).ge.75..and.latitude_deg(i).le.85.).or.  &
+              (latitude_deg(i).ge.-85.and.latitude_deg(i).le.-75.)) then
             resch4(i) = 2.
           else
@@ -352 +369 @@
 
 ! do some more initializations
-call init_iophy_new(latitude,longitude)
+call init_iophy_new(latitude_deg,longitude_deg)
 
 end subroutine phyetat0

trunk/LMDZ.TITAN/libf/phytitan/phyredem.F90

@@ -12 +12 @@
                           put_var,put_field
       USE infotrac
-      USE geometry_mod,  only: longitude, latitude
+      USE geometry_mod,  only: longitude_deg, latitude_deg
       USE time_phylmdz_mod, only: day_end, annee_ref, itau_phy, raz_date
 
@@ -64 +64 @@
 
       CALL put_field("longitude", &
-                     "Longitudes de la grille physique",longitude)
+                     "Longitudes de la grille physique",longitude_deg)
      
       CALL put_field("latitude", &
-                     "Latitudes de la grille physique",latitude)
+                     "Latitudes de la grille physique",latitude_deg)
 
 ! variables

trunk/LMDZ.TITAN/libf/phytitan/physiq.F

@@ -58 +58 @@
       USE infotrac
       use dimphy
-      USE geometry_mod, ONLY: longitude, latitude, cell_area, dx, dy
+      USE geometry_mod, ONLY: longitude, latitude, ! in radians
+     &                        longitude_deg, latitude_deg, ! in degrees
+     &                        cell_area, dx, dy
       use cpdet_mod, only: cpdet, t2tpot
       USE mod_phys_lmdz_para, only : is_parallel,jj_nb
@@ -861 +863 @@
 
 c dans zenang, Ls en degres ; dans mucorr, Ls en radians
-      call mucorr(klon,zls,latitude,rmu0bar,fractbar)
+      call mucorr(klon,zls,latitude_deg,rmu0bar,fractbar)
       IF (cycle_diurne) THEN
         zdtime=dtime*REAL(radpas) ! pas de temps du rayonnement (s)
-        CALL zenang(zlsdeg,gmtime,zdtime,latitude,longitude,rmu0,fract)
+        CALL zenang(zlsdeg,gmtime,zdtime,latitude_deg,longitude_deg,
+     &              rmu0,fract)
       ELSE
         rmu0  = rmu0bar
@@ -917 +920 @@
      $            paprs,pplay,ppk,radsol,falbe,
      e            solsw, sollw, sollwdown, fder,
-     e            longitude, latitude, dx, dy,   
+     e            longitude_deg, latitude_deg, dx, dy,   
      e            debut, lafin,
      s            d_t_vdf,d_u_vdf,d_v_vdf,d_ts,
@@ -1368 +1371 @@
 c A ADAPTER POUR VENUS ET TITAN!!!
 c            CALL lift_noro(klon,klev,dtime,paprs,pplay,
-c     e                   latitude,zmea,zstd,zpic,zgam,zthe,zpic,zval,
+c     e                   latitude_deg,zmea,zstd,zpic,zgam,zthe,zpic,zval,
 c     e                   igwd,idx,itest,
 c     e                   t_seri, u_seri, v_seri,
@@ -1425 +1428 @@
 c====================================================================
       if (ballons.eq.1) then
-         CALL ballon(30,pdtphys,rjourvrai,gmtime,latitude,longitude,
+         CALL ballon(30,pdtphys,rjourvrai,gmtime,
+     &               latitude_deg,longitude_deg,
 c    C               t,pplay,u,v,pphi)   ! alt above surface (smoothed for GCM)
      C               t,pplay,u,v,zphi)   ! alt above planet average radius
@@ -1459 +1463 @@
       CALL aaam_bud (27,klon,klev,rjourvrai,gmtime,
      C               ra,rg,romega,
-     C               latitude,longitude,pphis,
+     C               latitude_deg,longitude_deg,pphis,
      C               zustrdr,zustrli,zustrcl,
      C               zvstrdr,zvstrli,zvstrcl,
@@ -1545 +1549 @@
 c     DO k = 1, klev
 c     DO i = 1, klon
-c       mang(i,k) = RA*cos(latitude(i)*RPI/180.)
-c    .     *(u_seri(i,k)+RA*cos(latitude(i)*RPI/180.)*ROMEGA)
+c       mang(i,k) = RA*cos(latitude(i))
+c    .     *(u_seri(i,k)+RA*cos(latitude(i))*ROMEGA)
 c    .     *cell_area(i)*(paprs(i,k)-paprs(i,k+1))/RG
 c       mangtot=mangtot+mang(i,k)

trunk/LMDZ.TITAN/libf/phytitan/radtitan.F

@@ -33 +33 @@
       USE infotrac
       use dimphy
-      USE geometry_mod, ONLY: latitude
+      USE geometry_mod, ONLY: latitude ! in radians
       USE optcld, only : iniqcld
       use moyzon_mod, only:plevmoy
@@ -214 +214 @@
           somcoslat=0.
           do j=1,klon
-            coslat(j) = cos(latitude(j)*RPI/180.)
+            coslat(j) = cos(latitude(j))
             somcoslat=somcoslat+coslat(j)
           enddo