Merge branch 'jgfouca/scream_downstream_merge' into next (PR #6153)

Merge 2 for this PR for various fixes to things impacted by the scream update. * jgfouca/scream_downstream_merge: Set pam subm to latest master Increase gator pool size for pm-cpu Bring in latest PAM branch Another update to PAM to fix build errors on mappy Update PAM for build fixes Add EAMxx component to master list Change EAMxx site name for docs Update PAM to work with YAKL updates Fix YAKL fortran interface build [YAKL] update yakl to latest tip [YAKL] update YAKL submodule
E3SM-Project · Jan 25, 2024 · f90cce5 · f90cce5
2 parents 4d6f1e5 + 1708b46
commit f90cce5
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/cime_config/machines/config_machines.xml b/cime_config/machines/config_machines.xml
@@ -267,6 +267,7 @@
       <env name="Trilinos_ROOT">$SHELL{if [ -z "$Trilinos_ROOT" ]; then echo /global/common/software/e3sm/mali_tpls/trilinos-e3sm-serial-release-gcc; else echo "$Trilinos_ROOT"; fi}</env>
       <env name="NETCDF_PATH">$ENV{CRAY_NETCDF_HDF5PARALLEL_PREFIX}</env>
       <env name="PNETCDF_PATH">$ENV{CRAY_PARALLEL_NETCDF_PREFIX}</env>
+      <env name="GATOR_INITIAL_MB">4000MB</env>
     </environment_variables>
     <environment_variables compiler="intel" mpilib="mpich">
       <env name="ADIOS2_ROOT">$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}</env>

diff --git 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
diff --git 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
@@ -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