Changeset 3505

Timestamp:

May 16, 2019, 4:24:44 PM (6 years ago)

Author:

yann meurdesoif

Message:

Solve some wrong discrepency problem when comparing longitude from a restartphy file. The current discrepency test is not detecting that 360°==0°, so in some case it may stop the run for a wrong reason.

YM

File:

• LMDZ6/trunk/libf/phylmd/phyetat0.F90 (modified) (1 diff)

LMDZ6/trunk/libf/phylmd/phyetat0.F90

@@ -163 +163 @@
   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)
+      IF (ABS(360-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
     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)
+    IF (ABS(lon_startphy(i)-longitude_deg(i))>=1) THEN
+      IF (ABS(360-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 
     ENDIF
   ENDDO