Fix implementation of error handling in models that use MAPL

Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
geoschem · Jun 28, 2024 · bc0fa37 · bc0fa37
1 parent bce8992
commit bc0fa37
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/Core/cldj_error_mod.F90 b/src/Core/cldj_error_mod.F90
@@ -25,13 +25,17 @@ subroutine CLOUDJ_ERROR_STOP( errmsg, loc )
     character(len=*), intent(in) :: loc
 
     character(len=1023) :: msg
+#if defined( MAPL_ESMF )
+    integer :: rc
+#endif
 
     ! Define message
     msg = 'CLOUDJ_ERROR_STOP: '//TRIM(errmsg)//' --> LOCATION: '//TRIM(loc)
 
     ! Stop run
 #if defined( MAPL_ESMF )
-    __Iam__(msg)
+    RC = CLDJ_FAILURE
+    _ASSERT(RC==CLDJ_SUCCESS,TRIM(msg))
 #elif defined( MODEL_CESM )
     call endrun(msg)
 #elif defined( MODEL_GCCLASSIC )
@@ -52,7 +56,7 @@ subroutine CLOUDJ_ERROR( errmsg, loc, rc )
 #elif MAPL_ESMF
 #include "MAPL_Generic.h"
     USE ESMF
-    USE MAPL_Mod
+    USE MAPLBase_Mod
 #endif
 
     CHARACTER(LEN=*), INTENT(IN   )  :: errmsg  ! Message to display