diff --git a/cime_config/machines/config_machines.xml b/cime_config/machines/config_machines.xml index 5d4ba7d44aa8..d4f55b0c3b2c 100644 --- a/cime_config/machines/config_machines.xml +++ b/cime_config/machines/config_machines.xml @@ -267,6 +267,7 @@ $SHELL{if [ -z "$Trilinos_ROOT" ]; then echo /global/common/software/e3sm/mali_tpls/trilinos-e3sm-serial-release-gcc; else echo "$Trilinos_ROOT"; fi} $ENV{CRAY_NETCDF_HDF5PARALLEL_PREFIX} $ENV{CRAY_PARALLEL_NETCDF_PREFIX} + 4000MB $SHELL{if [ -z "$ADIOS2_ROOT" ]; then echo /global/cfs/cdirs/e3sm/3rdparty/adios2/2.9.1/cray-mpich-8.1.25/intel-2023.1.0; else echo "$ADIOS2_ROOT"; fi} diff --git a/components/cmake/build_model.cmake b/components/cmake/build_model.cmake index 17a96ae78922..16f1f039ebde 100644 --- a/components/cmake/build_model.cmake +++ b/components/cmake/build_model.cmake @@ -286,7 +286,7 @@ macro(build_model COMP_CLASS COMP_NAME) target_link_libraries(${TARGET_NAME} PRIVATE csm_share) if (COMP_NAME STREQUAL "eam") if (USE_YAKL) - target_link_libraries(${TARGET_NAME} PRIVATE yakl) + target_link_libraries(${TARGET_NAME} PRIVATE yakl yakl_fortran_interface) endif() if (USE_SAMXX) target_link_libraries(${TARGET_NAME} PRIVATE samxx) diff --git a/components/eam/src/physics/crm/pam/external b/components/eam/src/physics/crm/pam/external index ce614fcd8d1b..87731d56aeee 160000 --- a/components/eam/src/physics/crm/pam/external +++ b/components/eam/src/physics/crm/pam/external @@ -1 +1 @@ -Subproject commit ce614fcd8d1b38e7e638e55e5fcb220531aca178 +Subproject commit 87731d56aeee4bfae4750e17732828ba186367a7 diff --git a/components/eamxx/mkdocs.yml b/components/eamxx/mkdocs.yml index d51c4c5f9df3..dde0970a4ed2 100644 --- a/components/eamxx/mkdocs.yml +++ b/components/eamxx/mkdocs.yml @@ -1,4 +1,4 @@ -site_name: The C++ E3SM Atmosphere Model (EAMxx) +site_name: EAMxx nav: - 'Home': 'index.md' diff --git a/docs/index.md b/docs/index.md index 9bd2de54b2a6..36584c99bf7c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -3,7 +3,8 @@ The documentation for the components of E3SM is found here. ## Components -- [ELM](./ELM/index.md) - [EAM](./EAM/index.md) +- [EAMxx](./EAMxx/index.md) +- [ELM](./ELM/index.md) - [MOSART](./MOSART/index.md) diff --git a/externals/YAKL b/externals/YAKL index a032296858f9..4109dc02fe1e 160000 --- a/externals/YAKL +++ b/externals/YAKL @@ -1 +1 @@ -Subproject commit a032296858f9069b2ca61243802655b607fab0a0 +Subproject commit 4109dc02fe1e951a95f401719587e981ea4f4fe4