Changeset 3828 for dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd

Timestamp:

May 23, 2015, 8:10:21 AM (10 years ago)

Author:

millour

Message:

A couple of bug fixes and adaptations.
Results are now identical when running seq or MPI or OpenMP or mixed MPI/OpenMP bench case.
Bench results change wrt revision 5 reference, because longitudes and latitudes in physics are now inherited from dynamics and no longer loaded from startphy.nc file.
EM

Location:

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd

Files:

• add_phys_tend.F90 (modified) (1 diff)
• iophy.F90 (modified) (1 diff)
• phyetat0.F90 (modified) (3 diffs)

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/add_phys_tend.F90

@@ -223 +223 @@
          k=kqadrs(j)
          if(prt_level.ge.debug_level) THEN
-          print*,'WARNING  : EAU2 POUR LE POINT i itap lon lat txt jqbad zdq q zdql ql',i,itap,lon_degrees(i), lat_degrees(i), text,jqbad,&
-       &        zdq(i,k), q_seri(i,k)-zdq(i,k), zdql(i,k), ql_seri(i,k)-zdql(i,k)
+          print*,'WARNING  : EAU2 POUR LE POINT i itap lon lat txt jqbad zdq q zdql ql',i,itap,lon_degrees(i), lat_degrees(i), &
+       &        text,jqbad, zdq(i,k), q_seri(i,k)-zdq(i,k), zdql(i,k), ql_seri(i,k)-zdql(i,k)
 !!!       if(prt_level.ge.10.and.itap.GE.229.and.i.EQ.3027) THEN 
           print*,'l    T     dT       Q     dQ    '

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/iophy.F90

@@ -85 +85 @@
 
     ALLOCATE(io_lon(nbp_lon))
-    io_lon(1)=rlon_glo(1)
-    IF (nbp_lon > 1) io_lon(2:nbp_lon)=rlon_glo(3:nbp_lon+1)
+    IF (klon_glo == 1) THEN
+      io_lon(1)=rlon_glo(1)
+    ELSE 
+      io_lon(1:nbp_lon)=rlon_glo(2:nbp_lon+1)
+    ENDIF
     
 !! (I) dtnb   : total number of domains

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phyetat0.F90

@@ -73 +73 @@
   CHARACTER*2 str2
   LOGICAL :: found,phyetat0_get,phyetat0_srf
+  
+  REAL :: lon_startphy(klon), lat_startphy(klon)
 
   ! FH1D
@@ -136 +138 @@
   clesphy0(8)=tab_cntrl( 12 )
 
-
+  ! Sanity check on longitudes
+  CALL get_field("longitude",lon_startphy)
+  do i=1,klon
+    if (abs(lon_startphy(i)-lon_degrees(i))>=1) then
+      write(*,*) "phyetat0: Error! Longitude discrepancy wrt startphy file:",&
+                 " i=",i," lon_startphy(i)=",lon_startphy(i),&
+                 " lon_degrees(i)=",lon_degrees(i)
+      ! This is presumably serious enough to abort run
+      call abort_physic("phyetat0","discrepancy in longitudes!",1)
+    endif
+    if (abs(lon_startphy(i)-lon_degrees(i))>=0.0001) then
+      write(*,*) "phyetat0: Warning! Longitude discrepancy wrt startphy file:",&
+                 " i=",i," lon_startphy(i)=",lon_startphy(i),&
+                 " lon_degrees(i)=",lon_degrees(i)
+    endif
+  enddo
+  
+  ! Sanity check on latitudes
+  CALL get_field("latitude",lat_startphy)
+  do i=1,klon
+    if (abs(lat_startphy(i)-lat_degrees(i))>=1) then
+      write(*,*) "phyetat0: Error! Latitude discrepancy wrt startphy file:",&
+                 " i=",i," lat_startphy(i)=",lat_startphy(i),&
+                 " lat_degrees(i)=",lat_degrees(i)
+      ! This is presumably serious enough to abort run
+      call abort_physic("phyetat0","Discrepancy in latitudes!",1)
+    endif
+    if (abs(lat_startphy(i)-lat_degrees(i))>=0.0001) then
+      write(*,*) "phyetat0: Warning! Latitude discrepancy wrt startphy file:",&
+                 " i=",i," lat_startphy(i)=",lat_startphy(i),&
+                 " lat_degrees(i)=",lat_degrees(i)
+    endif
+  enddo
+  
   ! Lecture du masque terre mer
 
@@ -842 +877 @@
   ENDIF
 
-  CALL init_iophy_new(lon_degrees, lat_degrees)
+  CALL init_iophy_new(lat_degrees,lon_degrees)
 
   ! Initilialize module fonte_neige_mod