Merge branch 'master-main'

* master-main: (5708 commits)
  Revert "Merge branch 'jinyuntang/lnd/cifix' (PR #1272)"
  Update the script version and the update notes Set the walltime to default to get more on Edison in the basic state; hopefully this won't cause test failures due to not getting through the queue
  Give project a default value, in which case CIME will determine the project to use Also correct the capitalization of ACME for the simulations directory Add a comment back
  Fix usage of xmlchange for the customknl configuration
  Rename case_root_dir to acme_simulations_dir
  Add vowels to 'bld' Change the default case_root_dir to acme_simulations Change the default configuration from 'S' to 'M' to get a working PE layout on Edison
  compare_test_results: should work much better when cases are not writable
  Revert "compare_test_results should not require write access to case dirs"
  compare_test_results should not require write access to case dirs
  Change handle-preexisting-dirs to use the existing ones rather than abort on finding them
  Fix issues with checking whether a variables is defined Fix missing endif Add comments for the section explicitly used to determine where the output should go Fix the directory structure; use the proper variables for EXEROOT and RUNDIR
  Jenkins jobs should always have umask 002
  Remove run_name from the list of configuration variables Add in @cameronsmith1 's hack for run_acme's preferred directory structure Add in a warning if the default output location is the users home directory Add in setting the start date for simulations which require it
  bless_test_results should work without write access to case
  Move last remaining files out of cime_config
  jenkins_generic_job add better support for changing scratch root
  Disable FP checks for a certain LAPACK routine, by using ieee_exceptions module to turn off FP trapping that is enabled by -fpe0. Only for DEBUG builds, only for cori-knl, and only for Intel compiler. Fixes #1183 [BFB]
  change underscore to hyphens
  Minor change to cori scratch dirs
  Added a S,M,L layouts for ne4_oQU240
  ...

cime/CMakeLists.txt

@@ -6,7 +6,7 @@ project(cime_tests Fortran C)
 
 # We rely on pio for cmake utilities like findnetcdf.cmake, so that we don't
 # need to duplicate this cmake code
-list(APPEND CMAKE_MODULE_PATH "${CIME_ROOT}/externals/pio2/cmake")
+list(APPEND CMAKE_MODULE_PATH "${CIME_ROOT}/src/externals/pio2/cmake")
 
 list(APPEND CMAKE_MODULE_PATH ${CIME_CMAKE_MODULE_DIRECTORY})
 include(CIME_utils)
@@ -19,7 +19,7 @@ include_directories(${NetCDF_C_INCLUDE_DIRS} ${NetCDF_Fortran_INCLUDE_DIRS})
 # ------------------------------------------------------------------------
 # Build mct
 # ------------------------------------------------------------------------
-set(MCT_ROOT "${CIME_ROOT}/externals/mct")
+set(MCT_ROOT "${CIME_ROOT}/src/externals/mct")
 
 ExternalProject_add(mct_project
   PREFIX ${CMAKE_CURRENT_BINARY_DIR}
@@ -58,14 +58,14 @@ link_directories(${CMAKE_CURRENT_BINARY_DIR}/mct/mpeu)
 
 # csm_share (we don't build it here because it seems to be built differently
 # by different tests?)
-set(SHARE_ROOT "${CIME_ROOT}/share/csm_share")
-add_subdirectory(${SHARE_ROOT}/shr csm_share)
+set(SHARE_ROOT "${CIME_ROOT}/src/share")
+add_subdirectory(${SHARE_ROOT}/util csm_share)
 include_directories(${SHARE_ROOT}/include)
 
 # esmf_wrf_timemgr not built here because it depends on csm_share.
-add_subdirectory(${CIME_ROOT}/share/esmf_wrf_timemgr esmf_wrf_timemgr)
-include_directories(${CIME_ROOT}/share/esmf_wrf_timemgr)
+add_subdirectory(${SHARE_ROOT}/esmf_wrf_timemgr esmf_wrf_timemgr)
+include_directories(${SHARE_ROOT}/esmf_wrf_timemgr)
 
 # Now the actual test directories.
-add_subdirectory(driver_cpl/unit_test)
-add_subdirectory(share/csm_share/test/unit)
+add_subdirectory(${CIME_ROOT}/src/drivers/mct/unit_test)
+add_subdirectory(${SHARE_ROOT}/test/unit)