[Dart-dev] DART/branches Revision: 12532

[dart at ucar.edu]

thoar at ucar.edu
2018-04-18 12:41:07 -0600 (Wed, 18 Apr 2018)
46
Calling the error_handler() instead of stop.




Modified: DART/branches/openggcm/models/openggcm/openggcm_interp_mod.f90
===================================================================
--- DART/branches/openggcm/models/openggcm/openggcm_interp_mod.f90	2018-04-18 17:38:06 UTC (rev 12531)
+++ DART/branches/openggcm/models/openggcm/openggcm_interp_mod.f90	2018-04-18 18:41:07 UTC (rev 12532)
@@ -85,6 +85,8 @@
 real(r8),          intent(out) :: gz(nz,nt,np)
 integer, optional, intent(in)  :: test
 
+character(len=*), parameter :: routine = 'g_oplus_pre'
+
 real(r8) :: a(3,3), b(3,3), det
 real(r8) :: r, p, t
 
@@ -199,10 +201,10 @@
       !      needed later for the neighbor list
       jtet(1,i1)=jtet(1,i1)+1
       l=jtet(1,i1)
-      if(l.gt.NPOI_MAX)then
-      write(0,*)'error on NPOI'
-      stop
-      endif
+
+      if (l .gt. NPOI_MAX)  &
+         call error_handler(E_ERR, routine, 'error on NPOI', source, revision, revdate)
+
       jtet(l+1,i1)=ntet 
 94971 continue
       do l=1,jtet(1,i4)
@@ -210,10 +212,8 @@
       enddo 
       jtet(1,i4)=jtet(1,i4)+1
       l=jtet(1,i4)
-      if(l.gt.NPOI_MAX)then
-      write(0,*)'error on MPOI'
-      stop
-      endif
+      if (l.gt.NPOI_MAX) &
+         call error_handler(E_ERR, routine, 'error on MPOI', source, revision, revdate)
       jtet(l+1,i4)=ntet 
 94961 continue
       do l=1,jtet(1,i8)
@@ -221,10 +221,8 @@
       enddo 
       jtet(1,i8)=jtet(1,i8)+1
       l=jtet(1,i8)
-      if(l.gt.NPOI_MAX)then
-      write(0,*)'error on MPOI'
-      stop
-      endif
+      if(l.gt.NPOI_MAX) & 
+         call error_handler(E_ERR, routine, 'error on MPOI', source, revision, revdate)
       jtet(l+1,i8)=ntet 
 94951 continue
       do l=1,jtet(1,i7)
@@ -232,10 +230,8 @@
       enddo 
       jtet(1,i7)=jtet(1,i7)+1
       l=jtet(1,i7)
-      if(l.gt.NPOI_MAX)then
-      write(0,*)'error on MPOI'
-      stop
-      endif
+      if (l.gt.NPOI_MAX) &
+         call error_handler(E_ERR, routine, 'error on MPOI', source, revision, revdate)
       jtet(l+1,i7)=ntet 
 94941 continue
       !..... now compute mapping matrix isoparametric -->  physical
@@ -284,10 +280,8 @@
       jtet(1,i1)=jtet(1,i1)+1
       l=jtet(1,i1)
 
-      if(l.gt.NPOI_MAX)then
-         write(0,*)'error on MPOI'
-         stop
-      endif
+      if (l.gt.NPOI_MAX) &
+         call error_handler(E_ERR, routine, 'error on MPOI', source, revision, revdate)
 
       jtet(l+1,i1)=ntet !..... add me to the list
 94911 continue
@@ -296,10 +290,8 @@
       enddo 
       jtet(1,i5)=jtet(1,i5)+1
       l=jtet(1,i5)
-      if(l.gt.NPOI_MAX)then
-      write(0,*)'error on MPOI'
-      stop
-      endif
+      if(l.gt.NPOI_MAX) &
+         call error_handler(E_ERR, routine, 'error on MPOI', source, revision, revdate)
       jtet(l+1,i5)=ntet 
 94901 continue
       do l=1,jtet(1,i8)
@@ -307,10 +299,8 @@
       enddo 
       jtet(1,i8)=jtet(1,i8)+1
       l=jtet(1,i8)
-      if(l.gt.NPOI_MAX)then
-      write(0,*)'error on MPOI'
-      stop
-      endif