From 5f01d73253f17bafcdc97011b33d73eee92e84e3 Mon Sep 17 00:00:00 2001
From: Juan Escobar <escj@aero.obs-mip.fr>
Date: Mon, 25 Mar 2024 15:37:32 +0100
Subject: [PATCH] Juan 25/03/2024:ECRAD_mnh, modif
mpl_abort_mod.F90/sdl_mod.F90 <-> avoid linker problem with unused routines
---
.../ecrad-1.4.0_mnh/drhook/drhook/mpl_abort_mod.F90 | 4 ++--
src/LIB/RAD/ecrad-1.4.0_mnh/drhook/drhook/sdl_mod.F90 | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/LIB/RAD/ecrad-1.4.0_mnh/drhook/drhook/mpl_abort_mod.F90 b/src/LIB/RAD/ecrad-1.4.0_mnh/drhook/drhook/mpl_abort_mod.F90
index 199450f2a..9c5f7e1a9 100644
--- a/src/LIB/RAD/ecrad-1.4.0_mnh/drhook/drhook/mpl_abort_mod.F90
+++ b/src/LIB/RAD/ecrad-1.4.0_mnh/drhook/drhook/mpl_abort_mod.F90
@@ -55,9 +55,9 @@ IF (MAB_CNT == 0) THEN
CLTRBK='1'
#endif
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
- 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
!$OMP END CRITICAL (CRIT_MPL_ABORT)
diff --git a/src/LIB/RAD/ecrad-1.4.0_mnh/drhook/drhook/sdl_mod.F90 b/src/LIB/RAD/ecrad-1.4.0_mnh/drhook/drhook/sdl_mod.F90
index 4b3ccf424..0b3fb317b 100644
--- a/src/LIB/RAD/ecrad-1.4.0_mnh/drhook/drhook/sdl_mod.F90
+++ b/src/LIB/RAD/ecrad-1.4.0_mnh/drhook/drhook/sdl_mod.F90
@@ -60,7 +60,7 @@ ENDIF
IF (LHOOK) THEN
IPRINT_OPTION = 2
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
#if defined(VPP)
CALL ERRTRA
@@ -74,7 +74,7 @@ ENDIF
CALL GET_ENVIRONMENT_VARIABLE("EC_LINUX_TRBK",CLTRBK)
IF (CLTRBK=='1') THEN
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
ELSE
WRITE(0,*)'SDL_TRACEBACK: Calling INTEL_TRBK, THRD = ',ITID
@@ -89,7 +89,7 @@ ENDIF
WRITE(0,*)'SDL_TRACEBACK: Done GDB_TRBK, THRD = ',ITID
#elif defined(LINUX) || defined(SUN4)
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
#elif defined(NECSX)
! MESPUT writes out onto unit 6
@@ -119,7 +119,7 @@ SUBROUTINE SDL_SRLABORT
! -------
! To abort in serial environment
-CALL EC_RAISE(SIGABRT)
+!CALL EC_RAISE(SIGABRT)
STOP 'SDL_SRLABORT'
END SUBROUTINE SDL_SRLABORT
@@ -163,7 +163,7 @@ CALL MPI_ABORT(MPI_COMM_WORLD,IRETURN_CODE,IERROR) ! Tracked by the supervisor/p
#endif
-CALL EC_RAISE(SIGABRT) ! In case ever ends up here
+!CALL EC_RAISE(SIGABRT) ! In case ever ends up here
STOP 'SDL_DISABORT'
END SUBROUTINE SDL_DISABORT
--
GitLab