ESCOMP · ekluzek · Nov 21, 2024 · Oct 30, 2024 · Oct 30, 2024 · Oct 30, 2024
diff --git a/.gitmodules b/.gitmodules
@@ -60,67 +60,67 @@ fxDONOTUSEurl = https://github.com/ESCOMP/MOSART
 [submodule "mizuRoute"]
 path = components/mizuRoute
 url = https://github.com/ESCOMP/mizuRoute
-fxtag = cesm-coupling.n02_v2.1.2
+fxtag = cesm-coupling.n02_v2.1.3
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute
 
 [submodule "ccs_config"]
 path = ccs_config
 url = https://github.com/ESMCI/ccs_config_cesm.git
-fxtag = ccs_config_cesm1.0.0
+fxtag = ccs_config_cesm1.0.8
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
 
 [submodule "cime"]
 path = cime
 url = https://github.com/ESMCI/cime
-fxtag = cime6.0.246
+fxtag = cime6.1.37
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESMCI/cime
 
 [submodule "cmeps"]
 path = components/cmeps
 url = https://github.com/ESCOMP/CMEPS.git
-fxtag = cmeps0.14.77
+fxtag = cmeps1.0.16
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
 
 [submodule "cdeps"]
 path = components/cdeps
 url = https://github.com/ESCOMP/CDEPS.git
-fxtag = cdeps1.0.48
+fxtag = cdeps1.0.53
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git
 
 [submodule "share"]
 path = share
 url = https://github.com/ESCOMP/CESM_share
-fxtag = share1.0.19
+fxtag = share1.1.2
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share
 
-[submodule "mct"]
-path = libraries/mct
-url = https://github.com/MCSclimate/MCT
-fxtag = MCT_2.11.0
-fxrequired = ToplevelRequired
-# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
-fxDONOTUSEurl = https://github.com/MCSclimate/MCT
-
 [submodule "parallelio"]
 path = libraries/parallelio
 url = https://github.com/NCAR/ParallelIO
-fxtag = pio2_6_2
+fxtag = pio2_6_3
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/NCAR/ParallelIO
 
+[submodule "mpi-serial"]
+path = libraries/mpi-serial
+url = https://github.com/ESMCI/mpi-serial
+fxtag = MPIserial_2.5.0
+fxrequired = ToplevelRequired
+# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
+fxDONOTUSEurl = https://github.com/ESMCI/mpi-serial
+
 [submodule "doc-builder"]
 path = doc/doc-builder
 url = https://github.com/ESMCI/doc-builder

diff --git a/ccs_config b/ccs_config
diff --git a/cime b/cime
diff --git a/components/cdeps b/components/cdeps
diff --git a/components/cmeps b/components/cmeps
diff --git a/components/mizuRoute b/components/mizuRoute
diff --git a/libraries/mct b/libraries/mct
diff --git a/libraries/mpi-serial b/libraries/mpi-serial
diff --git a/libraries/parallelio b/libraries/parallelio
diff --git a/share b/share
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -3,22 +3,27 @@ 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 needed external packages
+# This is where ESMF could be asked for, but it's already included in the share build brought in below
+# NetCDF is required -- because PIO and NetCDF are required by the standard default ESMF libraries
+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
 # precedence (when there are two files with the same name, the one added later
 # 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 +58,43 @@ 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()
+# Bring in PIO, jsut because it's needed for the default ESMF library and included in other submodules like share and cmeps
+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.
+# This line of bringing in the share library also brings in ESMF and PIO
 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 library to the include and the linking step
