Merge remote-tracking branch 'abag/abagusetty/yakl-submodule-update' …

…into jgfouca/scream_downstream_merge * abag/abagusetty/yakl-submodule-update: Update PAM for build fixes 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 24, 2024 · 09da5ec · 09da5ec
2 parents caa81ca + f370642
commit 09da5ec
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
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/externals/YAKL b/externals/YAKL
+3 −0		.github/workflows/mmf-simplified-ubuntu.yml
+3 −0		.github/workflows/pamc-idealized-ubuntu.yml
+3 −0		.github/workflows/pamc-unit-ubuntu.yml
+4 −4		dynamics/awfl/TransformMatrices_variable.h
+3 −3		dynamics/spam/CMakeLists.txt
+15 −11		dynamics/spam/Dycore.h
+5 −4		dynamics/spam/src/common.h
+4 −0		dynamics/spam/src/core/params.h
+23 −11		dynamics/spam/src/extrudedmodel-common.h
+79 −0		dynamics/spam/src/grids/geometry.h
+13 −12		dynamics/spam/src/hamiltonians/kinetic_energy.h
+21 −8		dynamics/spam/src/hamiltonians/refstate.h
+170 −22		dynamics/spam/src/hamiltonians/variableset.h
+2,183 −655		dynamics/spam/src/models/extrudedmodel.h
+8 −1		dynamics/spam/src/models/layermodel.h
+36 −28		dynamics/spam/src/models/model.h
+3 −3		dynamics/spam/src/operators/TransformMatrices_variable.h
+6 −6		dynamics/spam/src/operators/cfv_recon.h
+94 −85		dynamics/spam/src/operators/ext_deriv.h
+12 −12		dynamics/spam/src/operators/fct.h
+38 −29		dynamics/spam/src/operators/hodge_star.h
+192 −124		dynamics/spam/src/operators/hodge_star_extruded.h
+42 −38		dynamics/spam/src/operators/hodge_star_layer.h
+24 −24		dynamics/spam/src/operators/recon.h
+34 −34		dynamics/spam/src/operators/wedge.h
+10 −9		dynamics/spam/src/operators/weno_func_recon.h
+5 −5		dynamics/spam/src/operators/weno_func_recon_variable.h
+6 −6		dynamics/spam/src/operators/weno_recon.h
+2 −3		dynamics/spam/src/timesteppers/KGRK.h
+2 −3		dynamics/spam/src/timesteppers/LSRK.h
+2 −3		dynamics/spam/src/timesteppers/SI_Fixed.h
+4 −7		dynamics/spam/src/timesteppers/SI_Newton.h
+2 −3		dynamics/spam/src/timesteppers/SSPRK.h
+9 −8		dynamics/spam/src/timesteppers/time_integrator.h
+1 −1		externals/YAKL
+10 −0		physics/micro/kessler/Microphysics.h
+8 −2		physics/micro/none/Microphysics.h
+9 −0		physics/micro/p3/Microphysics.h
+6 −1		physics/scream_cxx_interfaces/scream_cxx_interface_p3.cpp
+17 −1		physics/scream_cxx_interfaces/scream_cxx_interface_shoc.cpp
+1 −1		standalone/machines/ci/macos-clang.env
+1 −1		standalone/machines/ci/ubuntu-clang.env
+4 −4		standalone/machines/ci/ubuntu-gcc.env
+1 −1		standalone/mmf_simplified/CMakeLists.txt
+2 −0		standalone/mmf_simplified/build/cmakescript_pamc.sh
+4 −0		standalone/mmf_simplified/driver.cpp
+6 −2		standalone/mmf_simplified/inputs/pamc_idealized/pamc_input_extruded_densitycurrent.yaml
+3 −2		standalone/mmf_simplified/inputs/pamc_idealized/pamc_input_extruded_moistrisingbubble.yaml
+53 −0		standalone/mmf_simplified/inputs/pamc_idealized/pamc_input_extruded_supercell.yaml
+0 −7		standalone/mmf_simplified/pam-c/debug_run_extruded_script.sh
+0 −7		standalone/mmf_simplified/pam-c/debug_run_layer_script.sh
+0 −4		standalone/mmf_simplified/pam-c/make_debug_script.sh
+0 −4		standalone/mmf_simplified/pam-c/make_script.sh
+29 −4		standalone/mmf_simplified/pam-c/run_extruded_script.sh
+21 −3		standalone/mmf_simplified/pam-c/run_layer_script.sh
+0 −9		standalone/mmf_simplified/pam-c/set_pamc_cmakevars.sh