diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5b0f6c9b1b..7501723930 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,14 +3,18 @@ cmake_minimum_required(VERSION 2.8)
 list(APPEND CMAKE_MODULE_PATH ${CIME_CMAKE_MODULE_DIRECTORY})
 include(CIME_initial_setup)
 
-project(clm45_tests Fortran C)
+#list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../tools/mksurfdata_esmf/cmake")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../share/cmake")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../component/cmeps/cmake")
+
+project(clm_tests Fortran C)
 
 include(CIME_utils)
 
 set(CLM_ROOT "..")
 
-# This definition is needed to avoid having ESMF depend on mpi
-add_definitions(-DHIDE_MPI)
+#find_package(ESMF 8.2.0 REQUIRED )
+find_package(NetCDF 4.7.4 REQUIRED Fortran)
 
 # Add source directories from other share code (csm_share, etc.). This should be
 # done first, so that in case of name collisions, the CLM versions take
@@ -18,7 +22,6 @@ add_definitions(-DHIDE_MPI)
 # wins).
 add_subdirectory(${CLM_ROOT}/share/src csm_share)
 add_subdirectory(${CLM_ROOT}/share/unit_test_stubs/util csm_share_stubs)
-add_subdirectory(${CLM_ROOT}/share/src/esmf_wrf_timemgr esmf_wrf_timemgr)
 
 # Add files needed from CMEPS
 list ( APPEND drv_sources_needed
@@ -53,43 +56,41 @@ foreach (sourcefile ${share_sources})
   endif()
 endforeach()
 
-# Remove shr_cal_mod from share_sources.
-#
-# shr_cal_mod depends on ESMF (or the lightweight esmf wrf timemgr, at
-# least). Since CTSM doesn't currently use shr_cal_mod, we're avoiding
-# the extra overhead of including esmf_wrf_timemgr sources in this
-# build.
-#
-# TODO: like above, this should be moved into a general-purpose function
-# in Sourcelist_utils.  Then this block of code could be replaced with a
-# single call, like: remove_source_file(${share_sources}
-# "shr_cal_mod.F90")
-foreach (sourcefile ${share_sources})
-  string(REGEX MATCH "shr_cal_mod.F90" match_found ${sourcefile})
-  if(match_found)
-    list(REMOVE_ITEM share_sources ${sourcefile})
-  endif()
-endforeach()
+if (DEFINED PIO)
+  set(PIO_PATH ${PIO})
+else()
+  set(PIO_PATH $ENV{PIO})
+endif()
 
 # Build libraries containing stuff needed for the unit tests.
 # Eventually, these add_library calls should probably be distributed into the correct location, rather than being in this top-level CMakeLists.txt file.
 add_library(csm_share ${share_sources} ${drv_sources_needed})
 declare_generated_dependencies(csm_share "${share_genf90_sources}")
-add_library(esmf_wrf_timemgr ${esmf_wrf_timemgr_sources})
 add_library(clm ${clm_sources})
 declare_generated_dependencies(clm "${clm_genf90_sources}")
-add_dependencies(esmf_wrf_timemgr csm_share)
-add_dependencies(clm csm_share esmf_wrf_timemgr)
+add_dependencies(clm csm_share esmf)
 
 # We need to look for header files here, in order to pick up shr_assert.h
 include_directories(${CLM_ROOT}/share/include)
 
-# And we need to look for header files here, for some include files needed by
-# the esmf_wrf_timemgr code
-include_directories(${CLM_ROOT}/share/src/esmf_wrf_timemgr)
+
+# PIO2
+add_compile_definitions(PIO2)
+
+add_library(pioc STATIC IMPORTED)
+add_library(piof STATIC IMPORTED)
+set_property(TARGET pioc PROPERTY IMPORTED_LOCATION $ENV{PIO}/lib/libpioc.so)
+set_property(TARGET piof PROPERTY IMPORTED_LOCATION $ENV{PIO}/lib/libpiof.so)
+
 # Tell cmake to look for libraries & mod files here, because this is where we built libraries
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories (${ESMF_F90COMPILEPATHS})
+include_directories ($ENV{PIO}/include)
+include_directories (${NETCDF}/include)
+
+message( "CMAKE_CURRENT_BINARY_DIR = ${CMAKE_CURRENT_BINARY_DIR}" )
 link_directories(${CMAKE_CURRENT_BINARY_DIR})
+link_libraries( pioc piof netcdf )
 
 # Add the test directories
 # Note: it's possible that these could be added by each source directory that
diff --git a/src/biogeochem/test/CNPhenology_test/CMakeLists.txt b/src/biogeochem/test/CNPhenology_test/CMakeLists.txt
index 2367c86612..283e089ba6 100644
--- a/src/biogeochem/test/CNPhenology_test/CMakeLists.txt
+++ b/src/biogeochem/test/CNPhenology_test/CMakeLists.txt
@@ -3,4 +3,4 @@ set (pfunit_sources
 
 add_pfunit_ctest(CNPhenology
   TEST_SOURCES "${pfunit_sources}"
-  LINK_LIBRARIES clm csm_share esmf_wrf_timemgr)
+  LINK_LIBRARIES clm csm_share esmf)
diff --git a/src/biogeochem/test/CNVegComputeSeed_test/CMakeLists.txt b/src/biogeochem/test/CNVegComputeSeed_test/CMakeLists.txt
index dd6bdba723..b958439031 100644
--- a/src/biogeochem/test/CNVegComputeSeed_test/CMakeLists.txt
+++ b/src/biogeochem/test/CNVegComputeSeed_test/CMakeLists.txt
@@ -3,4 +3,4 @@ set (pfunit_sources
 
 add_pfunit_ctest(CNVegComputeSeed
   TEST_SOURCES "${pfunit_sources}"
-  LINK_LIBRARIES clm csm_share esmf_wrf_timemgr)
+  LINK_LIBRARIES clm csm_share esmf)
diff --git a/src/biogeochem/test/DustEmis_test/CMakeLists.txt b/src/biogeochem/test/DustEmis_test/CMakeLists.txt
index c705d6c2e3..d312b721b9 100644
--- a/src/biogeochem/test/DustEmis_test/CMakeLists.txt
+++ b/src/biogeochem/test/DustEmis_test/CMakeLists.txt
@@ -5,4 +5,4 @@ set (pfunit_sources
 
 add_pfunit_ctest(DustEmis
   TEST_SOURCES "${pfunit_sources}"
-  LINK_LIBRARIES clm csm_share esmf_wrf_timemgr)
+  LINK_LIBRARIES clm csm_share esmf)
diff --git a/src/biogeochem/test/Latbaset_test/CMakeLists.txt b/src/biogeochem/test/Latbaset_test/CMakeLists.txt
index 217fc7233c..d9f1c044f3 100644
--- a/src/biogeochem/test/Latbaset_test/CMakeLists.txt
+++ b/src/biogeochem/test/Latbaset_test/CMakeLists.txt
@@ -3,4 +3,4 @@ set (pfunit_sources
 
 add_pfunit_ctest(CropTypeLatbaset
   TEST_SOURCES "${pfunit_sources}"
-  LINK_LIBRARIES clm csm_share esmf_wrf_timemgr)
+  LINK_LIBRARIES clm csm_share esmf)
diff --git a/src/biogeophys/test/Balance_test/CMakeLists.txt b/src/biogeophys/test/Balance_test/CMakeLists.txt
index 541d4fb266..e140323124 100644
--- a/src/biogeophys/test/Balance_test/CMakeLists.txt
+++ b/src/biogeophys/test/Balance_test/CMakeLists.txt
@@ -1,3 +1,3 @@
 add_pfunit_ctest(balance
   TEST_SOURCES "test_Balance.pf"
-  LINK_LIBRARIES clm csm_share esmf_wrf_timemgr)
+  LINK_LIBRARIES clm csm_share esmf)
diff --git a/src/biogeophys/test/Daylength_test/CMakeLists.txt b/src/biogeophys/test/Daylength_test/CMakeLists.txt
index 2e5cb58cf9..bd2d6407a9 100644
--- a/src/biogeophys/test/Daylength_test/CMakeLists.txt
+++ b/src/biogeophys/test/Daylength_test/CMakeLists.txt
@@ -4,4 +4,4 @@ set (pfunit_sources
 
 add_pfunit_ctest(Daylength
   TEST_SOURCES "${pfunit_sources}"
-  LINK_LIBRARIES clm csm_share esmf_wrf_timemgr)
+  LINK_LIBRARIES clm csm_share esmf)
diff --git a/src/biogeophys/test/HillslopeHydrology_test/CMakeLists.txt b/src/biogeophys/test/HillslopeHydrology_test/CMakeLists.txt
index f40baf96ed..078934cc78 100644
--- a/src/biogeophys/test/HillslopeHydrology_test/CMakeLists.txt
+++ b/src/biogeophys/test/HillslopeHydrology_test/CMakeLists.txt
@@ -3,4 +3,4 @@ set (pfunit_sources
 
 add_pfunit_ctest(HillslopeHydrologyUtils
   TEST_SOURCES "${pfunit_sources}"
-  LINK_LIBRARIES clm csm_share esmf_wrf_timemgr)
+  LINK_LIBRARIES clm csm_share esmf)
diff --git a/src/biogeophys/test/Irrigation_test/CMakeLists.txt b/src/biogeophys/test/Irrigation_test/CMakeLists.txt
index 8cb531ba1a..4acf72961d 100644
--- a/src/biogeophys/test/Irrigation_test/CMakeLists.txt
+++ b/src/biogeophys/test/Irrigation_test/CMakeLists.txt
@@ -3,4 +3,4 @@ set (pfunit_sources
 
 add_pfunit_ctest(irrigation
   TEST_SOURCES "${pfunit_sources}"
-  LINK_LIBRARIES clm csm_share esmf_wrf_timemgr)
+  LINK_LIBRARIES clm csm_share esmf)
diff --git a/src/biogeophys/test/Photosynthesis_test/CMakeLists.txt b/src/biogeophys/test/Photosynthesis_test/CMakeLists.txt
index 29810cbd9d..628a98994a 100644
--- a/src/biogeophys/test/Photosynthesis_test/CMakeLists.txt
+++ b/src/biogeophys/test/Photosynthesis_test/CMakeLists.txt
@@ -3,4 +3,4 @@ set (pfunit_sources
 
 add_pfunit_ctest(Photosynthesis
   TEST_SOURCES "${pfunit_sources}"
-  LINK_LIBRARIES clm csm_share esmf_wrf_timemgr)
+  LINK_LIBRARIES clm csm_share esmf)
diff --git a/src/biogeophys/test/SnowHydrology_test/CMakeLists.txt b/src/biogeophys/test/SnowHydrology_test/CMakeLists.txt
index 600356b2ff..9e1738ab83 100644
--- a/src/biogeophys/test/SnowHydrology_test/CMakeLists.txt
+++ b/src/biogeophys/test/SnowHydrology_test/CMakeLists.txt
@@ -5,4 +5,4 @@ set (pfunit_sources
 
 add_pfunit_ctest(SnowHydrology
   TEST_SOURCES "${pfunit_sources}"
-  LINK_LIBRARIES clm csm_share esmf_wrf_timemgr)
+  LINK_LIBRARIES clm csm_share esmf)
diff --git a/src/biogeophys/test/TotalWaterAndHeat_test/CMakeLists.txt b/src/biogeophys/test/TotalWaterAndHeat_test/CMakeLists.txt
index a82532f69b..424515e414 100644
--- a/src/biogeophys/test/TotalWaterAndHeat_test/CMakeLists.txt
+++ b/src/biogeophys/test/TotalWaterAndHeat_test/CMakeLists.txt
@@ -3,4 +3,4 @@ set (pfunit_sources
 
 add_pfunit_ctest(total_water_and_heat
   TEST_SOURCES "${pfunit_sources}"
-  LINK_LIBRARIES clm csm_share esmf_wrf_timemgr)
+  LINK_LIBRARIES clm csm_share esmf)
diff --git a/src/biogeophys/test/WaterTracerContainerType_test/CMakeLists.txt b/src/biogeophys/test/WaterTracerContainerType_test/CMakeLists.txt
index 283906a442..645972aa1e 100644
--- a/src/biogeophys/test/WaterTracerContainerType_test/CMakeLists.txt
+++ b/src/biogeophys/test/WaterTracerContainerType_test/CMakeLists.txt
@@ -3,4 +3,4 @@ set (pfunit_sources
 
 add_pfunit_ctest(water_tracer_container
   TEST_SOURCES "${pfunit_sources}"
-  LINK_LIBRARIES clm csm_share esmf_wrf_timemgr)
+  LINK_LIBRARIES clm csm_share esmf)
diff --git a/src/biogeophys/test/WaterTracerUtils_test/CMakeLists.txt b/src/biogeophys/test/WaterTracerUtils_test/CMakeLists.txt
index 321e06883a..1a65bbfadd 100644
--- a/src/biogeophys/test/WaterTracerUtils_test/CMakeLists.txt
+++ b/src/biogeophys/test/WaterTracerUtils_test/CMakeLists.txt
@@ -5,4 +5,4 @@ set (pfunit_sources
 
 add_pfunit_ctest(water_tracer_utils
   TEST_SOURCES "${pfunit_sources}"
-  LINK_LIBRARIES clm csm_share esmf_wrf_timemgr)
+  LINK_LIBRARIES clm csm_share esmf)
diff --git a/src/biogeophys/test/WaterType_test/CMakeLists.txt b/src/biogeophys/test/WaterType_test/CMakeLists.txt
index 506179aabd..3f0ab409da 100644
--- a/src/biogeophys/test/WaterType_test/CMakeLists.txt
+++ b/src/biogeophys/test/WaterType_test/CMakeLists.txt
@@ -3,4 +3,4 @@ set (pfunit_sources
 
 add_pfunit_ctest(water_type
   TEST_SOURCES "${pfunit_sources}"
-  LINK_LIBRARIES clm csm_share esmf_wrf_timemgr)
+  LINK_LIBRARIES clm csm_share esmf)
diff --git a/src/biogeophys/test/Wateratm2lnd_test/CMakeLists.txt b/src/biogeophys/test/Wateratm2lnd_test/CMakeLists.txt
index c2157952e0..1ddb840431 100644
--- a/src/biogeophys/test/Wateratm2lnd_test/CMakeLists.txt
+++ b/src/biogeophys/test/Wateratm2lnd_test/CMakeLists.txt
@@ -3,4 +3,4 @@ set (pfunit_sources
 
 add_pfunit_ctest(water_atm2lnd
   TEST_SOURCES "${pfunit_sources}"
-  LINK_LIBRARIES clm csm_share esmf_wrf_timemgr)
+  LINK_LIBRARIES clm csm_share esmf)
diff --git a/src/dyn_subgrid/test/dynConsBiogeophys_test/CMakeLists.txt b/src/dyn_subgrid/test/dynConsBiogeophys_test/CMakeLists.txt
index 5e981270a4..da9c27090c 100644
--- a/src/dyn_subgrid/test/dynConsBiogeophys_test/CMakeLists.txt
+++ b/src/dyn_subgrid/test/dynConsBiogeophys_test/CMakeLists.txt
@@ -3,4 +3,4 @@ set(pfunit_sources
 
 add_pfunit_ctest(dynConsBiogeophys
   TEST_SOURCES "${pfunit_sources}"
-  LINK_LIBRARIES clm csm_share esmf_wrf_timemgr)
+  LINK_LIBRARIES clm csm_share esmf)
diff --git a/src/dyn_subgrid/test/dynInitColumns_test/CMakeLists.txt b/src/dyn_subgrid/test/dynInitColumns_test/CMakeLists.txt
index 7952f66756..0adbd696ad 100644
--- a/src/dyn_subgrid/test/dynInitColumns_test/CMakeLists.txt
+++ b/src/dyn_subgrid/test/dynInitColumns_test/CMakeLists.txt
@@ -1,3 +1,3 @@
 add_pfunit_ctest(dynInitColumns
   TEST_SOURCES "test_init_columns.pf"
-  LINK_LIBRARIES clm csm_share esmf_wrf_timemgr)
+  LINK_LIBRARIES clm csm_share esmf)
diff --git a/src/dyn_subgrid/test/dynTimeInfo_test/CMakeLists.txt b/src/dyn_subgrid/test/dynTimeInfo_test/CMakeLists.txt
index 66f2027c36..625ddae91b 100644
--- a/src/dyn_subgrid/test/dynTimeInfo_test/CMakeLists.txt
+++ b/src/dyn_subgrid/test/dynTimeInfo_test/CMakeLists.txt
@@ -1,3 +1,3 @@
 add_pfunit_ctest(dynTimeInfo
   TEST_SOURCES "test_dynTimeInfo.pf"
-  LINK_LIBRARIES clm csm_share esmf_wrf_timemgr)
+  LINK_LIBRARIES clm csm_share esmf)
diff --git a/src/dyn_subgrid/test/dynVar_test/CMakeLists.txt b/src/dyn_subgrid/test/dynVar_test/CMakeLists.txt
index fc4cf07b30..7164947f1e 100644
--- a/src/dyn_subgrid/test/dynVar_test/CMakeLists.txt
+++ b/src/dyn_subgrid/test/dynVar_test/CMakeLists.txt
@@ -9,4 +9,4 @@ set (extra_sources
 add_pfunit_ctest(dynVar
   TEST_SOURCES "${pfunit_sources}"
   OTHER_SOURCES "${extra_sources}"
-  LINK_LIBRARIES clm csm_share esmf_wrf_timemgr)
+  LINK_LIBRARIES clm csm_share esmf)
diff --git a/src/main/test/accumul_test/CMakeLists.txt b/src/main/test/accumul_test/CMakeLists.txt
index 0b06d9e87e..8d7cf69f1c 100644
--- a/src/main/test/accumul_test/CMakeLists.txt
+++ b/src/main/test/accumul_test/CMakeLists.txt
@@ -3,4 +3,4 @@ set(pfunit_sources
 
 add_pfunit_ctest(accumul
   TEST_SOURCES "${pfunit_sources}"
-  LINK_LIBRARIES clm csm_share esmf_wrf_timemgr)
+  LINK_LIBRARIES clm csm_share esmf)
diff --git a/src/main/test/atm2lnd_test/CMakeLists.txt b/src/main/test/atm2lnd_test/CMakeLists.txt
index 51c4732205..fcc4159ce2 100644
--- a/src/main/test/atm2lnd_test/CMakeLists.txt
+++ b/src/main/test/atm2lnd_test/CMakeLists.txt
@@ -4,4 +4,4 @@ set(pfunit_sources
 
 add_pfunit_ctest(atm2lnd
   TEST_SOURCES "${pfunit_sources}"
-  LINK_LIBRARIES clm csm_share esmf_wrf_timemgr)
+  LINK_LIBRARIES clm csm_share esmf)
diff --git a/src/main/test/initVertical_test/CMakeLists.txt b/src/main/test/initVertical_test/CMakeLists.txt
index 8fe9648a50..aec45772c4 100644
--- a/src/main/test/initVertical_test/CMakeLists.txt
+++ b/src/main/test/initVertical_test/CMakeLists.txt
@@ -1,3 +1,3 @@
 add_pfunit_ctest(initVertical
   TEST_SOURCES "test_initVertical.pf"
-  LINK_LIBRARIES clm csm_share esmf_wrf_timemgr)
+  LINK_LIBRARIES clm csm_share esmf)
diff --git a/src/self_tests/test/assertions_test/CMakeLists.txt b/src/self_tests/test/assertions_test/CMakeLists.txt
index d36d8c7675..aeae976839 100644
--- a/src/self_tests/test/assertions_test/CMakeLists.txt
+++ b/src/self_tests/test/assertions_test/CMakeLists.txt
@@ -3,4 +3,4 @@ set (pfunit_sources
 
 add_pfunit_ctest(assertions
   TEST_SOURCES "${pfunit_sources}"
-  LINK_LIBRARIES clm csm_share esmf_wrf_timemgr)
+  LINK_LIBRARIES clm csm_share esmf)
diff --git a/src/soilbiogeochem/test/tillage_test/CMakeLists.txt b/src/soilbiogeochem/test/tillage_test/CMakeLists.txt
index fbc550dd03..13be9aee3e 100644
--- a/src/soilbiogeochem/test/tillage_test/CMakeLists.txt
+++ b/src/soilbiogeochem/test/tillage_test/CMakeLists.txt
@@ -1,3 +1,3 @@
 add_pfunit_ctest(tillage
   TEST_SOURCES "test_tillage.pf"
-  LINK_LIBRARIES clm csm_share esmf_wrf_timemgr)
+  LINK_LIBRARIES clm csm_share esmf)
diff --git a/src/utils/test/annual_flux_dribbler_test/CMakeLists.txt b/src/utils/test/annual_flux_dribbler_test/CMakeLists.txt
index a0a60e7431..01efdc1e50 100644
--- a/src/utils/test/annual_flux_dribbler_test/CMakeLists.txt
+++ b/src/utils/test/annual_flux_dribbler_test/CMakeLists.txt
@@ -1,3 +1,3 @@
 add_pfunit_ctest(annual_flux_dribbler
   TEST_SOURCES "test_annual_flux_dribbler.pf"
-  LINK_LIBRARIES clm csm_share esmf_wrf_timemgr)
+  LINK_LIBRARIES clm csm_share esmf)
diff --git a/src/utils/test/array_utils_test/CMakeLists.txt b/src/utils/test/array_utils_test/CMakeLists.txt
index 21c7d91d81..a6b36304b4 100644
--- a/src/utils/test/array_utils_test/CMakeLists.txt
+++ b/src/utils/test/array_utils_test/CMakeLists.txt
@@ -5,4 +5,4 @@ set (pfunit_sources
 
 add_pfunit_ctest(array_utils
   TEST_SOURCES "${pfunit_sources}"
-  LINK_LIBRARIES clm csm_share esmf_wrf_timemgr)
+  LINK_LIBRARIES clm csm_share esmf)
diff --git a/src/utils/test/clm_time_manager_test/CMakeLists.txt b/src/utils/test/clm_time_manager_test/CMakeLists.txt
index f34e77dfc9..66a62e665d 100644
--- a/src/utils/test/clm_time_manager_test/CMakeLists.txt
+++ b/src/utils/test/clm_time_manager_test/CMakeLists.txt
@@ -1,3 +1,3 @@
 add_pfunit_ctest(clm_time_manager
   TEST_SOURCES "test_clm_time_manager.pf"
-  LINK_LIBRARIES clm csm_share esmf_wrf_timemgr)
+  LINK_LIBRARIES clm csm_share esmf)
diff --git a/src/utils/test/numerics_test/CMakeLists.txt b/src/utils/test/numerics_test/CMakeLists.txt
index 19d2c67451..2e826e2018 100644
--- a/src/utils/test/numerics_test/CMakeLists.txt
+++ b/src/utils/test/numerics_test/CMakeLists.txt
@@ -3,4 +3,4 @@ set (pfunit_sources
 
 add_pfunit_ctest(numerics
   TEST_SOURCES "${pfunit_sources}"
-  LINK_LIBRARIES clm csm_share esmf_wrf_timemgr)
+  LINK_LIBRARIES clm csm_share esmf)