From 017f2c9a0cc2db68ff65946b668f86f70727524e Mon Sep 17 00:00:00 2001 From: Abhishek Bagusetty Date: Wed, 13 Sep 2023 17:28:11 +0000 Subject: [PATCH 01/11] [YAKL] update YAKL submodule --- externals/YAKL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals/YAKL b/externals/YAKL index a032296858f9..e06d29780228 160000 --- a/externals/YAKL +++ b/externals/YAKL @@ -1 +1 @@ -Subproject commit a032296858f9069b2ca61243802655b607fab0a0 +Subproject commit e06d297802289dc457109a6df7588c2ef38a6c18 From 6d96997a6f271b6b40e1d6a854c8584731cf356a Mon Sep 17 00:00:00 2001 From: Abhishek Bagusetty Date: Mon, 30 Oct 2023 15:17:10 +0000 Subject: [PATCH 02/11] [YAKL] update yakl to latest tip --- externals/YAKL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals/YAKL b/externals/YAKL index e06d29780228..4109dc02fe1e 160000 --- a/externals/YAKL +++ b/externals/YAKL @@ -1 +1 @@ -Subproject commit e06d297802289dc457109a6df7588c2ef38a6c18 +Subproject commit 4109dc02fe1e951a95f401719587e981ea4f4fe4 From 793df531c40f16d4e3f0e7c360e9afce628e445a Mon Sep 17 00:00:00 2001 From: Benjamin Hillman Date: Fri, 10 Nov 2023 10:40:31 -0800 Subject: [PATCH 03/11] Fix YAKL fortran interface build --- components/cmake/build_model.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/cmake/build_model.cmake b/components/cmake/build_model.cmake index fce7e1242662..40a05e93b708 100644 --- a/components/cmake/build_model.cmake +++ b/components/cmake/build_model.cmake @@ -273,7 +273,7 @@ function(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) From 24b0bbeb3311de75143002aef458392315466d60 Mon Sep 17 00:00:00 2001 From: Benjamin Hillman Date: Mon, 27 Nov 2023 10:32:45 -0800 Subject: [PATCH 04/11] Update PAM to work with YAKL updates --- components/eam/src/physics/crm/pam/external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/eam/src/physics/crm/pam/external b/components/eam/src/physics/crm/pam/external index ce614fcd8d1b..22e493bc2179 160000 --- a/components/eam/src/physics/crm/pam/external +++ b/components/eam/src/physics/crm/pam/external @@ -1 +1 @@ -Subproject commit ce614fcd8d1b38e7e638e55e5fcb220531aca178 +Subproject commit 22e493bc21792f13e5df295c4d0b32134517b832 From 8cd54475eb5af4a7355c571d540054c23bd8d019 Mon Sep 17 00:00:00 2001 From: Robert Jacob Date: Fri, 19 Jan 2024 16:28:44 -0600 Subject: [PATCH 05/11] Change EAMxx site name for docs Change EAMxx site name for docs to match simple string used in other models --- components/eamxx/mkdocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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' From caa81caf105cf4cc5ab43f3467ca81bce61ea80c Mon Sep 17 00:00:00 2001 From: Robert Jacob Date: Fri, 19 Jan 2024 16:29:29 -0600 Subject: [PATCH 06/11] Add EAMxx component to master list Add EAMxx component to master list and change order --- docs/index.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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) From f370642cb594c0922658b95518c71914c59440eb Mon Sep 17 00:00:00 2001 From: Benjamin Hillman Date: Tue, 23 Jan 2024 15:45:17 -0800 Subject: [PATCH 07/11] Update PAM for build fixes --- components/eam/src/physics/crm/pam/external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/eam/src/physics/crm/pam/external b/components/eam/src/physics/crm/pam/external index 22e493bc2179..80f6ce16391f 160000 --- a/components/eam/src/physics/crm/pam/external +++ b/components/eam/src/physics/crm/pam/external @@ -1 +1 @@ -Subproject commit 22e493bc21792f13e5df295c4d0b32134517b832 +Subproject commit 80f6ce16391ff1e7cccce74ebd2907734efc8862 From 95c0a58c5107974fc961ecdbef8004ef81a1f9a6 Mon Sep 17 00:00:00 2001 From: James Foucar Date: Wed, 24 Jan 2024 12:35:58 -0700 Subject: [PATCH 08/11] Another update to PAM to fix build errors on mappy --- components/eam/src/physics/crm/pam/external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/eam/src/physics/crm/pam/external b/components/eam/src/physics/crm/pam/external index 80f6ce16391f..7290c7e7da0d 160000 --- a/components/eam/src/physics/crm/pam/external +++ b/components/eam/src/physics/crm/pam/external @@ -1 +1 @@ -Subproject commit 80f6ce16391ff1e7cccce74ebd2907734efc8862 +Subproject commit 7290c7e7da0d09bd9f6d64bb745af68ee6be0f6a From 373ebcd071c303f29437b533c23996008392071a Mon Sep 17 00:00:00 2001 From: James Foucar Date: Wed, 24 Jan 2024 15:36:29 -0700 Subject: [PATCH 09/11] Bring in latest PAM branch --- components/eam/src/physics/crm/pam/external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/eam/src/physics/crm/pam/external b/components/eam/src/physics/crm/pam/external index 7290c7e7da0d..42f4ccb72a7d 160000 --- a/components/eam/src/physics/crm/pam/external +++ b/components/eam/src/physics/crm/pam/external @@ -1 +1 @@ -Subproject commit 7290c7e7da0d09bd9f6d64bb745af68ee6be0f6a +Subproject commit 42f4ccb72a7d09a72ac9158fbfb59639fdb2f155 From 2140ebcd85ec945f69b373b3a8bfae878f51a88b Mon Sep 17 00:00:00 2001 From: James Foucar Date: Thu, 25 Jan 2024 08:54:00 -0800 Subject: [PATCH 10/11] Increase gator pool size for pm-cpu --- cime_config/machines/config_machines.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/cime_config/machines/config_machines.xml b/cime_config/machines/config_machines.xml index 91ea5c19bcdc..faec17a7d8a9 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} From 1708b462749395894ba0c8118d88323d3170d5ba Mon Sep 17 00:00:00 2001 From: James Foucar Date: Thu, 25 Jan 2024 10:32:26 -0700 Subject: [PATCH 11/11] Set pam subm to latest master --- components/eam/src/physics/crm/pam/external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/eam/src/physics/crm/pam/external b/components/eam/src/physics/crm/pam/external index 42f4ccb72a7d..87731d56aeee 160000 --- a/components/eam/src/physics/crm/pam/external +++ b/components/eam/src/physics/crm/pam/external @@ -1 +1 @@ -Subproject commit 42f4ccb72a7d09a72ac9158fbfb59639fdb2f155 +Subproject commit 87731d56aeee4bfae4750e17732828ba186367a7