Changeset 2160 for LMDZ5/branches/testing/libf/dyn3dmem/integrd_loc.F

Timestamp:

Nov 28, 2014, 4:36:29 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2070:2158 into testing branch. Compilation problems introduced by revision r2155 have been corrected by hand

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3dmem/integrd_loc.F (modified) (3 diffs)

LMDZ5/branches/testing/libf/dyn3dmem/integrd_loc.F

@@ -147 +147 @@
 !     &                   MPI_LOGICAL,MPI_LOR,COMM_LMDZ,ierr)
       IF( .NOT. checksum ) THEN
-          write(lunout,*) "integrd: negative surface pressure ",
-     &                                                ps(stop_it)
+         write(lunout,*) "integrd: ps = ", ps(stop_it)
          write(lunout,*) " at node ij =", stop_it
          ! since ij=j+(i-1)*jjp1 , we have
@@ -155 +154 @@
 !         write(lunout,*) " lon = ",rlonv(i)*180./pi, " deg",
 !     &                   " lat = ",rlatu(j)*180./pi, " deg"
+         call abort_gcm("integrd_loc", "negative surface pressure", 1)
       ENDIF
 
@@ -183 +183 @@
      .                dq(:,:,j))
         enddo
-      STOP
+        call abort_gcm("integrd_loc", "", 1)
       ENDIF