From 8e39a1f527f85745dabca41fb955e36546770a05 Mon Sep 17 00:00:00 2001 From: Lucas Esclapez <13371051+esclapez@users.noreply.github.com> Date: Fri, 27 Aug 2021 16:55:21 -0700 Subject: [PATCH] Update submodules and slope location. (#194) * Update submodules and slope location. * Update slope location in CMake. * Further update subrepo * Missing include dir in CMake. --- Submodules/AMReX-Hydro | 2 +- Submodules/IAMR | 2 +- Submodules/PelePhysics | 2 +- Submodules/amrex | 2 +- Tools/CMake/BuildPeleLMExe.cmake | 4 ++++ Tools/Make/Make.PeleLM | 1 + 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Submodules/AMReX-Hydro b/Submodules/AMReX-Hydro index ad3660ef..ca9ad099 160000 --- a/Submodules/AMReX-Hydro +++ b/Submodules/AMReX-Hydro @@ -1 +1 @@ -Subproject commit ad3660ef26553ba7556cd99028bf76a2726bab87 +Subproject commit ca9ad0992f48bbdc9030da8f01839d5875dbad9d diff --git a/Submodules/IAMR b/Submodules/IAMR index 099fd0c5..df8b261c 160000 --- a/Submodules/IAMR +++ b/Submodules/IAMR @@ -1 +1 @@ -Subproject commit 099fd0c5083aacabf4d6f47c2e5efb80f2de52f8 +Subproject commit df8b261c9b12febfe3645a90b6953c9adbfbfba8 diff --git a/Submodules/PelePhysics b/Submodules/PelePhysics index a758e6a8..55ca91b2 160000 --- a/Submodules/PelePhysics +++ b/Submodules/PelePhysics @@ -1 +1 @@ -Subproject commit a758e6a8062800983ef12127a9e9eb291bd5485a +Subproject commit 55ca91b221532e00aaf67eb8a5fd2a08f7bb1c4f diff --git a/Submodules/amrex b/Submodules/amrex index 5da29375..d0b275b7 160000 --- a/Submodules/amrex +++ b/Submodules/amrex @@ -1 +1 @@ -Subproject commit 5da293757b8bc67225702d3fe1ddc6fb0c010fa4 +Subproject commit d0b275b7064e20b87272eda07ea9adef0f63cf2a diff --git a/Tools/CMake/BuildPeleLMExe.cmake b/Tools/CMake/BuildPeleLMExe.cmake index 43706b81..b3bd95a8 100644 --- a/Tools/CMake/BuildPeleLMExe.cmake +++ b/Tools/CMake/BuildPeleLMExe.cmake @@ -219,6 +219,9 @@ function(build_pelelm_exe pelelm_exe_name) ${AMREX_HYDRO_SRC_DIR}/Utils/hydro_compute_fluxes_from_state.cpp ${AMREX_HYDRO_SRC_DIR}/Utils/hydro_bcs_K.H ${AMREX_HYDRO_SRC_DIR}/Utils/hydro_create_umac_grown.cpp + + ${AMREX_HYDRO_SRC_DIR}/Slopes/hydro_slopes_K.H + ${AMREX_HYDRO_SRC_DIR}/Slopes/hydro_eb_slopes_${PELELM_DIM}D_K.H ) if(PELELM_ENABLE_AMREX_EB) @@ -295,6 +298,7 @@ function(build_pelelm_exe pelelm_exe_name) target_include_directories(${pelelm_exe_name} PRIVATE ${AMREX_HYDRO_SRC_DIR}/Godunov) target_include_directories(${pelelm_exe_name} PRIVATE ${AMREX_HYDRO_SRC_DIR}/MOL) target_include_directories(${pelelm_exe_name} PRIVATE ${AMREX_HYDRO_SRC_DIR}/Utils) + target_include_directories(${pelelm_exe_name} PRIVATE ${AMREX_HYDRO_SRC_DIR}/Slopes) if(PELELM_ENABLE_AMREX_EB) target_include_directories(${pelelm_exe_name} PRIVATE ${AMREX_HYDRO_SRC_DIR}/EBMOL) target_include_directories(${pelelm_exe_name} PRIVATE ${AMREX_HYDRO_SRC_DIR}/EBGodunov) diff --git a/Tools/Make/Make.PeleLM b/Tools/Make/Make.PeleLM index cf7a3280..2e0d7434 100644 --- a/Tools/Make/Make.PeleLM +++ b/Tools/Make/Make.PeleLM @@ -117,6 +117,7 @@ Bdirs += $(IAMR_HOME)/Source/Src_$(DIM)d Bdirs += $(AMREX_HYDRO_HOME)/Utils Bdirs += $(AMREX_HYDRO_HOME)/Godunov Bdirs += $(AMREX_HYDRO_HOME)/MOL +Bdirs += $(AMREX_HYDRO_HOME)/Slopes ifeq ($(USE_EB), TRUE) Bdirs += $(AMREX_HYDRO_HOME)/Redistribution Bdirs += $(AMREX_HYDRO_HOME)/EBGodunov