+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)
+
+# Directories and libraries to include in the link step
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)
+24 −27		.github/workflows/testing.yml
+7 −1		CIME/BuildTools/configure.py
+26 −54		CIME/ParamGen/paramgen.py
+4 −4		CIME/Servers/__init__.py
+3 −14		CIME/SystemTests/ers.py
+2 −1		CIME/SystemTests/funit.py
+3 −4		CIME/SystemTests/hommebaseclass.py
+4 −4		CIME/SystemTests/mvk.py
+5 −5		CIME/SystemTests/pgn.py
+1 −1		CIME/SystemTests/restart_tests.py
+71 −2		CIME/SystemTests/system_tests_common.py
+4 −4		CIME/SystemTests/tsc.py
+45 −103		CIME/Tools/Makefile
+7 −2		CIME/Tools/case.submit
+94 −60		CIME/Tools/list_e3sm_tests
+75 −9		CIME/Tools/xmlchange
+10 −0		CIME/XML/batch.py
+1 −1		CIME/XML/component.py
+22 −0		CIME/XML/compsets.py
+1 −1		CIME/XML/entry_id.py
+90 −23		CIME/XML/env_batch.py
+29 −17		CIME/XML/env_mach_pes.py
+12 −0		CIME/XML/env_workflow.py
+2 −1		CIME/XML/files.py
+47 −21		CIME/XML/grids.py
+30 −7		CIME/XML/pes.py
+2 −0		CIME/baselines/performance.py
+22 −31		CIME/build.py
+5 −4		CIME/build_scripts/buildlib.mpi-serial
+29 −76		CIME/case/case.py
+8 −4		CIME/case/case_cmpgen_namelists.py
+6 −2		CIME/case/case_run.py
+79 −4		CIME/case/case_setup.py
+6 −5		CIME/case/case_st_archive.py
+5 −1		CIME/case/case_submit.py
+2 −1		CIME/case/case_test.py
+9 −15		CIME/code_checker.py
+2 −1		CIME/compare_test_results.py
+13 −1		CIME/config.py
+39 −68		CIME/data/config/cesm/config_files.xml
+0 −3		CIME/data/config/config_tests.xml
+9 −8		CIME/data/config/xml_schemas/config_machines.xsd
+8 −0		CIME/data/config/xml_schemas/config_machines_version3.xsd
+2 −0		CIME/data/config/xml_schemas/config_workflow.xsd
+10 −1		CIME/data/config/xml_schemas/entry_id_base.xsd
+0 −2		CIME/data/config/xml_schemas/env_mach_specific.xsd
+77 −0		CIME/data/templates/gitignore.template
+127 −0		CIME/gitinterface.py
+74 −46		CIME/hist_utils.py
+19 −10		CIME/locked_files.py
+1 −1		CIME/non_py/cprnc
+1 −1		CIME/non_py/src/timing/Makefile
+0 −28		CIME/scripts/create_newcase.py
+10 −0		CIME/scripts/create_test.py
+270 −365		CIME/scripts/query_config.py
+134 −0		CIME/status.py
+30 −29		CIME/test_scheduler.py
+8 −1		CIME/test_status.py
+3 −3		CIME/tests/base.py
+8 −5		CIME/tests/test_sys_cime_case.py
+12 −19		CIME/tests/test_sys_create_newcase.py
+3 −1		CIME/tests/test_sys_full_system.py
+1 −1		CIME/tests/test_sys_manage_and_query.py
+25 −3		CIME/tests/test_sys_unittest.py
+3 −0		CIME/tests/test_unit_baselines_performance.py
+0 −6		CIME/tests/test_unit_case.py
+11 −0		CIME/tests/test_unit_locked_files.py
+1 −1		CIME/tests/test_unit_utils.py
+164 −0		CIME/tests/test_unit_xml_grids.py
+22 −111		CIME/utils.py
+4 −2		CIME/wait_for_tests.py
+1 −10		CMakeLists.txt
+0 −52		Externals.cfg
+0 −7		Externals_cime.cfg
+19 −74		docker/Dockerfile
+29 −0		docker/cime.yaml
+66 −39		docker/entrypoint.sh
+0 −38		tools/load_balancing_tool/LICENSE.TXT
+0 −13		tools/load_balancing_tool/README
+0 −443		tools/load_balancing_tool/layouts.py
+0 −432		tools/load_balancing_tool/load_balancing_solve.py
+0 −396		tools/load_balancing_tool/load_balancing_submit.py
+0 −388		tools/load_balancing_tool/optimize_model.py
+0 −0		tools/load_balancing_tool/tests/__init__.py
+0 −187		tools/load_balancing_tool/tests/atm_lnd.py
+0 −29		tools/load_balancing_tool/tests/example.json
+0 −335		tools/load_balancing_tool/tests/load_balancing_test.py
+0 −39		tools/load_balancing_tool/tests/test.xml
+0 −187		tools/load_balancing_tool/tests/timing/timing_1
+0 −187		tools/load_balancing_tool/tests/timing/timing_2
+0 −187		tools/load_balancing_tool/tests/timing/timing_3
+3 −3		tools/mapping/gen_mapping_files/runoff_to_ocn/INSTALL
+1 −1		tools/mapping/gen_mapping_files/runoff_to_ocn/tools/makdep.c
+4 −4		datm/cime_config/testdefs/testlist_datm.xml
+321 −40		dglc/dglc_datamode_noevolve_mod.F90
+32 −15		dglc/glc_comp_nuopc.F90
+2 −2		dice/cime_config/testdefs/testlist_dice.xml
+2 −1		share/CMakeLists.txt
+778 −0		share/nuopc_shr_methods.F90
+2 −2		.github/workflows/extbuild.yml
+9 −8		.github/workflows/srt.yml
+3 −0		cesm/driver/esm.F90
+12 −305		cesm/driver/esm_time_mod.F90
+0 −859		cesm/nuopc_cap_share/nuopc_shr_methods.F90
+20 −6		cime_config/buildnml
+23 −10		cime_config/config_component.xml
+69 −24		cime_config/config_component_cesm.xml
+85 −30		cime_config/namelist_definition_drv.xml
+2 −8		cime_config/runseq/driver_config.py
+11 −16		doc/source/addendum/req_attributes_cesm.rst
+1 −1		mediator/CMakeLists.txt
+3 −4		mediator/Makefile
+12 −11		mediator/esmFldsExchange_cesm_mod.F90
+10 −0		mediator/fd_cesm.yaml
+7 −7		mediator/med.F90
+1 −4		mediator/med_diag_mod.F90
+69 −30		mediator/med_io_mod.F90
+2 −2		mediator/med_methods_mod.F90
+7 −6		mediator/med_phases_aofluxes_mod.F90
+20 −13		mediator/med_phases_history_mod.F90
+38 −17		mediator/med_phases_post_rof_mod.F90
+2 −1		mediator/med_phases_prep_atm_mod.F90
+3 −18		mediator/med_phases_prep_glc_mod.F90
+37 −16		mediator/med_phases_prep_ocn_mod.F90
+9 −5		mediator/med_phases_profile_mod.F90
+4 −8		mediator/med_phases_restart_mod.F90
+0 −302		mediator/med_time_mod.F90
+0 −14		Externals.cfg
+ −		netcdf_test/stuff.nc
+53 −49		route/build/Makefile
+109 −0		route/build/README_NCAR_HPC_build
+0 −88		route/build/README_cheyenne_build
+6 −6		route/build/cpl/RtmMod.F90
+6 −0		route/build/cpl/nuopc/rof_comp_nuopc.F90
+21 −64		route/build/lib/Makefile
+32 −2		route/build/src/csv_data.f90
+7 −10		route/build/src/dataTypes.f90
+2 −0		route/build/src/dfw_route.f90
+6 −2		route/build/src/globalData.f90
+51 −17		route/build/src/histVars_data.f90
+23 −6		route/build/src/historyFile.f90
+488 −0		route/build/src/hydraulic.f90
+16 −2		route/build/src/init_model_data.f90
+5 −2		route/build/src/irf_route.f90
+2 −0		route/build/src/kwe_route.f90
+12 −2		route/build/src/kwt_route.f90
+3 −1		route/build/src/mc_route.f90
+48 −0		route/build/src/mpi_utils.f90
+1 −1		route/build/src/network_topo.f90
+246 −58		route/build/src/nr_utils.f90
+19 −14		route/build/src/popMetadat.f90
+0 −6		route/build/src/process_ntopo.f90
+1 −1		route/build/src/process_remap.f90
+35 −27		route/build/src/public_var.f90
+31 −1		route/build/src/read_control.f90
+1 −1		route/build/src/standalone/get_basin_runoff.f90
+65 −41		route/build/src/standalone/model_setup.f90
+237 −198		route/build/src/standalone/read_runoff.f90
+6 −1		route/build/src/var_lookup.f90
+33 −2		route/build/src/write_restart_pio.f90
+40 −21		route/build/src/write_simoutput_pio.f90
+0 −4		route/build/src/write_streamSeg.f90
+11 −4		route/settings/SAMPLE-coupled.control
+4 −2		route/settings/SAMPLE.control
+0 −2		route/settings/mizuRoute_control.py
+4 −4		examples/basic/kinds_mod.F90
+2 −2		src/clib/pio_nc4.c
+1 −2		src/flib/piolib_mod.F90
+4 −4		src/gptl/perf_utils.F90
+54 −0		.github/actions/buildshare/action.yaml
+108 −0		.github/workflows/extbuild.yml
+0 −177		.github/workflows/srt.yml
+137 −0		CMakeLists.txt
+8 −12		buildlib.csm_share
+71 −0		cmake/Compilers.cmake
+147 −0		cmake/FindESMF.cmake
+134 −0		cmake/Sourcelist_utils.cmake
+169 −0		cmake/add_pfunit_ctest.cmake
+90 −0		cmake/genf90_utils.cmake
+10 −17		src/CMakeLists.txt
+0 −19		src/esmf_wrf_timemgr/CMakeLists.txt
+0 −19		src/esmf_wrf_timemgr/ESMF.F90
+0 −102		src/esmf_wrf_timemgr/ESMF_AlarmClockMod.F90
+0 −1,040		src/esmf_wrf_timemgr/ESMF_AlarmMod.F90
+0 −1,089		src/esmf_wrf_timemgr/ESMF_BaseMod.F90
+0 −459		src/esmf_wrf_timemgr/ESMF_BaseTimeMod.F90
+0 −502		src/esmf_wrf_timemgr/ESMF_CalendarMod.F90
+0 −1,247		src/esmf_wrf_timemgr/ESMF_ClockMod.F90
+0 −83		src/esmf_wrf_timemgr/ESMF_FractionMod.F90
+0 −36		src/esmf_wrf_timemgr/ESMF_Macros.inc
+0 −45		src/esmf_wrf_timemgr/ESMF_ShrTimeMod.F90
+0 −167		src/esmf_wrf_timemgr/ESMF_Stubs.F90
+0 −1,739		src/esmf_wrf_timemgr/ESMF_TimeIntervalMod.F90
+0 −45		src/esmf_wrf_timemgr/ESMF_TimeMgr.inc
+0 −1,572		src/esmf_wrf_timemgr/ESMF_TimeMod.F90
+0 −60		src/esmf_wrf_timemgr/Makefile
+0 −65		src/esmf_wrf_timemgr/MeatMod.F90
+0 −19		src/esmf_wrf_timemgr/README
+0 −63		src/esmf_wrf_timemgr/unittests/Makefile
+0 −14		src/esmf_wrf_timemgr/unittests/go.csh
+0 −312		src/esmf_wrf_timemgr/unittests/test.F90
+0 −17		src/esmf_wrf_timemgr/unittests/wrf_stuff.F90
+0 −9		src/esmf_wrf_timemgr/wrf_error_fatal.F90
+0 −5		src/esmf_wrf_timemgr/wrf_message.F90
+1,468 −0		src/m_MergeSorts.F90
+0 −1,242		src/mct_mod.F90
+895 −0		src/nuopc_shr_methods.F90
+1 −1		src/shr_assert_mod.F90.in
+0 −16		src/shr_flds_mod.F90
+0 −3,463		src/shr_map_mod.F90
+0 −860		src/shr_mct_mod.F90
+2 −2		src/shr_mpi_mod.F90
+0 −817		src/shr_pcdf_mod.F90
+54 −23		src/shr_reprosum_mod.F90
+2 −2		src/shr_spfn_mod.F90
+1 −1		src/shr_sys_mod.F90
+0 −403		src/shr_taskmap_mod.F90
+0 −163		test/old_unit_testers/Makefile
+0 −327		test/old_unit_testers/Mkdepends
+0 −60		test/old_unit_testers/Mksrcfiles
+0 −212		test/old_unit_testers/bundle_expected.F90
+0 −7		test/old_unit_testers/config.h
+0 −369		test/old_unit_testers/make.Macros
+0 −10		test/old_unit_testers/namelist
+0 −2		test/old_unit_testers/nl/atm.stdin
+0 −2		test/old_unit_testers/nl/cpl.stdin
+0 −2		test/old_unit_testers/nl/ice.stdin
+0 −2		test/old_unit_testers/nl/lnd.stdin
+0 −2		test/old_unit_testers/nl/ocn.stdin
+0 −96		test/old_unit_testers/run_dshr_bundle_test
+0 −68		test/old_unit_testers/run_file_test
+0 −339		test/old_unit_testers/test_mod.F90
+0 −220		test/old_unit_testers/test_shr_file.F90
+0 −28		test/old_unit_testers/test_shr_log.F90
+0 −291		test/old_unit_testers/test_shr_mpi.F90
+0 −47		test/old_unit_testers/test_shr_orb.F90
+0 −156		test/old_unit_testers/test_shr_scam.F90
+0 −663		test/old_unit_testers/test_shr_streams.F90
+0 −75		test/old_unit_testers/test_shr_sys.F90
+0 −108		test/old_unit_testers/test_shr_tInterp.F90
+3 −6		test/unit/shr_cal_test/CMakeLists.txt