Skip to content
Snippets Groups Projects
Commit 5f01d732 authored by Juan Escobar's avatar Juan Escobar
Browse files

Juan 25/03/2024:ECRAD_mnh, modif mpl_abort_mod.F90/sdl_mod.F90 <-> avoid...

Juan 25/03/2024:ECRAD_mnh, modif mpl_abort_mod.F90/sdl_mod.F90 <-> avoid linker problem with unused routines
parent 4ca5f202
No related branches found
No related tags found
No related merge requests found
...@@ -55,9 +55,9 @@ IF (MAB_CNT == 0) THEN ...@@ -55,9 +55,9 @@ IF (MAB_CNT == 0) THEN
CLTRBK='1' CLTRBK='1'
#endif #endif
IF (LHOOK .AND. CLTRBK=='1') THEN IF (LHOOK .AND. CLTRBK=='1') THEN
CALL TABORT() ! should not hang and calls DrHook's error traceback processing (more robust nowadays) !CALL TABORT() ! should not hang and calls DrHook's error traceback processing (more robust nowadays)
ELSE ELSE
CALL SDL_TRACEBACK(ITID) ! this will no longer hang with Intel compiler because intel tracebackqq is called, not linux traceback !CALL SDL_TRACEBACK(ITID) ! this will no longer hang with Intel compiler because intel tracebackqq is called, not linux traceback
ENDIF ENDIF
ENDIF ENDIF
!$OMP END CRITICAL (CRIT_MPL_ABORT) !$OMP END CRITICAL (CRIT_MPL_ABORT)
......
...@@ -60,7 +60,7 @@ ENDIF ...@@ -60,7 +60,7 @@ ENDIF
IF (LHOOK) THEN IF (LHOOK) THEN
IPRINT_OPTION = 2 IPRINT_OPTION = 2
ILEVEL = 0 ILEVEL = 0
CALL C_DRHOOK_PRINT(0, ITID, IPRINT_OPTION, ILEVEL) ! from drhook.c !CALL C_DRHOOK_PRINT(0, ITID, IPRINT_OPTION, ILEVEL) ! from drhook.c
ENDIF ENDIF
#if defined(VPP) #if defined(VPP)
CALL ERRTRA CALL ERRTRA
...@@ -74,7 +74,7 @@ ENDIF ...@@ -74,7 +74,7 @@ ENDIF
CALL GET_ENVIRONMENT_VARIABLE("EC_LINUX_TRBK",CLTRBK) CALL GET_ENVIRONMENT_VARIABLE("EC_LINUX_TRBK",CLTRBK)
IF (CLTRBK=='1') THEN IF (CLTRBK=='1') THEN
WRITE(0,*)'SDL_TRACEBACK: Calling LINUX_TRBK, THRD = ',ITID WRITE(0,*)'SDL_TRACEBACK: Calling LINUX_TRBK, THRD = ',ITID
CALL LINUX_TRBK() ! See ifsaux/utilities/linuxtrbk.c !CALL LINUX_TRBK() ! See ifsaux/utilities/linuxtrbk.c
WRITE(0,*)'SDL_TRACEBACK: Done LINUX_TRBK, THRD = ',ITID WRITE(0,*)'SDL_TRACEBACK: Done LINUX_TRBK, THRD = ',ITID
ELSE ELSE
WRITE(0,*)'SDL_TRACEBACK: Calling INTEL_TRBK, THRD = ',ITID WRITE(0,*)'SDL_TRACEBACK: Calling INTEL_TRBK, THRD = ',ITID
...@@ -89,7 +89,7 @@ ENDIF ...@@ -89,7 +89,7 @@ ENDIF
WRITE(0,*)'SDL_TRACEBACK: Done GDB_TRBK, THRD = ',ITID WRITE(0,*)'SDL_TRACEBACK: Done GDB_TRBK, THRD = ',ITID
#elif defined(LINUX) || defined(SUN4) #elif defined(LINUX) || defined(SUN4)
WRITE(0,*)'SDL_TRACEBACK: Calling LINUX_TRBK, THRD = ',ITID WRITE(0,*)'SDL_TRACEBACK: Calling LINUX_TRBK, THRD = ',ITID
CALL LINUX_TRBK() ! See ifsaux/utilities/linuxtrbk.c !CALL LINUX_TRBK() ! See ifsaux/utilities/linuxtrbk.c
WRITE(0,*)'SDL_TRACEBACK: Done LINUX_TRBK, THRD = ',ITID WRITE(0,*)'SDL_TRACEBACK: Done LINUX_TRBK, THRD = ',ITID
#elif defined(NECSX) #elif defined(NECSX)
! MESPUT writes out onto unit 6 ! MESPUT writes out onto unit 6
...@@ -119,7 +119,7 @@ SUBROUTINE SDL_SRLABORT ...@@ -119,7 +119,7 @@ SUBROUTINE SDL_SRLABORT
! ------- ! -------
! To abort in serial environment ! To abort in serial environment
CALL EC_RAISE(SIGABRT) !CALL EC_RAISE(SIGABRT)
STOP 'SDL_SRLABORT' STOP 'SDL_SRLABORT'
END SUBROUTINE SDL_SRLABORT END SUBROUTINE SDL_SRLABORT
...@@ -163,7 +163,7 @@ CALL MPI_ABORT(MPI_COMM_WORLD,IRETURN_CODE,IERROR) ! Tracked by the supervisor/p ...@@ -163,7 +163,7 @@ CALL MPI_ABORT(MPI_COMM_WORLD,IRETURN_CODE,IERROR) ! Tracked by the supervisor/p
#endif #endif
CALL EC_RAISE(SIGABRT) ! In case ever ends up here !CALL EC_RAISE(SIGABRT) ! In case ever ends up here
STOP 'SDL_DISABORT' STOP 'SDL_DISABORT'
END SUBROUTINE SDL_DISABORT END SUBROUTINE SDL_DISABORT
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment