fix endrun exit issue

Author: biljanaorescanin

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/GEOScatchCNCLM51_GridComp/CLM51/shr_abort_mod.F90

@@ -38,46 +38,32 @@ module shr_abort_mod
 contains
 
   !===============================================================================
-  subroutine shr_abort_abort(string,ec,rc)
-    ! Consistent stopping mechanism
-
+  subroutine shr_abort_abort(string, ec, rc)
     !----- arguments -----
-    character(len=*)    , intent(in) , optional :: string  ! error message string
-    integer(shr_kind_in), intent(in) , optional :: ec      ! error code
-    integer(shr_kind_in), intent(out), optional :: rc      ! error code
-    
-    !----- local -----
-    !logical :: flag
+    character(len=*),     intent(in),  optional :: string
+    integer(shr_kind_in), intent(in),  optional :: ec
+    integer(shr_kind_in), intent(out), optional :: rc
 
-    ! Local version of the string.
-    ! (Gets a default value if string is not present.)
+    !----- local -----
     character(len=shr_kind_cx) :: local_string
-    !-------------------------------------------------------------------------------
+    integer :: exit_code
 
     if (present(string)) then
        local_string = trim(string)
     else
        local_string = "Unknown error submitted to shr_abort_abort."
     end if
 
+    ! Log to stdout/stderr and flush.
     call print_error_to_logs("ERROR", local_string)
 
- !   call shr_abort_backtrace()
-
-!    call shr_mpi_initialized(flag)
-
-    if (present(ec)) then
-       _ASSERT(.FALSE.,trim(local_string))
-    else
-       _ASSERT(.FALSE.,trim(local_string))
-    endif
-
-    ! A compiler's abort method may print a backtrace or do other nice
-    ! things, but in fact we can rarely leverage this, because MPI_Abort
-    ! usually sends SIGTERM to the process, and we don't catch that signal.
-    !call abort()
+    exit_code = 1
+    if (present(ec)) exit_code = ec
+    if (present(rc)) rc = exit_code
 
+    error stop "shr_abort_abort: hard abort"   ! prints and exits nonzero
   end subroutine shr_abort_abort
+
   !===============================================================================
 
   !===============================================================================