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

Add triple flame test #330

Merged
merged 6 commits into from
Dec 20, 2023
Merged

Add triple flame test #330

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
2929fcd
Add triple flame test.
jrood-nrel Dec 20, 2023
cd2f8aa
No 3D triple flame.
jrood-nrel Dec 20, 2023
3f83c10
No 3D triple flame.
jrood-nrel Dec 20, 2023
c73dc04
uninitialized variable causing issues
baperry2 Dec 20, 2023
1fce7c7
changes for no prob parm in spray
baperry2 Dec 20, 2023
c2964dc
another spray update
baperry2 Dec 20, 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
8 changes: 5 additions & 3 deletions Exec/RegTests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ if(PELELMEX_ENABLE_EB)
add_subdirectory(EB_EnclosedFlame)
add_subdirectory(EB_EnclosedVortex)
add_subdirectory(EB_FlowPastCylinder)
if(PELELMEX_DIM GREATER 2)
if(PELELMEX_DIM EQUAL 3)
add_subdirectory(EB_PipeFlow)
endif()
else()
Expand All @@ -18,8 +18,10 @@ else()
add_subdirectory(PeriodicCases)
#add_subdirectory(SprayTest)
add_subdirectory(TaylorGreen)
add_subdirectory(TripleFlame)
if(PELELMEX_DIM GREATER 2)
if(PELELMEX_DIM EQUAL 2)
add_subdirectory(TripleFlame)
endif()
if(PELELMEX_DIM EQUAL 3)
add_subdirectory(TurbInflow)
endif()
#add_subdirectory(Unit)
Expand Down
6 changes: 2 additions & 4 deletions Exec/RegTests/SprayTest/SprayParticlesInitInsert.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,13 @@ SprayParticleContainer::injectParticles(
amrex::Real /*dt*/,
int /*nstep*/,
int /*lev*/,
int /*finest_level*/,
ProbParm const& /*prob_parm*/)
int /*finest_level*/)
{
return false;
}

void
SprayParticleContainer::InitSprayParticles(
const bool init_parts, ProbParm const& prob_parm)
SprayParticleContainer::InitSprayParticles(const bool init_parts)
{
if (!init_parts) {
return;
Expand Down
3 changes: 3 additions & 0 deletions Source/PeleLMeX_Init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ PeleLM::MakeNewLevelFromScratch(
m_leveldatareact[lev] =
std::make_unique<LevelDataReact>(grids[lev], dmap[lev], *m_factory[lev]);
m_leveldatareact[lev]->functC.setVal(0.0);
// Make sure this is initialized - may get used for ErrorEst when setting
// up levels but before reactions are actually computed
m_leveldatareact[lev]->I_R.setVal(0.0);
}

#ifdef PELE_USE_EFIELD
Expand Down
10 changes: 4 additions & 6 deletions Source/PeleLMeX_SprayParticles.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,7 @@ PeleLM::SprayInit()
Warning(warn_msg);
}
}
ProbParm const* lprobparm = prob_parm;
SprayPC->SprayInitialize(*lprobparm, restart_file);
SprayPC->SprayInitialize(restart_file);
SprayPostRegrid();
SprayInjectRedist();
if (spray_verbose >= 1) {
Expand Down Expand Up @@ -375,12 +374,11 @@ PeleLM::SprayInjectRedist()
}
bool injected = false;
for (int lev = 0; lev <= finest_level; ++lev) {
int nstep = 0; // Unused
ProbParm const* lprobparm = prob_parm;
int nstep = 0; // Unused
Real cur_time = m_t_new[lev]; // Still the time from the last time step
Real dt = m_dt;
bool lev_injected = SprayPC->injectParticles(
cur_time, dt, nstep, lev, finest_level, *lprobparm);
bool lev_injected =
SprayPC->injectParticles(cur_time, dt, nstep, lev, finest_level);
if (lev_injected) {
injected = true;
}
Expand Down
11 changes: 6 additions & 5 deletions Tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,16 +209,17 @@ endfunction(add_test_spray)
# Regression tests
#=============================================================================

# Run in CI
if(NOT PELELMEX_ENABLE_EB)
if(PELELMEX_ENABLE_RADIATION)
add_test_r(soot-rad-${PELELMEX_DIM}d SootRadTest)
endif()
add_test_r(flamesheet-drm19-${PELELMEX_DIM}d FlameSheet)
#add_test_r(tripleflame-${PELELMEX_DIM}d TripleFlame)
add_test_rv(covo-${PELELMEX_DIM}d PeriodicCases)
add_test_r(hotbubble-${PELELMEX_DIM}d HotBubble)
add_test_rv(enclosedflame-${PELELMEX_DIM}d EnclosedFlame)
if(PELELMEX_ENABLE_RADIATION)
add_test_r(soot-rad-${PELELMEX_DIM}d SootRadTest)
endif()
if(PELELMEX_DIM EQUAL 2)
add_test_r(tripleflame-${PELELMEX_DIM}d TripleFlame)
endif()
if(PELELMEX_DIM EQUAL 3)
add_test_r(hit-${PELELMEX_DIM}d HITDecay)
add_test_r(hit-les-${PELELMEX_DIM}d HITDecay)
Expand Down
Loading