diff --git a/cime_config/machines/config_machines.xml b/cime_config/machines/config_machines.xml index 8aee336af677..635cda56da61 100644 --- a/cime_config/machines/config_machines.xml +++ b/cime_config/machines/config_machines.xml @@ -306,8 +306,8 @@ $SHELL{if [ -z "$SZ_ROOT" ]; then echo /global/cfs/cdirs/e3sm/3rdparty/sz/2.1.12.5/gcc-native-12.3; else echo "$SZ_ROOT"; fi} $SHELL{if [ -z "$ZFP_ROOT" ]; then echo /global/cfs/cdirs/e3sm/3rdparty/zfp/1.0.1/gcc-native-12.3; else echo "$ZFP_ROOT"; fi} Generic - $SHELL{if [ -z "$Albany_ROOT" ]; then echo /global/common/software/e3sm/albany/2025.11.14/gcc/12.3; else echo "$Albany_ROOT"; fi} - $SHELL{if [ -z "$Trilinos_ROOT" ]; then echo /global/common/software/e3sm/trilinos/2025.10.01/gcc/12.3; else echo "$Trilinos_ROOT"; fi} + $SHELL{if [ -z "$Albany_ROOT" ]; then echo /global/common/software/e3sm/albany/2026.05.21/gcc/14.3; else echo "$Albany_ROOT"; fi} + $SHELL{if [ -z "$Trilinos_ROOT" ]; then echo /global/common/software/e3sm/trilinos/2026.05.21/gcc/14.3; else echo "$Trilinos_ROOT"; fi} /global/cfs/cdirs/e3sm/3rdparty/protobuf/21.6/nvidia-24.5/lib/pkgconfig:$ENV{PKG_CONFIG_PATH} @@ -2855,8 +2855,8 @@ $SHELL{if [ -z "$MOAB_ROOT" ]; then echo /lcrc/soft/climate/moab/chrysalis/gnu; else echo "$MOAB_ROOT"; fi} - $SHELL{if [ -z "$Albany_ROOT" ]; then echo /lcrc/group/e3sm/soft/albany/2024.03.26/gcc/9.2.0; else echo "$Albany_ROOT"; fi} - $SHELL{if [ -z "$Trilinos_ROOT" ]; then echo /lcrc/group/e3sm/soft/trilinos/15.1.1/gcc/9.2.0; else echo "$Trilinos_ROOT"; fi} + $SHELL{if [ -z "$Albany_ROOT" ]; then echo /lcrc/group/e3sm/soft/albany/2026.05.26/gcc/11.2.0; else echo "$Albany_ROOT"; fi} + $SHELL{if [ -z "$Trilinos_ROOT" ]; then echo /lcrc/group/e3sm/soft/trilinos/17.0.0/gcc/11.2.0; else echo "$Trilinos_ROOT"; fi} $SHELL{if [ -z "$ADIOS2_ROOT" ]; then echo /lcrc/soft/climate/adios2/2.10.2/openmpi-4.1.6/gcc-11.2.0; else echo "$ADIOS2_ROOT"; fi} $SHELL{if [ -z "$BLOSC2_ROOT" ]; then echo /lcrc/soft/climate/c-blosc2/2.15.2/gcc-11.2.0; else echo "$BLOSC2_ROOT"; fi} $SHELL{if [ -z "$SZ_ROOT" ]; then echo /lcrc/soft/climate/sz/2.1.12.5/gcc-11.2.0; else echo "$SZ_ROOT"; fi} diff --git a/components/eamxx/src/share/field/field_pyutils.hpp b/components/eamxx/src/share/field/field_pyutils.hpp index 53a9454dd333..d4526ccdf7a3 100644 --- a/components/eamxx/src/share/field/field_pyutils.hpp +++ b/components/eamxx/src/share/field/field_pyutils.hpp @@ -21,15 +21,15 @@ void get_ptr_and_strides (std::vector& strides, const void*& p, const F case 1: { auto v = f.get_view(); - strides[0] = v.stride_0()*sizeof(T); + strides[0] = v.stride(0)*sizeof(T); p = v.data(); break; } case 2: { auto v = f.get_view(); - strides[0] = v.stride_0()*sizeof(T); - strides[1] = v.stride_1()*sizeof(T); + strides[0] = v.stride(0)*sizeof(T); + strides[1] = v.stride(1)*sizeof(T); p = v.data(); break; } @@ -37,9 +37,9 @@ void get_ptr_and_strides (std::vector& strides, const void*& p, const F case 3: { auto v = f.get_view(); - strides[0] = v.stride_0()*sizeof(T); - strides[1] = v.stride_1()*sizeof(T); - strides[2] = v.stride_2()*sizeof(T); + strides[0] = v.stride(0)*sizeof(T); + strides[1] = v.stride(1)*sizeof(T); + strides[2] = v.stride(2)*sizeof(T); p = v.data(); break; } diff --git a/externals/ekat b/externals/ekat index 3a1485aecfed..ae5e7f822794 160000 --- a/externals/ekat +++ b/externals/ekat @@ -1 +1 @@ -Subproject commit 3a1485aecfed7a036e4fa30ce845498fd37975e2 +Subproject commit ae5e7f8227943a25c66b1a1822973ec665d224e4