Changeset 2395 for LMDZ5/trunk/libf/phydev

Timestamp:

Nov 18, 2015, 1:25:35 PM (9 years ago)

Author:

Ehouarn Millour

Message:

Bug fix for aquaplanets: "rlat" and "rlon" were uninitialized when written to startphy.nc; phyredem should write "longitude_deg" and "latitude_deg" to the file. Overall "rlat" and "rlon" should not be used and "latitude_deg" and "longitude_deg" should be used instead in the physics. To be further cleaned up.
Some cleanup on that mater also made in phydev.
Note that this change will make bench test results different for longitudes and latitudes, because of roundoff effects.
EM

Location:

LMDZ5/trunk/libf/phydev

Files:

• phyaqua_mod.F90 (modified) (1 diff)
• phyetat0.F90 (modified) (1 diff)
• phyredem.F90 (modified) (2 diffs)
• phys_state_var_mod.F90 (modified) (3 diffs)

LMDZ5/trunk/libf/phydev/phyaqua_mod.F90

@@ -15 +15 @@
   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-  USE phys_state_var_mod, ONLY: rlat, rlon, phys_state_var_init
+  USE phys_state_var_mod, ONLY: 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
 
-  ! local variables
-  REAL :: pi
-
-  ! initializations:
-  pi=2.*ASIN(1.)
-
   CALL phys_state_var_init()
-
-  rlat(1:klon_omp)=latitude_deg(1:klon_omp)
-  rlon(1:klon_omp)=longitude_deg(1:klon_omp)
 
 

LMDZ5/trunk/libf/phydev/phyetat0.F90

@@ -2 +2 @@
 ! $Id $
 !
-subroutine phyetat0(fichnom)
+SUBROUTINE phyetat0(fichnom)
 ! Load initial state for the physics
 ! and do some resulting initializations
 
-use iostart, only : open_startphy,get_field,close_startphy
-use iophy, only : init_iophy_new
-use phys_state_var_mod, only : rlat,rlon
+  USE dimphy, only: klon
+  USE iostart, ONLY : open_startphy,get_field,close_startphy
+  USE iophy, ONLY : init_iophy_new
+  USE geometry_mod, ONLY : longitude_deg, latitude_deg
 
-implicit none
+  IMPLICIT NONE
 
-character(len=*),intent(in) :: fichnom ! input file name
+  CHARACTER(len=*),INTENT(in) :: fichnom ! input file name
 
-! open physics initial state file:
-call open_startphy(fichnom)
+  REAL :: lon_startphy(klon), lat_startphy(klon)
+  INTEGER :: i
 
-! read latitudes
-call get_field("latitude",rlat)
+  ! open physics initial state file:
+  CALL open_startphy(fichnom)
 
-! read longitudes
-call get_field("longitude",rlon)
+  ! read latitudes and make a sanity check (because already known from dyn)
+  CALL get_field("latitude",lat_startphy)
+  DO i=1,klon
+    IF (ABS(lat_startphy(i)-latitude_deg(i))>=1) THEN
+      WRITE(*,*) "phyetat0: Error! Latitude discrepancy wrt startphy file:",&
+                 " i=",i," lat_startphy(i)=",lat_startphy(i),&
+                 " latitude_deg(i)=",latitude_deg(i)
+      ! This is presumably serious enough to abort run
+      CALL abort_physic("phyetat0","discrepancy in latitudes!",1)
+    ENDIF
+    IF (ABS(lat_startphy(i)-latitude_deg(i))>=0.0001) THEN
+      WRITE(*,*) "phyetat0: Warning! Latitude discrepancy wrt startphy file:",&
+                 " i=",i," lat_startphy(i)=",lat_startphy(i),&
+                 " latitude_deg(i)=",latitude_deg(i)
+    ENDIF
+  ENDDO
 
-! read in other variables here ...
+  ! read longitudes and make a sanity check (because already known from dyn)
+  CALL get_field("longitude",lon_startphy)
+  DO i=1,klon
+    IF (ABS(lon_startphy(i)-longitude_deg(i))>=1) THEN
+      WRITE(*,*) "phyetat0: Error! Longitude discrepancy wrt startphy file:",&
+                 " i=",i," lon_startphy(i)=",lon_startphy(i),&
+                 " longitude_deg(i)=",longitude_deg(i)
+      ! This is presumably serious enough to abort run
+      CALL abort_physic("phyetat0","discrepancy in longitudes!",1)
+    ENDIF
+    IF (ABS(lon_startphy(i)-longitude_deg(i))>=0.0001) THEN
+      WRITE(*,*) "phyetat0: Warning! Longitude discrepancy wrt startphy file:",&
+                 " i=",i," lon_startphy(i)=",lon_startphy(i),&
+                 " longitude_deg(i)=",longitude_deg(i)
+    ENDIF
+  ENDDO
 
-! close file
-call close_startphy
+  ! read in other variables here ...
 
-! do some more initializations
-call init_iophy_new(rlat,rlon)
+  ! close file
+  CALL close_startphy
 
-end subroutine phyetat0
+  ! do some more initializations
+  CALL init_iophy_new(latitude_deg,longitude_deg)
+
+END SUBROUTINE phyetat0

LMDZ5/trunk/libf/phydev/phyredem.F90

@@ -4 +4 @@
 SUBROUTINE phyredem (fichnom)
 
+  USE geometry_mod, ONLY : longitude_deg, latitude_deg
   USE iostart, ONLY: open_restartphy, close_restartphy, put_var, put_field
-  USE phys_state_var_mod, ONLY: rlon, rlat
 
   IMPLICIT NONE
@@ -27 +27 @@
   ! coordinates
 
-  CALL put_field("longitude", "Longitudes on physics grid", rlon)
+  CALL put_field("longitude", "Longitudes on physics grid", longitude_deg)
      
-  CALL put_field("latitude", "Latitudes on physics grid", rlat)
+  CALL put_field("latitude", "Latitudes on physics grid", latitude_deg)
 
   ! close file

LMDZ5/trunk/libf/phydev/phys_state_var_mod.F90

@@ -7 +7 @@
 !======================================================================
 
-USE dimphy, only : klon
+!USE dimphy, only : klon
  
 
-REAL, ALLOCATABLE, SAVE :: rlat(:), rlon(:)
-!$OMP THREADPRIVATE(rlat,rlon)
+!REAL, ALLOCATABLE, SAVE :: rlat(:), rlon(:)
+!!$OMP THREADPRIVATE(rlat,rlon)
 
 CONTAINS
@@ -17 +17 @@
 !======================================================================
   SUBROUTINE phys_state_var_init()
-  use dimphy, only : klon
+!  use dimphy, only : klon
 
-  if (.not.allocated(rlat)) then
-    ALLOCATE(rlat(klon),rlon(klon))
-  else
-    write(*,*) "phys_state_var_init: warning, rlat already allocated"
-  endif
+!  if (.not.allocated(rlat)) then
+!    ALLOCATE(rlat(klon),rlon(klon))
+!  else
+!    write(*,*) "phys_state_var_init: warning, rlat already allocated"
+!  endif
   
   END SUBROUTINE phys_state_var_init
@@ -29 +29 @@
 !======================================================================
   SUBROUTINE phys_state_var_end
-  use dimphy, only : klon
+!  use dimphy, only : klon
 
-  deallocate(rlat,rlon)
+!  deallocate(rlat,rlon)
 
   END SUBROUTINE phys_state_var_end