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.

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

Post regrid clean #179

Merged
merged 3 commits into from
Mar 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions Source/PeleLMBC.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,12 @@ InterpBase* PeleLM::getInterpolator(int a_method) {
: &eb_mf_cell_cons_interp;
#else
mapper = &mf_cell_cons_interp;
#endif
} else if (a_method == 2) {
#ifdef AMREX_USE_EB
Abort("Regrid interpolation method = 2 not available with EB !");
#else
mapper = &mf_linear_slope_minmax_interp;
#endif
} else {
Abort("Unknown interpolation method");
Expand Down
12 changes: 12 additions & 0 deletions Source/PeleLMRegrid.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ void PeleLM::MakeNewLevelFromCoarse( int lev,
setRhoToSumRhoY(lev, AmrNewTime);
}

// Recompute temperature from interpolated rhoYs and rhoH
setTemperature(lev, AmrNewTime);

// Initialize thermodynamic pressure
setThermoPress(lev, AmrNewTime);
}
Expand Down Expand Up @@ -176,6 +179,15 @@ void PeleLM::RemakeLevel( int lev,
m_resetCoveredMask = 1;

if (!m_incompressible) {
// Enforce density / species density consistency
// only usefull when using cell cons interp
if (m_regrid_interp_method == 1) {
setRhoToSumRhoY(lev, AmrNewTime);
}

// Recompute temperature from interpolated rhoYs and rhoH
setTemperature(lev, AmrNewTime);

// Initialize thermodynamic pressure
setThermoPress(lev, AmrNewTime);
}
Expand Down
2 changes: 1 addition & 1 deletion Submodules/PelePhysics
Submodule PelePhysics updated 99 files
+6 −1 Docs/sphinx/Ceptr.rst
+158 −85 Eos/Fuego.H
+112 −60 Eos/GammaLaw.H
+183 −96 Eos/SRK.H
+11 −15 Reactions/ReactorBDF.cpp
+6 −4 Reactions/ReactorBDFsolver.H
+1 −1 Source/Factory.H
+734 −2,019 Support/Mechanism/Models/Aromatic_KrNara/mechanism.H
+19 −22 Support/Mechanism/Models/Aromatic_KrNara/mechanism.cpp
+299 −424 Support/Mechanism/Models/BurkeDryer/mechanism.H
+19 −22 Support/Mechanism/Models/BurkeDryer/mechanism.cpp
+392 −765 Support/Mechanism/Models/C1-C2-NO/mechanism.H
+19 −22 Support/Mechanism/Models/C1-C2-NO/mechanism.cpp
+374 −699 Support/Mechanism/Models/C1-C2-NO_qss/mechanism.H
+19 −22 Support/Mechanism/Models/C1-C2-NO_qss/mechanism.cpp
+2 −2 Support/Mechanism/Models/C1-C2-NO_qss/qssa.yaml
+313 −470 Support/Mechanism/Models/CH4_lean/mechanism.H
+19 −22 Support/Mechanism/Models/CH4_lean/mechanism.cpp
+299 −424 Support/Mechanism/Models/CH4_lean_qss/mechanism.H
+19 −22 Support/Mechanism/Models/CH4_lean_qss/mechanism.cpp
+4 −4 Support/Mechanism/Models/CH4_lean_qss/qssa.yaml
+302 −435 Support/Mechanism/Models/Davis/mechanism.H
+19 −22 Support/Mechanism/Models/Davis/mechanism.cpp
+323 −512 Support/Mechanism/Models/FFCM1_Red/mechanism.H
+19 −22 Support/Mechanism/Models/FFCM1_Red/mechanism.cpp
+273 −334 Support/Mechanism/Models/IonizedAir/mechanism.H
+13 −27 Support/Mechanism/Models/IonizedAir/mechanism.cpp
+296 −413 Support/Mechanism/Models/Kolla/mechanism.H
+19 −22 Support/Mechanism/Models/Kolla/mechanism.cpp
+287 −380 Support/Mechanism/Models/LiDryer/mechanism.H
+19 −22 Support/Mechanism/Models/LiDryer/mechanism.cpp
+377 −710 Support/Mechanism/Models/LuDME/mechanism.H
+19 −22 Support/Mechanism/Models/LuDME/mechanism.cpp
+356 −633 Support/Mechanism/Models/LuEthylene/mechanism.H
+19 −22 Support/Mechanism/Models/LuEthylene/mechanism.cpp
+326 −523 Support/Mechanism/Models/LuEthylene_qss/mechanism.H
+19 −22 Support/Mechanism/Models/LuEthylene_qss/mechanism.cpp
+2 −2 Support/Mechanism/Models/LuEthylene_qss/qssa.yaml
+614 −1,579 Support/Mechanism/Models/NUIGalway/mechanism.H
+19 −22 Support/Mechanism/Models/NUIGalway/mechanism.cpp
+45 −39 Support/Mechanism/Models/Null/mechanism.H
+401 −798 Support/Mechanism/Models/SootReaction/mechanism.H
+19 −22 Support/Mechanism/Models/SootReaction/mechanism.cpp
+264 −301 Support/Mechanism/Models/air/mechanism.H
+13 −27 Support/Mechanism/Models/air/mechanism.cpp
+476 −1,073 Support/Mechanism/Models/alzeta/mechanism.H
+19 −22 Support/Mechanism/Models/alzeta/mechanism.cpp
+287 −380 Support/Mechanism/Models/chem-H/mechanism.H
+19 −22 Support/Mechanism/Models/chem-H/mechanism.cpp
+267 −312 Support/Mechanism/Models/decane_3sp/mechanism.H
+13 −27 Support/Mechanism/Models/decane_3sp/mechanism.cpp
+419 −864 Support/Mechanism/Models/dodecane_lu/mechanism.H
+19 −22 Support/Mechanism/Models/dodecane_lu/mechanism.cpp
+365 −666 Support/Mechanism/Models/dodecane_lu_qss/mechanism.H
+19 −22 Support/Mechanism/Models/dodecane_lu_qss/mechanism.cpp
+6 −7 Support/Mechanism/Models/dodecane_lu_qss/qssa.yaml
+2 −2 Support/Mechanism/Models/dodecane_lu_qss/skeletal.yaml
+428 −897 Support/Mechanism/Models/dodecane_wang/mechanism.H
+19 −22 Support/Mechanism/Models/dodecane_wang/mechanism.cpp
+270 −323 Support/Mechanism/Models/dodmethair_4sp/mechanism.H
+13 −27 Support/Mechanism/Models/dodmethair_4sp/mechanism.cpp
+323 −512 Support/Mechanism/Models/drm19/mechanism.H
+19 −22 Support/Mechanism/Models/drm19/mechanism.cpp
+347 −600 Support/Mechanism/Models/ethylene_af/mechanism.H
+19 −22 Support/Mechanism/Models/ethylene_af/mechanism.cpp
+356 −633 Support/Mechanism/Models/grimech12/mechanism.H
+19 −22 Support/Mechanism/Models/grimech12/mechanism.cpp
+365 −666 Support/Mechanism/Models/grimech30-noArN/mechanism.H
+19 −22 Support/Mechanism/Models/grimech30-noArN/mechanism.cpp
+419 −864 Support/Mechanism/Models/grimech30/mechanism.H
+19 −22 Support/Mechanism/Models/grimech30/mechanism.cpp
+267 −312 Support/Mechanism/Models/heptane_3sp/mechanism.H
+13 −27 Support/Mechanism/Models/heptane_3sp/mechanism.cpp
+416 −853 Support/Mechanism/Models/heptane_fc/mechanism.H
+19 −22 Support/Mechanism/Models/heptane_fc/mechanism.cpp
+524 −1,249 Support/Mechanism/Models/heptane_lu_88sk/mechanism.H
+19 −22 Support/Mechanism/Models/heptane_lu_88sk/mechanism.cpp
+424 −877 Support/Mechanism/Models/heptane_lu_qss/mechanism.H
+19 −22 Support/Mechanism/Models/heptane_lu_qss/mechanism.cpp
+6 −7 Support/Mechanism/Models/heptane_lu_qss/qssa.yaml
+5 −0 Support/Mechanism/Models/list_qss_mech
+338 −567 Support/Mechanism/Models/methaneIons_diRenzo/mechanism.H
+19 −22 Support/Mechanism/Models/methaneIons_diRenzo/mechanism.cpp
+365 −666 Support/Mechanism/Models/ndodecane_35/mechanism.H
+13 −27 Support/Mechanism/Models/ndodecane_35/mechanism.cpp
+264 −301 Support/Mechanism/Models/nitrogens/mechanism.H
+13 −27 Support/Mechanism/Models/nitrogens/mechanism.cpp
+362 −655 Support/Mechanism/Models/propane_fc/mechanism.H
+19 −22 Support/Mechanism/Models/propane_fc/mechanism.cpp
+308 −457 Support/Mechanism/Models/sCO2/mechanism.H
+19 −22 Support/Mechanism/Models/sCO2/mechanism.cpp
+39 −43 Support/SinglePoint/Exec/Build/main.cpp
+10 −9 Support/SinglePoint/Source/SPEval.H
+30 −34 Support/SinglePoint/Source/SPEval.cpp
+29 −0 Support/ceptr/ceptr/ceptr.py
+361 −415 Support/ceptr/ceptr/ck.py
+1 −1 Support/ceptr/ceptr/converter.py
+1 −1 Transport/Simple.H
+1 −1 Transport/Sutherland.H
2 changes: 1 addition & 1 deletion Submodules/amrex
Submodule amrex updated 79 files
+8 −0 .gitignore
+2 −1 Docs/sphinx_documentation/source/BuildingAMReX.rst
+1 −1 Docs/sphinx_documentation/source/GPU.rst
+27 −27 Src/AmrCore/AMReX_ErrorList.cpp
+4 −4 Src/AmrCore/AMReX_InterpFaceReg_2D_C.H
+12 −12 Src/AmrCore/AMReX_InterpFaceReg_3D_C.H
+9 −9 Src/AmrCore/AMReX_Interp_2D_C.H
+9 −9 Src/AmrCore/AMReX_Interp_3D_C.H
+9 −9 Src/AmrCore/AMReX_MFInterp_1D_C.H
+22 −22 Src/AmrCore/AMReX_MFInterp_2D_C.H
+24 −24 Src/AmrCore/AMReX_MFInterp_3D_C.H
+2 −2 Src/Base/AMReX_Algorithm.H
+9 −9 Src/Base/AMReX_BaseFab.H
+4 −4 Src/Base/AMReX_COORDSYS_1D_C.H
+4 −4 Src/Base/AMReX_COORDSYS_2D_C.H
+8 −8 Src/Base/AMReX_FabArray.H
+2 −2 Src/Base/AMReX_FabArrayUtility.H
+4 −4 Src/Base/AMReX_Geometry.H
+4 −4 Src/Base/AMReX_GpuComplex.H
+37 −2 Src/Base/AMReX_GpuDevice.cpp
+66 −18 Src/Base/AMReX_GpuLaunchFunctsG.H
+12 −6 Src/Base/AMReX_GpuLaunchMacrosG.H
+1 −9 Src/Base/AMReX_GpuQualifiers.H
+14 −14 Src/Base/AMReX_IntVect.H
+1 −1 Src/Base/AMReX_MFParallelForG.H
+3 −21 Src/Base/AMReX_Math.H
+2 −2 Src/Base/AMReX_MultiFab.cpp
+98 −0 Src/Base/AMReX_MultiFabUtil.H
+1 −1 Src/Base/AMReX_MultiFabUtil_nd_C.H
+11 −11 Src/Base/AMReX_RealVect.H
+89 −60 Src/Base/AMReX_Reduce.H
+3 −1 Src/Base/AMReX_TableData.H
+2 −1 Src/Base/AMReX_TagParallelFor.H
+1 −1 Src/Base/Parser/AMReX_IParser_Y.H
+3 −3 Src/Base/Parser/AMReX_Parser_Y.H
+2 −2 Src/EB/AMReX_EB2_2D_C.cpp
+2 −2 Src/EB/AMReX_EB2_3D_C.cpp
+7 −7 Src/EB/AMReX_EB2_GeometryShop.H
+16 −16 Src/EB/AMReX_EBMultiFabUtil_2D_C.H
+45 −45 Src/EB/AMReX_EBMultiFabUtil_3D_C.H
+7 −7 Src/EB/AMReX_EBToPVD.cpp
+4 −4 Src/EB/AMReX_EB_STL_utils.cpp
+2 −2 Src/EB/AMReX_EB_chkpt_file.cpp
+10 −10 Src/EB/AMReX_EB_triGeomOps_K.H
+20 −20 Src/EB/AMReX_EB_utils.cpp
+4 −4 Src/EB/AMReX_algoim_K.H
+11 −11 Src/Extern/HYPRE/AMReX_Habec_2D_K.H
+28 −28 Src/Extern/HYPRE/AMReX_Habec_3D_K.H
+4 −0 Src/Extern/HYPRE/AMReX_HypreIJIface.H
+21 −9 Src/Extern/HYPRE/AMReX_HypreIJIface.cpp
+4 −4 Src/Extern/SUNDIALS/AMReX_NVector_MultiFab.cpp
+4 −4 Src/LinearSolvers/MLMG/AMReX_MLCellLinOp.H
+52 −52 Src/LinearSolvers/MLMG/AMReX_MLEBABecLap_2D_K.H
+115 −115 Src/LinearSolvers/MLMG/AMReX_MLEBABecLap_3D_K.H
+11 −11 Src/LinearSolvers/MLMG/AMReX_MLEBTensor_2D_K.H
+33 −33 Src/LinearSolvers/MLMG/AMReX_MLEBTensor_3D_K.H
+106 −106 Src/LinearSolvers/MLMG/AMReX_MLNodeLap_2D_K.H
+1,257 −1,257 Src/LinearSolvers/MLMG/AMReX_MLNodeLap_3D_K.H
+1 −1 Src/LinearSolvers/MLMG/AMReX_MLNodeLap_K.H
+24 −24 Tests/Amr/Advection_AmrCore/Source/Src_K/slope_K.H
+24 −24 Tests/Amr/Advection_AmrLevel/Source/Src_K/slope_K.H
+6 −6 Tests/Amr/Advection_AmrLevel/Source/Src_K/tagging_K.H
+3 −3 Tests/EB_CNS/Source/CNS_K.H
+6 −6 Tests/EB_CNS/Source/CNS_tagging.H
+32 −32 Tests/EB_CNS/Source/hydro/CNS_divop_K.H
+6 −6 Tests/EB_CNS/Source/hydro/CNS_hydro_K.H
+3 −3 Tests/EB_CNS/Source/hydro/CNS_hydro_eb_K.H
+3 −3 Tests/GPU/CNS/Source/CNS_K.H
+6 −6 Tests/GPU/CNS/Source/CNS_tagging.H
+6 −6 Tests/GPU/CNS/Source/hydro/CNS_hydro_K.H
+58 −58 Tests/Particles/GhostsAndVirtuals/main.cpp
+22 −1 Tools/CMake/AMReXThirdPartyLibraries.cmake
+25 −9 Tools/GNUMake/Make.defs
+1 −1 Tools/GNUMake/Make.rules
+4 −0 Tools/GNUMake/comps/intel-classic.mak
+4 −0 Tools/GNUMake/comps/intel-llvm.mak
+1 −1 Tools/GNUMake/tools/Make.vtune
+1 −1 Tools/libamrex/configure.py
+5 −2 Tools/libamrex/mkconfig.py