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

Jump to bottom

Update submodules and code to use C++17 #134

Merged
merged 1 commit into from
Nov 1, 2022
Merged

Update submodules and code to use C++17 #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Source/PeleLMTimestep.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ PeleLM::estDivUDt(const TimeStamp &a_time) {
Real divu_dt = amrex::ReduceMin(*density, ldata_p->divu, 0,
[dtfac, rhoMin]
AMREX_GPU_HOST_DEVICE (Box const& bx, Array4<Real const> const& rho,
Array4<Real const> const& divu ) noexcept -> Real
Array4<Real const> const& divu ) -> Real
{
using namespace amrex::literals;
const auto lo = amrex::lbound(bx);
Expand Down
2 changes: 1 addition & 1 deletion Submodules/AMReX-Hydro
Open in desktop
Submodule AMReX-Hydro updated from df4526 to 3781c9
2 changes: 1 addition & 1 deletion Submodules/PeleMP
Open in desktop
Submodule PeleMP updated 29 files
+107 −1 Docs/sphinx/Equations.rst
+104 −95 Docs/sphinx/SprayInputs.rst
+6 −0 Docs/sphinx/_static/mywrap.css
+2 −1 Docs/sphinx/conf.py
+2 −3 Exec/SprayTests/PeleC/EB_test/SprayParticlesInitInsert.cpp
+5 −6 Exec/SprayTests/PeleC/Multijet/SprayParticlesInitInsert.cpp
+2 −2 Exec/SprayTests/PeleC/Multijet/first-input
+2 −3 Exec/SprayTests/PeleC/jet_spray/SprayParticlesInitInsert.cpp
+1 −0 Exec/SprayTests/PeleC/jet_spray/prob.cpp
+4 −4 Exec/SprayTests/PeleLM/Multijet/SprayParticlesInitInsert.cpp
+1 −1 Exec/SprayTests/PeleLM/Multijet/first-input
+4 −3 Exec/SprayTests/PeleLM/spray_flame/SprayParticlesInitInsert.cpp
+1 −1 Exec/SprayTests/PeleLM/spray_flame/inputs.3d
+2 −2 Exec/SprayTests/PeleLMeX/spray_flame/SprayParticlesInitInsert.cpp
+2 −2 Exec/SprayTests/PeleLMeX/spray_flame/input.2d
+2 −2 Exec/SprayTests/PeleLMeX/spray_flame/input.3d
+5 −5 README.rst
+4 −0 Source/PP_Spray/Distribution/DistBase.H
+9 −0 Source/PP_Spray/Distribution/Distributions.H
+33 −7 Source/PP_Spray/Distribution/Distributions.cpp
+2 −1 Source/PP_Spray/Make.package
+43 −96 Source/PP_Spray/SprayInjection.H
+99 −76 Source/PP_Spray/SprayJet.H
+127 −0 Source/PP_Spray/SprayJet.cpp
+2 −1 Source/PP_Spray/SprayParticles.H
+1 −0 Source/Soot_Models/Constants_Soot.H
+1 −3 Source/Soot_Models/SootModel.H
+2 −6 Source/Soot_Models/SootModel.cpp
+3 −0 Source/Soot_Models/SootModel_react.cpp
2 changes: 1 addition & 1 deletion Submodules/PelePhysics
Open in desktop
Submodule PelePhysics updated 26 files
+2 −6 Eos/EOS.cpp
+2 −6 Reactions/ReactorArkode.cpp
+2 −6 Reactions/ReactorBase.cpp
+2 −6 Reactions/ReactorCvode.cpp
+2 −8 Reactions/ReactorCvodeCustomLinSolver.cpp
+2 −8 Reactions/ReactorCvodeJacobian.cpp
+2 −8 Reactions/ReactorCvodePreconditioner.cpp
+2 −8 Reactions/ReactorCvodeUtils.cpp
+2 −6 Reactions/ReactorNull.cpp
+2 −6 Reactions/ReactorRK64.cpp
+2 −8 Reactions/ReactorUtils.cpp
+3 −0 Support/Mechanism/Models/JL4/README.md
+0 −3,057 Support/Mechanism/Models/JL4/mechanism.H
+41 −66 Support/Mechanism/Models/NUIGalway/mechanism.H
+3 −0 Support/Mechanism/Models/chem-CH4-2step/README.md
+0 −2,680 Support/Mechanism/Models/chem-CH4-2step/mechanism.H
+2 −2 Support/Mechanism/Models/list_mech
+24 −17 Support/ceptr/ceptr/jacobian.py
+16 −3 Support/ceptr/ceptr/production.py
+16 −10 Support/ceptr/ceptr/qssa_converter.py
+11 −10 Support/ceptr/ceptr/utilities.py
+2 −2 ThirdParty/GNUmakefile
+0 −8 Transport/Transport.cpp
+2 −2 Utility/PltFileManager/PltFileManager.H
+2 −6 Utility/PltFileManager/PltFileManager.cpp
+2 −6 Utility/TurbInflow/turbinflow.cpp
2 changes: 1 addition & 1 deletion Submodules/amrex
Open in desktop
Submodule amrex updated 33 files
+0 −44 CHANGES
+1 −1 Docs/sphinx_documentation/source/SWFFT.rst
+40 −180 Src/AmrCore/AMReX_ErrorList.cpp
+0 −48 Src/AmrCore/AMReX_Interp_C.H
+0 −69 Src/AmrCore/AMReX_Interpolater.H
+0 −93 Src/AmrCore/AMReX_Interpolater.cpp
+1 −52 Src/Base/AMReX_Algorithm.H
+0 −49 Src/Base/AMReX_Array4.H
+0 −107 Src/Base/AMReX_GpuLaunch.H
+0 −52 Src/Base/AMReX_GpuLaunchFunctsG.H
+0 −56 Src/Base/AMReX_GpuLaunchMacrosG.H
+1 −0 Src/Base/AMReX_GpuTypes.H
+1 −0 Src/Base/AMReX_Math.H
+0 −12 Src/Base/AMReX_MultiFabUtil.H
+0 −154 Src/Base/AMReX_MultiFabUtil.cpp
+1 −25 Src/Base/AMReX_Orientation.H
+1 −0 Src/Base/AMReX_RandomEngine.H
+2 −0 Src/Base/AMReX_VisMF.H
+0 −1 Src/EB/AMReX_EB2_GeometryShop.H
+0 −1 Src/LinearSolvers/MLMG/AMReX_MLEBNodeFDLaplacian.H
+1 −2 Src/LinearSolvers/MLMG/AMReX_MLEBTensorOp.H
+149 −151 Src/LinearSolvers/MLMG/AMReX_MLEBTensorOp.cpp
+18 −40 Src/LinearSolvers/MLMG/AMReX_MLEBTensorOp_bc.cpp
+18 −120 Src/LinearSolvers/MLMG/AMReX_MLEBTensor_2D_K.H
+40 −499 Src/LinearSolvers/MLMG/AMReX_MLEBTensor_3D_K.H
+0 −139 Src/LinearSolvers/MLMG/AMReX_MLEBTensor_K.H
+34 −106 Src/LinearSolvers/MLMG/AMReX_MLTensorOp.cpp
+48 −112 Src/LinearSolvers/MLMG/AMReX_MLTensorOp_grad.cpp
+95 −287 Src/LinearSolvers/MLMG/AMReX_MLTensor_2D_K.H
+955 −1,889 Src/LinearSolvers/MLMG/AMReX_MLTensor_3D_K.H
+0 −117 Src/LinearSolvers/MLMG/AMReX_MLTensor_K.H
+4 −0 Src/Particle/AMReX_ParticleInit.H
+1 −19 Src/Particle/AMReX_WriteBinaryParticleData.H
4 changes: 3 additions & 1 deletion Utils/Make.PeleLMeX
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,11 @@ AMReX_buildInfo.cpp:
include $(AMREX_HOME)/Tools/GNUMake/Make.rules

ifeq ($(USE_CUDA),TRUE)
CXXFLAGS+=-Xptxas --disable-optimizer-constants
CXXFLAGS+=-Xptxas --disable-optimizer-constants -Xcompiler=-std=c++17
endif

CXXFLAGS+=-std=c++17

# Force TPL as deps. of exec sources
##$(objForExecs): TPL

Expand Down