E3SM-Project · sbrus89 · Aug 25, 2026 · May 20, 2026 · May 20, 2026 · May 22, 2026
diff --git a/.github/actions/test-all-eamxx/action.yml b/.github/actions/test-all-eamxx/action.yml
@@ -118,6 +118,6 @@ runs:
       with:
         name: log-files-${{ inputs.build_type }}-${{ inputs.machine }}
         path: |
-          components/eamxx/ctest-build/**/Testing/Temporary/Last*.log
           components/eamxx/ctest-build/**/ctest_resource_file.json
           components/eamxx/ctest-build/**/CMakeCache.txt
+          components/eamxx/ctest-build/**/Testing/**
diff --git a/cime b/cime
diff --git a/cime_config/machines/cmake_macros/aurora_oneapi-ifxgpu.cmake b/cime_config/machines/cmake_macros/aurora_oneapi-ifxgpu.cmake
@@ -4,7 +4,7 @@ if (compile_threaded)
   string(APPEND CMAKE_EXE_LINKER_FLAGS " -fiopenmp -fopenmp-targets=spir64")
 endif()
 
-string(APPEND KOKKOS_OPTIONS " -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_SERIAL=On -DKokkos_ARCH_INTEL_PVC=On -DKokkos_ENABLE_SYCL=On -DKokkos_ENABLE_EXPLICIT_INSTANTIATION=Off -DCMAKE_POSITION_INDEPENDENT_CODE=ON")
+string(APPEND KOKKOS_OPTIONS " -DKokkos_ENABLE_SERIAL=On -DKokkos_ARCH_INTEL_PVC=On -DKokkos_ENABLE_SYCL=On -DKokkos_ENABLE_EXPLICIT_INSTANTIATION=Off -DCMAKE_POSITION_INDEPENDENT_CODE=ON")
 string(APPEND SYCL_FLAGS " -fsycl -fsycl-targets=spir64_gen -mlong-double-64 ")
 string(APPEND OMEGA_SYCL_EXE_LINKER_FLAGS " -Xsycl-target-backend \"-device pvc\" ")
 

diff --git a/cime_config/machines/cmake_macros/frontier_craycray-mphipcc.cmake b/cime_config/machines/cmake_macros/frontier_craycray-mphipcc.cmake
@@ -17,8 +17,6 @@ if (compile_threaded)
   string(APPEND CMAKE_EXE_LINKER_FLAGS " -fopenmp")
 endif()
 
-string(APPEND CMAKE_CXX_FLAGS " -std=c++17")
-
 string(APPEND CMAKE_Fortran_FLAGS " -hipa0 -hzero -f free")
 string(APPEND CMAKE_EXE_LINKER_FLAGS " -L$ENV{CRAY_MPICH_ROOTDIR}/gtl/lib -lmpi_gtl_hsa")
 string(APPEND CMAKE_EXE_LINKER_FLAGS " -L$ENV{ROCM_PATH}/lib -lamdhip64")

diff --git a/cime_config/machines/cmake_macros/frontier_craycray.cmake b/cime_config/machines/cmake_macros/frontier_craycray.cmake
@@ -17,8 +17,6 @@ if (compile_threaded)
   string(APPEND CMAKE_EXE_LINKER_FLAGS " -fopenmp")
 endif()
 
-string(APPEND CMAKE_CXX_FLAGS " -std=c++17")
-
 string(APPEND CMAKE_Fortran_FLAGS " -hipa0 -hzero -f free")
 
 # Crusher: this resolves a crash in mct in docn init

diff --git a/cime_config/machines/cmake_macros/gnugpu.cmake b/cime_config/machines/cmake_macros/gnugpu.cmake
@@ -1,5 +1,14 @@
-string(APPEND CMAKE_C_FLAGS " -mcmodel=medium")
-string(APPEND CMAKE_Fortran_FLAGS " -mcmodel=medium -fconvert=big-endian -ffree-line-length-none -ffixed-line-length-none")
+if (CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
+  string(APPEND CMAKE_C_FLAGS " -mcmodel=small")
+  string(APPEND CMAKE_Fortran_FLAGS " -mcmodel=small")
+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
+  string(APPEND CMAKE_C_FLAGS " -mcmodel=large")
+  string(APPEND CMAKE_Fortran_FLAGS " -mcmodel=large")
+else()
+  string(APPEND CMAKE_C_FLAGS " -mcmodel=medium")
+  string(APPEND CMAKE_Fortran_FLAGS " -mcmodel=medium")
+endif()
+string(APPEND CMAKE_Fortran_FLAGS " -fconvert=big-endian -ffree-line-length-none -ffixed-line-length-none")
 if (CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL 10)
    string(APPEND CMAKE_Fortran_FLAGS " -fallow-argument-mismatch")
 endif()

diff --git a/cime_config/machines/cmake_macros/vista-gg_gnu.cmake b/cime_config/machines/cmake_macros/vista-gg_gnu.cmake
@@ -0,0 +1,13 @@
+string(APPEND CPPDEFS " -DLINUX")
+if (COMP_NAME STREQUAL gptl)
+  string(APPEND CPPDEFS " -DBIT64 -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY -DHAVE_MPI")
+endif()
+string(APPEND CMAKE_C_FLAGS_RELEASE " -O2 -g")
+string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -O2 -g")
+
+set(MPICC "mpicc")
+set(MPICXX "mpicxx")
+set(MPIFC "mpif90")
+set(SCC "gcc")
+set(SCXX "g++")
+set(SFC "gfortran")
diff --git a/cime_config/machines/cmake_macros/vista-gg_nvidia.cmake b/cime_config/machines/cmake_macros/vista-gg_nvidia.cmake
@@ -0,0 +1,20 @@
+string(APPEND CPPDEFS " -DLINUX")
+if (COMP_NAME STREQUAL gptl)
+  string(APPEND CPPDEFS " -DBIT64 -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY -DHAVE_MPI")
+endif()
+string(APPEND CMAKE_C_FLAGS_RELEASE " -O2")
+string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -O2")
+string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -g")
+
+set(HOMME_QUAD_PREC FALSE CACHE BOOL "") # nvidia does not seem to support QUAD
+
+if (compile_threaded)
+  string(APPEND KOKKOS_OPTIONS " -DKokkos_ENABLE_OPENMP=Off") # work-around for nvidia as kokkos is not passing "-mp" for threaded build
+endif()
+
+set(MPICC "mpicc")
+set(MPICXX "mpicxx")
+set(MPIFC "mpif90")
+set(SCC "gcc")
+set(SCXX "g++")
+set(SFC "gfortran")
diff --git a/cime_config/machines/cmake_macros/vista-gh_gnu.cmake b/cime_config/machines/cmake_macros/vista-gh_gnu.cmake
@@ -0,0 +1,15 @@
+string(APPEND CPPDEFS " -DLINUX")
+if (COMP_NAME STREQUAL gptl)
+  string(APPEND CPPDEFS " -DBIT64 -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY -DHAVE_MPI")
+endif()
+string(APPEND CMAKE_C_FLAGS_RELEASE " -O2 -g")
+string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -O2 -g")
+
+string(APPEND CMAKE_EXE_LINKER_FLAGS "  -L/opt/apps/gcc/14.2.0/lib64 -lstdc++") # workaround for pnetcdf thinking it needs gcc14 abi
+
+set(MPICC "mpicc")
+set(MPICXX "mpicxx")
+set(MPIFC "mpif90")
+set(SCC "gcc")
+set(SCXX "g++")
+set(SFC "gfortran")
diff --git a/cime_config/machines/cmake_macros/vista-gh_gnugpu.cmake b/cime_config/machines/cmake_macros/vista-gh_gnugpu.cmake
@@ -0,0 +1,21 @@
+set(USE_CUDA "TRUE")
+string(APPEND CPPDEFS " -DGPU")
+string(APPEND CPPDEFS " -DLINUX")
+if (COMP_NAME STREQUAL gptl)
+  string(APPEND CPPDEFS " -DBIT64 -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY -DHAVE_MPI")
+  # -DHAVE_NANOTIME -- cant use this as the assembly instructions that wont work on ARM
+endif()
+string(APPEND CMAKE_CUDA_FLAGS " -ccbin CC -O2 -arch sm_90 --use_fast_math")
+string(APPEND KOKKOS_OPTIONS " -DKokkos_ARCH_HOPPER90=On -DKokkos_ENABLE_CUDA=On -DKokkos_ENABLE_CUDA_LAMBDA=On -DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_OPENMP=Off -DKokkos_ENABLE_IMPL_CUDA_MALLOC_ASYNC=Off")
+set(CMAKE_CUDA_ARCHITECTURES "90")
+
+string(APPEND CMAKE_C_FLAGS_RELEASE " -O2")
+string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -O2")
+string(APPEND CMAKE_EXE_LINKER_FLAGS "  -L/opt/apps/gcc/14.2.0/lib64 -lstdc++") # workaround for pnetcdf thinking it needs gcc14 abi
+
+set(MPICC "mpicc")
+set(MPICXX "mpicxx") # Needs MPICH_CXX to use nvcc <env name="MPICH_CXX">$SHELL{which nvcc}</env>
+set(MPIFC "mpif90")
+set(SCC "gcc")
+set(SCXX "nvcc")
+set(SFC "gfortran")
diff --git a/cime_config/machines/config_batch.xml b/cime_config/machines/config_batch.xml
@@ -618,6 +618,27 @@
     </queues>
   </batch_system>
 
+  <batch_system MACH="vista-gh" type="slurm">
+    <directives>
+      <directive>-n {{ total_tasks }}</directive>
+      <directive>--partition=gh</directive>
+    </directives>
+    <queues>
+      <queue walltimemax="00:30:00" nodemax="8" default="true">gh-dev</queue>
+      <queue walltimemax="00:30:00" nodemax="64" strict="true">gh</queue>
+    </queues>
+  </batch_system>
+
+  <batch_system MACH="vista-gg" type="slurm">
+    <directives>
+      <directive>-n {{ total_tasks }}</directive>
+      <directive>--partition=gg</directive>
+    </directives>
+    <queues>
+      <queue walltimemax="00:30:00" nodemax="32" strict="true">gg</queue>
+    </queues>
+  </batch_system>
+
     <batch_system MACH="jlse" type="cobalt_theta">
       <batch_submit>qsub</batch_submit>
       <queues>
+0 −24		.github/workflows/stale.yml
+1 −1		.pre-commit-config.yaml
+74 −19		CIME/Servers/__init__.py
+22 −0		CIME/SystemTests/system_tests_common.py
+1 −1		CIME/SystemTests/test_mods.py
+1 −1		CIME/XML/compsets.py
+49 −20		CIME/XML/machines.py
+1 −3		CIME/XML/namelist_definition.py
+3 −1		CIME/XML/tests.py
+6 −5		CIME/case/case.py
+2 −1		CIME/case/case_run.py
+3 −1		CIME/case/case_submit.py
+6 −2		CIME/case/check_input_data.py
+0 −200		CIME/code_checker.py
+3 −1		CIME/compare_namelists.py
+7 −0		CIME/core/__init__.py
+1 −0		CIME/core/config/__init__.py
+182 −0		CIME/core/config/bootstrap.py
+81 −0		CIME/core/exceptions.py
+1 −1		CIME/get_tests.py
+2 −1		CIME/hist_utils.py
+1 −1		CIME/non_py/cprnc
+4 −2		CIME/scripts/configure
+9 −6		CIME/test_scheduler.py
+0 −295		CIME/tests/scripts_regression_tests.py
+1 −1		CIME/tests/test_unit_bless_test_results.py
+1 −1		CIME/tests/test_unit_case_run.py
+2 −3		CIME/tests/test_unit_configure.py
+191 −0		CIME/tests/test_unit_core_bootstrap.py
+124 −0		CIME/tests/test_unit_core_exceptions.py
+1 −1		CIME/tests/test_unit_expected_fails_file.py
+2 −1		CIME/tests/test_unit_fake_case.py
+1 −1		CIME/tests/test_unit_grids.py
+1 −1		CIME/tests/test_unit_locked_files.py
+0 −6		CIME/tests/test_unit_safe_copy.py
+138 −0		CIME/tests/test_unit_servers.py
+2 −2		CIME/tests/test_unit_system_tests.py
+1 −1		CIME/tests/test_unit_user_mod_support.py
+2 −1		CIME/tests/test_unit_xml_env_batch.py
+1 −2		CIME/tests/test_unit_xml_grids.py
+50 −8		CIME/tests/test_unit_xml_machines.py
+4 −2		CIME/utils.py
+3 −1		CIME/wait_for_tests.py
+3 −10		CONTRIBUTING.md
+173 −3		conftest.py
+1 −0		doc/.gitignore
+0 −1		doc/source/api.rst
+5 −3		doc/source/ccs/index.rst
+2 −2		doc/source/ccs/model-configuration/fortran-unit-testing.rst
+91 −20		doc/source/ccs/model-configuration/support-a-new-machine.rst
+1 −1		doc/source/ccs/model-configuration/variables/compsets.rst
+4 −4		doc/source/ccs/model-configuration/variables/grids.rst
+2 −2		doc/source/ccs/model-configuration/variables/pes.rst
+8 −2		doc/source/ccs/running-a-case.rst
+29 −91		doc/source/ccs/setting-up-a-case.rst
+4 −0		doc/source/ccs/timers.rst
+6 −6		doc/source/ccs/troubleshooting.rst
+1 −1		doc/source/ccs/user-config.rst
+51 −71		doc/source/contributing-guide.rst
+4 −4		doc/source/system_testing.rst
+7 −5		docker/README.md
+22 −8		docker/entrypoint.sh