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

fix for the last commit #135

Merged
merged 6 commits into from
Sep 27, 2024
Merged

fix for the last commit #135

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
db04e91
fix for the last commit
asalmgren Sep 27, 2024
433b330
add use_cc_proj to docs
asalmgren Sep 27, 2024
440400e
Fix pip3
WeiqunZhang Sep 27, 2024
3b2e995
Fix warning
WeiqunZhang Sep 27, 2024
4477245
Revert "Fix pip3"
WeiqunZhang Sep 27, 2024
7c23759
Use ubuntu-22.04
WeiqunZhang Sep 27, 2024
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
42 changes: 25 additions & 17 deletions src/incflo.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,23 +263,31 @@ public:
//
///////////////////////////////////////////////////////////////////////////

void ApplyProjection( amrex::Vector<amrex::MultiFab const*> const& density,
AMREX_D_DECL(amrex::Vector<amrex::MultiFab*> const& u_mac,
amrex::Vector<amrex::MultiFab*> const& v_mac,
amrex::Vector<amrex::MultiFab*> const& w_mac),
amrex::Real time, amrex::Real scaling_factor, bool incremental);
void ApplyNodalProjection(amrex::Vector<amrex::MultiFab const*> density,
amrex::Real time, amrex::Real scaling_factor, bool incremental);
void ApplyNodalProjection(amrex::Vector<amrex::MultiFab const*> const& density,
amrex::Vector<amrex::MultiFab *> vel,
amrex::Vector<amrex::MultiFab *> const& divu_Source,
amrex::Real time, amrex::Real scaling_factor, bool incremental,
bool set_inflow_bc);
void ApplyCCProjection(amrex::Vector<amrex::MultiFab const*> density,
AMREX_D_DECL(amrex::Vector<amrex::MultiFab*> const& u_mac,
amrex::Vector<amrex::MultiFab*> const& v_mac,
amrex::Vector<amrex::MultiFab*> const& w_mac),
amrex::Real time, amrex::Real scaling_factor, bool incremental);
void ApplyProjection ( amrex::Vector<amrex::MultiFab const*> const& density,
AMREX_D_DECL(amrex::Vector<amrex::MultiFab*> const& u_mac,
amrex::Vector<amrex::MultiFab*> const& v_mac,
amrex::Vector<amrex::MultiFab*> const& w_mac),
amrex::Real time, amrex::Real scaling_factor, bool incremental);

void ApplyProjection (amrex::Vector<amrex::MultiFab const*> const& density,
amrex::Vector<amrex::MultiFab *> vel,
amrex::Vector<amrex::MultiFab *> const& divu_Source,
amrex::Real time, amrex::Real scaling_factor, bool incremental,
bool set_inflow_bc);

void ApplyNodalProjection (amrex::Vector<amrex::MultiFab const*> density,
amrex::Real time, amrex::Real scaling_factor, bool incremental);
void ApplyNodalProjection (amrex::Vector<amrex::MultiFab const*> const& density,
amrex::Vector<amrex::MultiFab *> vel,
amrex::Vector<amrex::MultiFab *> const& divu_Source,
amrex::Real time, amrex::Real scaling_factor, bool incremental,
bool set_inflow_bc);

void ApplyCCProjection (amrex::Vector<amrex::MultiFab const*> density,
AMREX_D_DECL(amrex::Vector<amrex::MultiFab*> const& u_mac,
amrex::Vector<amrex::MultiFab*> const& v_mac,
amrex::Vector<amrex::MultiFab*> const& w_mac),
amrex::Real time, amrex::Real scaling_factor, bool incremental);

///////////////////////////////////////////////////////////////////////////
//
Expand Down
15 changes: 15 additions & 0 deletions src/incflo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,22 @@ incflo::ApplyProjection (Vector<MultiFab const*> const& density,
time,scaling_factor,incremental);
}
else
{
ApplyNodalProjection(density,time,scaling_factor,incremental);
}
}

void
incflo::ApplyProjection (Vector<MultiFab const*> const& density,
Vector<MultiFab *> vel,
Vector<MultiFab *> const& divu_Source,
Real time, Real scaling_factor, bool incremental,
bool set_inflow_bc)
{
AMREX_ALWAYS_ASSERT("This is not yet coded for ccproj!");

ApplyNodalProjection(density, vel, divu_Source, time, scaling_factor,
incremental, set_inflow_bc);
}

// Make a new level from scratch using provided BoxArray and DistributionMapping.
Expand Down
7 changes: 4 additions & 3 deletions src/setup/init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,9 +466,10 @@ void incflo::InitialPressureProjection()
// Always zero this here
Vector<MultiFab*> Source(finest_level+1, nullptr);

ApplyProjection(get_density_new_const(),
AMREX_D_DECL(GetVecOfPtrs(u_mac_tmp), GetVecOfPtrs(v_mac_tmp),
GetVecOfPtrs(w_mac_tmp)),m_cur_time,dummy_dt,false);
// FIXME FIXME FIXME - THIS ONLY WORKS RIGHT FOR NODAL PROJ
ApplyProjection(get_density_new_const(), GetVecOfPtrs(vel), Source,
m_cur_time, dummy_dt, false /*incremental*/,
true /*set_inflow_bc*/);
}

#ifdef AMREX_USE_EB
Expand Down
Loading