Changeset 169 in lmdz_wrf for branches

Timestamp:

Aug 12, 2014, 11:17:07 AM (10 years ago)

Author:

lfita

Message:

Addig new 'abort_gcm_point', 'abort_gcm_2Dpoint' more informative subroutines

Location:

branches/LMDZ_WRFmeas_develop/WRFV3/lmdz

Files:

• abort_gcm.F90 (modified) (7 diffs)
• thermcellV0_main.F90 (modified) (2 diffs)
• thermcell_dq.F90 (modified) (2 diffs)
• thermcell_main.F90 (modified) (1 diff)

branches/LMDZ_WRFmeas_develop/WRFV3/lmdz/abort_gcm.F90

@@ -48 +48 @@
 
 ! L. Fita, LMD. August 2014
-      SUBROUTINE abort_gcm_point(modname, message, ierr, point)
+      SUBROUTINE abort_gcm_point(modname, message, ierr, point, val, i1fc, thres)
      
 #ifdef CPP_IOIPSL
@@ -66 +66 @@
 !C         ierr    = severity of situation ( = 0 normal )
 !C         point   = 1D point where the error ocurred
+!C         val     = wrong value
+!C         if1c    = condition as 1 character 
+!C         thres   = threshold value
 
       character(len=*) modname
@@ -71 +74 @@
       character(len=*) message
       INTEGER, INTENT(IN)                                :: point
+      REAL, INTENT(IN)                                   :: val, thres
+      CHARACTER(LEN=1), INTENT(IN)                       :: if1c
 
       write(lunout,*) 'in abort_gcm'
@@ -83 +88 @@
 !c     call histclo(5)
       write(lunout,*) 'Stopping in ', modname
-      write(lunout,*) 'Stopping at point ', point
+      write(lunout,*) 'Stopping at point ', point,' wrong: ',val, if1c, thres
       write(lunout,*) 'Reason = ',message
       if (ierr .eq. 0) then
@@ -95 +100 @@
 
 ! L. Fita, LMD. August 2014
-      SUBROUTINE abort_gcm_2Dpoint(modname, message, ierr, point)
+      SUBROUTINE abort_gcm_2Dpoint(modname, message, ierr, pk, pl, val, i1fc, thres)
      
 #ifdef CPP_IOIPSL
@@ -112 +117 @@
 !C         message = stuff to print
 !C         ierr    = severity of situation ( = 0 normal )
-!C         point   = 2D point where the error ocurred
+!C         pk, pl  = 2D point where the error ocurred (klev, klon)
+!C         val     = wrong value
+!C         if1c    = condition as 1 character 
+!C         thres   = threshold value
 
       character(len=*) modname
       integer ierr
       character(len=*) message
-      INTEGER, DIMENSION(2), INTENT(IN)                  :: point
+      INTEGER, INTENT(IN)                                :: pk, pl
+      REAL, INTENT(IN)                                   :: val, thres
+      CHARACTER(LEN=1), INTENT(IN)                       :: if1c
 
       write(lunout,*) 'in abort_gcm'
@@ -130 +140 @@
 !c     call histclo(5)
       write(lunout,*) 'Stopping in ', modname
-      write(lunout,*) 'Stopping at point (klon, klev)', point
+      write(lunout,*) 'Stopping at point (klon, klev):', pk, ',', pl,' wrong: ',val, &
+        if1c, thres
       write(lunout,*) 'Reason = ',message
       if (ierr .eq. 0) then

branches/LMDZ_WRFmeas_develop/WRFV3/lmdz/thermcellV0_main.F90

@@ -607 +607 @@
            zcon2(ig)=zlay(ig,nlay)-(pcon(ig)-pplay(ig,nlay))/(RG*rho(ig,nlay))/100.
            abort_message = 'thermcellV0_main: les thermiques vont trop haut '
-           CALL abort_gcm (modname,abort_message,1)
+! L. Fita, LMD August 2014. Replacing by something more informative
+!           CALL abort_gcm (modname,abort_message,1)
+           CALL abort_gcm_point (modname,abort_message,1,ig,pcon(ig),'<',            &
+             pplay(ig,nlay))
         endif
       enddo
@@ -900 +903 @@
                 print*,'wmax_sec',wmax_sec(ig)
                 abort_message = 'zdenom<1.e-14'
-                CALL abort_gcm (modname,abort_message,1)
+! L. Fita, LMD August 2014. Changing it for something more informative
+!                CALL abort_gcm (modname,abort_message,1)
+                CALL abort_gcm_point (modname,abort_message,1,ig,zdenom,'<',1.e-14)
+
              endif
              if ((zmax_sec(ig).gt.1.e-10).and.(iflag_thermals_ed.eq.0)) then 

branches/LMDZ_WRFmeas_develop/WRFV3/lmdz/thermcell_dq.F90

@@ -54 +54 @@
                print*,'entr dt > m ',entr(ig,k)*ptimestep,masse(ig,k)
                abort_message = ''
-               PRINT *,'  Lluis aborting at :', ig, k
-               CALL abort_gcm (modname,abort_message,1)
+! L. Fita, LMD. August 2014. Changing for something more informative
+!               CALL abort_gcm (modname,abort_message,1)
+               CALL abort_gcm_2Dpoint (modname,abort_message,1,ig,k,entr(ig,k),'>',zzm)
             endif
          enddo
@@ -189 +190 @@
                print*,'entr dt > m ',entr(ig,k)*ptimestep,masse(ig,k)
                abort_message = ''
-               PRINT *,'  Lluis aborting at :', ig, k
-               CALL abort_gcm (modname,abort_message,1)
+! L. Fita, LMD August 2014. Changing for something more informative
+!               CALL abort_gcm (modname,abort_message,1)
+               CALL abort_gcm_2Dpoint (modname,abort_message,1,ig,k,entr(ig,k),'>',  &
+                 zzm)
             endif
          enddo

branches/LMDZ_WRFmeas_develop/WRFV3/lmdz/thermcell_main.F90

@@ -721 +721 @@
         if (pcon(ig).le.pplay(ig,nlay)) then 
            zcon2(ig)=zlay(ig,nlay)-(pcon(ig)-pplay(ig,nlay))/(RG*rho(ig,nlay))/100.
-           PRINT *,'  Lluis aborting at :', ig
+           abort_message = 'thermcellV0_main: les thermiques vont trop haut '
+! L. Fita, LMD. August 2014. Including something more informative
+           CALL abort_gcm_point (modname,abort_message,1,ig,pcon(ig),'<',            &
+             pplay(ig,nlay))
            ierr=1
         endif