Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use sundials submodule for make TPL #686

Merged
merged 6 commits into from
Aug 29, 2023
Merged

Use sundials submodule for make TPL #686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dd5a8c0
Use sundials submodule for make TPL.
jrood-nrel Aug 28, 2023
1019b67
Update PelePhysics.
jrood-nrel Aug 28, 2023
d1f60da
Update PelePhysics.
jrood-nrel Aug 28, 2023
7a82036
Update PelePhysics.
jrood-nrel Aug 29, 2023
1d3dafa
Update PelePhysics.
jrood-nrel Aug 29, 2023
1686c4a
Update PelePhysics.
jrood-nrel Aug 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions Exec/Make.PeleC
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
PELEC_HOME ?= ../
PELE_PHYSICS_HOME ?= $(PELEC_HOME)/Submodules/PelePhysics
AMREX_HOME ?= $(PELEC_HOME)/Submodules/AMReX
AMREX_HYDRO_HOME ?= $(PELEC_HOME)/Submodules/AMReX-Hydro
SUNDIALS_HOME ?= $(PELEC_HOME)/Submodules/sundials
PELEMP_HOME ?= $(PELEC_HOME)/Submodules/PeleMP

TOP ?= $(PELEC_HOME)
PELE_PHYSICS_HOME ?= $(abspath $(lastword $(PELEC_HOME)/Submodules/PelePhysics))
AMREX_HOME ?= $(abspath $(lastword $(PELEC_HOME)/Submodules/AMReX))
SUNDIALS_HOME ?= $(abspath $(lastword $(PELEC_HOME)/Submodules/sundials))
PELEMP_HOME ?= $(abspath $(lastword $(PELEC_HOME)/Submodules/PeleMP))

EBASE = PeleC

Expand Down Expand Up @@ -164,7 +161,7 @@ AMReX_buildInfo.cpp:
--COMP "$(COMP)" --COMP_VERSION "$(COMP_VERSION)" \
--FCOMP "$(FCOMP)" --FCOMP_VERSION "$(FCOMP_VERSION)" \
--MODULES "$(MNAMES)" \
--GIT "$(TOP) $(AMREX_HOME) $(PELE_PHYSICS_HOME) $(AMREX_HYDRO_HOME) $(SUNDIALS_HOME)"
--GIT "$(PELEC_HOME) $(AMREX_HOME) $(PELE_PHYSICS_HOME) $(SUNDIALS_HOME) $(PELEMP_HOME)"

include $(AMREX_HOME)/Tools/GNUMake/Make.rules

Expand All @@ -173,15 +170,15 @@ clean::

TPL:
@echo "==> Building SUNDIALS library"
cd $(PELE_PHYSICS_HOME)/ThirdParty; $(MAKE) sundials AMREX_HOME=$(AMREX_HOME) USE_CUDA=$(USE_CUDA) USE_HIP=$(USE_HIP) USE_SYCL=$(USE_SYCL) PELE_USE_KLU=$(PELE_USE_KLU) PELE_USE_MAGMA=$(PELE_USE_MAGMA) DEBUG=$(DEBUG) COMP=$(COMP) NVCC=$(COMP) PRECISION=$(PRECISION)
cd $(PELE_PHYSICS_HOME)/ThirdParty; $(MAKE) sundials SUNDIALS_HOME=$(SUNDIALS_HOME) AMREX_HOME=$(AMREX_HOME) USE_CUDA=$(USE_CUDA) USE_HIP=$(USE_HIP) USE_SYCL=$(USE_SYCL) PELE_USE_KLU=$(PELE_USE_KLU) PELE_USE_MAGMA=$(PELE_USE_MAGMA) DEBUG=$(DEBUG) COMP=$(COMP) NVCC=$(COMP) PRECISION=$(PRECISION)

TPLclean:
@echo "==> Removing SUNDIALS library"
cd $(PELE_PHYSICS_HOME)/ThirdParty; make AMREX_HOME=$(AMREX_HOME) USE_CUDA=$(USE_CUDA) USE_HIP=$(USE_HIP) USE_SYCL=$(USE_SYCL) PELE_USE_KLU=$(PELE_USE_KLU) PELE_USE_MAGMA=$(PELE_USE_MAGMA) DEBUG=$(DEBUG) COMP=$(HOSTCC) NVCC=$(COMP) PRECISION=$(PRECISION) clean
cd $(PELE_PHYSICS_HOME)/ThirdParty; make SUNDIALS_HOME=$(SUNDIALS_HOME) AMREX_HOME=$(AMREX_HOME) USE_CUDA=$(USE_CUDA) USE_HIP=$(USE_HIP) USE_SYCL=$(USE_SYCL) PELE_USE_KLU=$(PELE_USE_KLU) PELE_USE_MAGMA=$(PELE_USE_MAGMA) DEBUG=$(DEBUG) COMP=$(HOSTCC) NVCC=$(COMP) PRECISION=$(PRECISION) clean

TPLrealclean:
@echo "==> Removing SUNDIALS library"
cd $(PELE_PHYSICS_HOME)/ThirdParty; make AMREX_HOME=$(AMREX_HOME) USE_CUDA=$(USE_CUDA) USE_HIP=$(USE_HIP) USE_SYCL=$(USE_SYCL) PELE_USE_KLU=$(PELE_USE_KLU) PELE_USE_MAGMA=$(PELE_USE_MAGMA) DEBUG=$(DEBUG) COMP=$(HOSTCC) NVCC=$(COMP) PRECISION=$(PRECISION) realclean
cd $(PELE_PHYSICS_HOME)/ThirdParty; make SUNDIALS_HOME=$(SUNDIALS_HOME) AMREX_HOME=$(AMREX_HOME) USE_CUDA=$(USE_CUDA) USE_HIP=$(USE_HIP) USE_SYCL=$(USE_SYCL) PELE_USE_KLU=$(PELE_USE_KLU) PELE_USE_MAGMA=$(PELE_USE_MAGMA) DEBUG=$(DEBUG) COMP=$(HOSTCC) NVCC=$(COMP) PRECISION=$(PRECISION) realclean

#-----------------------------------------------------------------------------
# for debugging. To see the value of a Makefile variable,
Expand Down
2 changes: 1 addition & 1 deletion Submodules/PelePhysics
Open in desktop
Submodule PelePhysics updated 10 files
+13 −6 .github/workflows/ci.yml
+7 −7 Reactions/ReactorCvode.cpp
+8 −40 Reactions/ReactorUtils.H
+1 −1 Support/ceptr/pyproject.toml
+10 −11 Testing/Exec/Make.PelePhysics
+2 −10 ThirdParty/GNUmakefile
+4 −4 Utility/Diagnostics/DiagConditional.cpp
+17 −18 Utility/Diagnostics/DiagFramePlane.cpp
+4 −4 Utility/Diagnostics/DiagPDF.cpp
+8 −8 Utility/TurbInflow/turbinflow.cpp