From bc0fa37d34c500011e2e80888b1a7c456ba9ef11 Mon Sep 17 00:00:00 2001
From: Lizzie Lundgren <elundgren@seas.harvard.edu>
Date: Fri, 28 Jun 2024 13:20:41 -0400
Subject: [PATCH] Fix implementation of error handling in models that use MAPL

Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
---
 src/Core/cldj_error_mod.F90 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Core/cldj_error_mod.F90 b/src/Core/cldj_error_mod.F90
index 4e5212e..28f6a2e 100644
--- 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