Fix build errors when building with MAPL2

Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>

Author: lizziel

CMakeLists.txt

@@ -87,9 +87,12 @@ if(MODEL_GCHP)
   set(KPPSA OFF CACHE BOOL
     "Switch to build the KPP-Standalone Box Model"
   )
+  set(MAPL3 OFF CACHE BOOL
+    "Switch to build with MAPL3 rather than MAPL2"
+  )
 
   # Local variables
-  set(GTMM                    FALSE)
+  set(GTMM FALSE)
   set(MECH "fullchem" CACHE STRING "Name of the chemistry mechanism to use")
 
   # Configure build properties for GEOS-Chem
@@ -98,7 +101,6 @@ if(MODEL_GCHP)
     MODEL_GCHP
     USE_ESMF
     MAPL_ESMF
-    MAPL3
     EXTERNAL_GRID
     NC_HAS_COMPRESSION
     $<$<BOOL:${USE_REAL8}>:USE_REAL8> $<$<BOOL:${RRTMG}>:RRTMG>
@@ -109,6 +111,7 @@ if(MODEL_GCHP)
     $<$<STREQUAL:${TOMAS_BINS},40>:TOMAS40>
     $<$<BOOL:${LUO_WETDEP}>:LUO_WETDEP>
     $<$<BOOL:${FASTJX}>:FASTJX>
+    $<$<BOOL:${MAPL3}>:MAPL3>
   )
 
   if(NOT MAPL3)

GeosCore/tracer_mod.F90

@@ -1,7 +1,11 @@
 ! Might actually not need this (ewl)
-!#if defined( MODEL_GEOS ) || defined( MODEL_GCHP )
-!#include "MAPL.h"
-!#endif
+#ifdef MAPL_ESMF
+#ifdef MAPL3
+#include "MAPL.h"
+#else
+#include "MAPL_Generic.h"
+#endif
+#endif
 !------------------------------------------------------------------------------
 !                  GEOS-Chem Global Chemical Transport Model                  !
 !------------------------------------------------------------------------------
@@ -71,8 +75,13 @@ SUBROUTINE Tracer_Source_Phase( Input_Opt, State_Chm, State_Grid, &
     USE UnitConv_Mod
 
 #ifdef MAPL_ESMF
-    !USE ESMF ! is this needed?
-    USE MAPL_CommsMod, only: MAPL_CommsAllReduceSum ! Does this still work in mapl3?
+    USE ESMF
+#ifdef MAPL3
+    USE MAPL_CommsMod, only: MAPL_CommsAllReduceSum
+#else
+    USE MAPL
+    USE MAPL_CommsMod, only: MAPL_CommsAllReduceSum
+#endif
 #endif
 !
 ! !INPUT PARAMETERS:
@@ -120,7 +129,7 @@ SUBROUTINE Tracer_Source_Phase( Input_Opt, State_Chm, State_Grid, &
     ! Objects
     TYPE(Species), POINTER :: SpcInfo
 
-#if defined( MODEL_GEOS ) || defined( MODEL_GCHP )
+#ifdef MAPL_ESMF
     INTEGER       :: status
     TYPE(ESMF_VM) :: vm
 #endif
@@ -140,7 +149,7 @@ SUBROUTINE Tracer_Source_Phase( Input_Opt, State_Chm, State_Grid, &
     Total_Spc   = 0.0_fp
     Flux        = 0.0_fp
 
-#if defined( MODEL_GEOS ) || defined( MODEL_GCHP )
+#ifdef MAPL_ESMF
     call ESMF_VmGetCurrent(vm, rc=status)
     _VERIFY(status)
 #endif

Headers/inquireMod.F90

@@ -23,6 +23,9 @@ MODULE inquireMod
 !
 #ifdef MAPL3
   USE mapl_ErrorHandlingMod, only: MAPL_Verify
+#else
+  USE ESMF
+  USE MAPL_Mod
 #endif
 
   IMPLICIT NONE
@@ -31,9 +34,8 @@ MODULE inquireMod
 ! !PUBLIC MEMBER FUNCTIONS:
 !
   PUBLIC  :: findFreeLUN
-!  PUBLIC  :: I_Am_UnOPENed ! ewl: I don't think this is used so comment out.
 !
-! !REVI<SION HISTORY:
+! !REVISION HISTORY:
 !  14 Jun 2012 - E. Nielsen  - Initial version
 !  See https://github.com/geoschem/geos-chem for complete history
 !EOP
@@ -83,7 +85,11 @@ FUNCTION findFreeLUN( b ) RESULT( lun )
     LOGICAL                    :: exists        ! File existence
     LOGICAL                    :: found         ! Detect unused logical unit
     LOGICAL                    :: open          ! Is open?
+#ifdef MAPL_ESMF
+    CHARACTER(LEN=ESMF_MAXSTR) :: Iam
+#else
     CHARACTER(LEN=255)         :: Iam
+#endif
 
 !
 ! !DEFINED PARAMETERS
@@ -132,71 +138,4 @@ FUNCTION findFreeLUN( b ) RESULT( lun )
 
   END FUNCTION findFreeLUN
 !EOC
-
-! ewl: is this subroutine used? It has geoschemchem. Comment out for now.
-!!------------------------------------------------------------------------
-!!     NASA/GSFC, Global Modeling and Assimilation Office, Code 910.1    !
-!!------------------------------------------------------------------------
-!!BOP
-!!
-!! !IROUTINE: I_Am_UnOPENed
-!!
-!! !DESCRIPTION: Inquire as to the availability of a given logical unit
-!!\\
-!!\\
-!! !INTERFACE:
-!!
-!  FUNCTION I_Am_UnOPENed( n ) RESULT( TorF )
-!!
-!! !USES:
-!    !
-!    IMPLICIT NONE
-!!
-!! !INPUT PARAMETERS:
-!!
-!    INTEGER :: n     ! Logical unit # to test
-!!
-!! !RETURN VALUE:
-!!
-!    LOGICAL :: TorF  ! .TRUE. means the file is unopened
-!!
-!! !REVISION HISTORY:
-!!  14 Jun 2012 - E. Nielsen  - Initial version
-!!  See https://github.com/geoschem/geos-chem for complete history
-!!EOP
-!!------------------------------------------------------------------------------
-!!BOC
-!!
-!! !LOCAL VARIABLES:
-!!
-!    INTEGER                    :: rc, status
-!    LOGICAL                    :: exists       ! File existence
-!    LOGICAL                    :: open         ! Is open?
-!
-!#ifdef USE_ESMF
-!    CHARACTER(LEN=ESMF_MAXSTR) :: Iam
-!#else
-!    CHARACTER(LEN=255)         :: Iam
-!#endif
-!
-!    !======================================================================
-!    ! Initialization
-!    !======================================================================
-!    Iam    = "GEOSCHEMCHEM::I_Am_UnOPENed"
-!    status = 0
-!    rc     = 0
-!
-!    !======================================================================
-!    ! Inquire if the LUN is available
-!    !======================================================================
-!    INQUIRE( UNIT=n, EXIST=exists, OPENED=open )
-!
-!    IF ( exists .AND. .NOT. open ) THEN
-!       TorF = .TRUE.
-!    ELSE
-!       TorF = .FALSE.
-!    ENDIF
-!
-!  END FUNCTION I_Am_UnOPENed
-!!EOC
 END MODULE inquireMod