fix "include" and "use" errors in previous commit (lsm_routines.F90, GEOS_CatchGridComp.F90, GEOS_CatchCNCLM51GridComp.F90)

Author: gmao-rreichle

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/GEOScatchCNCLM51_GridComp/GEOS_CatchCNCLM51GridComp.F90

@@ -68,7 +68,7 @@ module GEOS_CatchCNCLM51GridCompMod
   use MAPL_ConstantsMod,only: Tzero => MAPL_TICE, pi => MAPL_PI, MAPL_RHOWTR 
   use clm_time_manager, only: get_days_per_year, get_step_size, get_nstep, is_first_step
   use pftconMod,        only: noveg
-  use lsm_routines,     only: sibalb, catch_calc_soil_moist, catch_calc_peatclsm_waterlevel, catch_calc_zbar, gndtmp
+  use lsm_routines,     only: sibalb, catch_calc_soil_moist, catch_calc_peatclsm_waterlevel, catch_calc_zbar, gndtmp, get_Z0_FORMULATION_params
 
   use update_model_para4cn, only : upd_curr_date_time
   use WaterType

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatch_GridComp/GEOS_CatchGridComp.F90

@@ -55,7 +55,7 @@ module GEOS_CatchGridCompMod
        PEATCLSM_POROS_THRESHOLD
 
 
-  USE lsm_routines, ONLY : sibalb, catch_calc_soil_moist, catch_calc_peatclsm_waterlevel
+  USE lsm_routines, ONLY : sibalb, catch_calc_soil_moist, catch_calc_peatclsm_waterlevel, get_Z0_FORMULATION_params
 
 !#for_ldas_coupling 
   use catch_incr

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/Shared/lsm_routines.F90

@@ -1,3 +1,5 @@
+#include "MAPL_Generic.h"
+
 MODULE lsm_routines
 
   ! The module contains subroutines that are shared by Catchment and CatchmentCN.
@@ -21,8 +23,7 @@ MODULE lsm_routines
   !                        large-scale throughfalls. FWETC and FWETL are now passed through the resource file.
   ! reichle, 27 Jan 2022 - moved "public" constants & subroutine echo_catch_constants() to catch_constants.f90
 
-  use MAPL, ONLY:                                &
-       MAPL_UNDEF
+  use MAPL
 
   USE MAPL_ConstantsMod, ONLY:                   &
        PIE               => MAPL_PI,             &  ! -
@@ -56,6 +57,7 @@ MODULE lsm_routines
   PUBLIC :: SIBALB, catch_calc_soil_moist, catch_calc_zbar, catch_calc_peatclsm_waterlevel
   PUBLIC :: catch_calc_subtile2tile
   PUBLIC :: gndtmp, catch_calc_tp, catch_calc_wtotl,  catch_calc_ght, catch_calc_FT
+  PUBLIC :: get_Z0_FORMULATION_params
   PUBLIC :: dampen_tc_oscillations, irrigation_rate
 
   INTERFACE catch_calc_zbar