removal of #ifdef USE_ATS_LIB

rfiorella · Oct 23, 2024 · ed69a90 · ed69a90
1 parent fa5d7c0
commit ed69a90
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 35 deletions.
diff --git a/components/elm/src/biogeophys/SoilWaterMovementMod.F90 b/components/elm/src/biogeophys/SoilWaterMovementMod.F90
@@ -143,7 +143,6 @@ subroutine SoilWater(bounds, num_hydrologyc, filter_hydrologyc, &
     !----------------------------------------------------------------------------------------
     case (ATS_HYDRO)
 
-#ifdef USE_ATS_LIB
 #ifndef _OPENACC
        call EMI_Driver(EM_ID_ATS, EM_ATS_SOIL_HYDRO_STAGE,                        &
             dt=dt, number_step=nstep, clump_rank=bounds%clump_index,              &
@@ -172,8 +171,6 @@ subroutine SoilWater(bounds, num_hydrologyc, filter_hydrologyc, &
 
        end do
 
-
-#endif
 #endif
 
     !----------------------------------------------------------------------------------------

diff --git a/components/elm/src/external_models/emi/src/em/ats/ELM_ATS_InterfaceMod.F90 b/components/elm/src/external_models/emi/src/em/ats/ELM_ATS_InterfaceMod.F90
@@ -1,6 +1,5 @@
 module ELM_ATS_InterfaceMod
 
-#ifdef USE_ATS_LIB
 
   !-----------------------------------------------------------------------
   ! !DESCRIPTION:
@@ -234,6 +233,4 @@ end subroutine ats_getdata_hydro
   !------------------------------------------------------------------------
 
 
-#endif
-
 end module ELM_ATS_InterfaceMod
diff --git a/components/elm/src/external_models/emi/src/em/ats/ExternalModelATSMod.F90 b/components/elm/src/external_models/emi/src/em/ats/ExternalModelATSMod.F90
@@ -1,7 +1,5 @@
 module ExternalModelATSMod
 
-#ifdef USE_ATS_LIB
-
   !-----------------------------------------------------------------------
   ! !DESCRIPTION:
   !
@@ -1028,6 +1026,4 @@ end subroutine EM_ATS_Finalize
 
  !------------------------------------------------------------------------
 
-#endif
-
 end module ExternalModelATSMod
diff --git a/components/elm/src/external_models/emi/src/em/ats/ExternalModelATS_createMod.F90 b/components/elm/src/external_models/emi/src/em/ats/ExternalModelATS_createMod.F90
@@ -1,7 +1,5 @@
 module ExternalModelATS_createMod
 
-#ifdef USE_ATS_LIB
-
   !-----------------------------------------------------------------------
   ! !DESCRIPTION:
   !
@@ -115,6 +113,5 @@ end subroutine get_mesh_local
 
  !------------------------------------------------------------------------
 
-#endif
 
 end module ExternalModelATS_createMod
diff --git a/components/elm/src/external_models/emi/src/emi/ExternalModelInterfaceMod.F90 b/components/elm/src/external_models/emi/src/emi/ExternalModelInterfaceMod.F90
@@ -20,9 +20,8 @@ module ExternalModelInterfaceMod
   use ExternalModelFATESMod                 , only : em_fates_type
   use ExternalModelStubMod                  , only : em_stub_type
   use ExternalModelAlquimiaMod              , only : em_alquimia_type
-#ifdef USE_ATS_LIB
+
   use ExternalModelATSMod                   , only : em_ats_type
-#endif
 
   use EMI_TemperatureType_ExchangeMod       , only : EMI_Pack_TemperatureType_at_Column_Level_for_EM
   use EMI_TemperatureType_ExchangeMod       , only : EMI_Unpack_TemperatureType_at_Column_Level_from_EM
@@ -81,10 +80,10 @@ module ExternalModelInterfaceMod
   class(em_fates_type)               , pointer :: em_fates
   class(em_stub_type)                , pointer :: em_stub(:)
   class(em_alquimia_type)            , pointer :: em_alquimia(:)
-#ifdef USE_ATS_LIB
+
   ! for ats, don't instance for each individual clump (or mpi rank)
   class(em_ats_type)                 , pointer, public :: em_ats
-#endif
+
 
   public :: EMI_Determine_Active_EMs
   public :: EMI_Init_EM
@@ -167,10 +166,10 @@ subroutine EMI_Determine_Active_EMs()
     if (use_ats) then
        num_em            = num_em + 1
        index_em_ats      = num_em
-#ifdef USE_ATS_LIB
+
        if(.not.use_ats_mesh) &
        allocate(em_ats)
-#endif
+
     endif
 
     ! Is PETSc based Thermal Model active?
@@ -641,7 +640,6 @@ subroutine EMI_Init_EM(em_id)
     ! start of EM_ID_ATS block
     case (EM_ID_ATS)
 
-#ifdef USE_ATS_LIB
        ! Initialize EM
 
        ! Initialize lists of data to be exchanged between ELM and ATS
@@ -770,9 +768,6 @@ subroutine EMI_Init_EM(em_id)
        enddo
        !$OMP END PARALLEL DO
 
-#else
-       call endrun('ATS is on but code was not compiled with -DUSE_ATS_LIB')
-#endif
     ! End of EM_ID_ATS block
     ! ------------------------------------------------------------------------------
 
@@ -1406,12 +1401,10 @@ subroutine EMI_Driver(em_id, em_stage, dt, number_step,     &
 
     !-------------------------------------------------------------------------------
     case (EM_ID_ATS)
-#ifdef USE_ATS_LIB
+
        call em_ats%Solve(em_stage, dtime, nstep, clump_rank, &
             l2e_driver_list(iem), e2l_driver_list(iem), bounds_clump)
-#else
-       call endrun('ATS is on but code was not compiled with -DUSE_ATS_LIB')
-#endif
+
     !-------------------------------------------------------------------------------
 
     case (EM_ID_STUB)

diff --git a/...nents/elm/src/external_models/emi/src/emi_data_exchange/EMI_WaterFluxType_ExchangeMod.F90 b/...nents/elm/src/external_models/emi/src/emi_data_exchange/EMI_WaterFluxType_ExchangeMod.F90
@@ -47,6 +47,7 @@ subroutine EMI_Pack_WaterFluxType_at_Column_Level_for_EM(data_list, em_stage, &
     !
     ! !USES:
     use elm_varpar             , only : nlevsoi, nlevgrnd, nlevsno
+    use elm_varctl             , only : use_ats
     !
     implicit none
     !
@@ -178,26 +179,26 @@ subroutine EMI_Pack_WaterFluxType_at_Column_Level_for_EM(data_list, em_stage, &
           case (L2E_FLUX_GROSS_EVAP_SOIL)
              do fc = 1, num_filter
                 c = filter(fc)
-#ifdef USE_ATS_LIB
+               if (use_ats) then
                 ! when coupling with ATS, ground surface hydrology is integrated into subsurface hydrology
                 ! soil evap is that between soil/ground and near-air
                 cur_data%data_real_1d(c) = qflx_evap_soi(c)
-#else
+               else
                 cur_data%data_real_1d(c) = qflx_gross_evap_soil(c)
-#endif
+               endif
              enddo
              cur_data%is_set = .true.
 
           case (L2E_FLUX_GROSS_INFL_SOIL)
              do fc = 1, num_filter
                 c = filter(fc)
-#ifdef USE_ATS_LIB
+               if (use_ats) then
                 ! when coupling with ATS, ground surface hydrology is integrated into subsurface hydrology
                 ! So, water input into soil should be rainfall+snowmelt (todo check if dew is accounted into soil evap???)
                 cur_data%data_real_1d(c) = qflx_top_soil(c)
-#else
+               else
                 cur_data%data_real_1d(c) = qflx_gross_infl_soil(c)
-#endif
+               endif
              enddo
              cur_data%is_set = .true.
 

diff --git a/components/elm/src/main/elm_initializeMod.F90 b/components/elm/src/main/elm_initializeMod.F90
@@ -84,9 +84,7 @@ subroutine initialize1( )
     use domainLateralMod          , only: ldomain_lateral, domainlateral_init
     use SoilTemperatureMod        , only: init_soil_temperature
     use ExternalModelInterfaceMod , only: EMI_Determine_Active_EMs
-#ifdef USE_ATS_LIB
     use ExternalModelInterfaceMod , only: em_ats
-#endif
     use dynSubgridControlMod      , only: dynSubgridControl_init
     use filterMod                 , only: allocFilters
     use reweightMod               , only: reweight_wrapup