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 amrex-hydro submodule #1174

Merged
merged 1 commit into from
Aug 1, 2024
Merged

Update amrex-hydro submodule #1174

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
4 changes: 3 additions & 1 deletion amr-wind/equation_systems/AdvOp_Godunov.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,8 @@ struct AdvectionOp<
dof_field.bcrec(), dof_field.bcrec_device().data(),
iconserv.data(), godunov_use_ppm,
godunov_use_forces_in_trans, is_velocity,
fluxes_are_area_weighted, advection_type, limiter_type);
fluxes_are_area_weighted, advection_type, limiter_type,
m_allow_inflow_on_outflow);
} else {
amrex::Abort("Invalid godunov scheme");
}
Expand Down Expand Up @@ -240,6 +241,7 @@ struct AdvectionOp<
std::string godunov_type;
const bool fluxes_are_area_weighted{false};
bool godunov_use_forces_in_trans{false};
const bool m_allow_inflow_on_outflow{false};
std::string advection_type{"Godunov"};
};

Expand Down
7 changes: 5 additions & 2 deletions amr-wind/equation_systems/icns/icns_advection.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,8 @@ struct AdvectionOp<ICNS, fvm::Godunov>
w_mac(lev), dof_field.bcrec(),
dof_field.bcrec_device().data(), repo.mesh().Geom(lev), dt,
godunov_use_ppm, godunov_use_forces_in_trans,
premac_advection_type, limiter_type);
premac_advection_type, limiter_type,
m_allow_inflow_on_outflow);
} else {
amrex::Abort("Invalid godunov scheme");
}
Expand Down Expand Up @@ -447,7 +448,8 @@ struct AdvectionOp<ICNS, fvm::Godunov>
dof_field.bcrec_device().data(), iconserv.data(),
godunov_use_ppm, godunov_use_forces_in_trans,
is_velocity, fluxes_are_area_weighted,
postmac_advection_type, limiter_type);
postmac_advection_type, limiter_type,
m_allow_inflow_on_outflow);
} else {
amrex::Abort("Invalid godunov scheme");
}
Expand Down Expand Up @@ -535,6 +537,7 @@ struct AdvectionOp<ICNS, fvm::Godunov>
bool godunov_use_forces_in_trans{false};
int m_cons{1};
int m_verbose{0};
const bool m_allow_inflow_on_outflow{false};
std::string premac_advection_type{"Godunov"};
std::string postmac_advection_type{"Godunov"};
};
Expand Down
2 changes: 1 addition & 1 deletion submods/AMReX-Hydro
Open in desktop
Submodule AMReX-Hydro updated 18 files
+3 −0 EBGodunov/hydro_ebgodunov.H
+24 −18 EBGodunov/hydro_ebgodunov_edge_state_2D.cpp
+36 −27 EBGodunov/hydro_ebgodunov_edge_state_3D.cpp
+3 −1 EBGodunov/hydro_ebgodunov_extrap_vel_to_faces.cpp
+23 −20 EBGodunov/hydro_ebgodunov_extrap_vel_to_faces_2D.cpp
+34 −31 EBGodunov/hydro_ebgodunov_extrap_vel_to_faces_3D.cpp
+3 −1 Godunov/hydro_godunov.H
+23 −18 Godunov/hydro_godunov_edge_state_2D.cpp
+38 −33 Godunov/hydro_godunov_edge_state_3D.cpp
+25 −19 Godunov/hydro_godunov_extrap_vel_to_faces_2D.cpp
+36 −28 Godunov/hydro_godunov_extrap_vel_to_faces_3D.cpp
+18 −12 Godunov/hydro_godunov_ppm.H
+4 −2 MOL/hydro_mol.H
+4 −2 MOL/hydro_mol_extrap_vel_to_faces.cpp
+74 −63 MOL/hydro_mol_extrap_vel_to_faces_box.cpp
+12 −5 Utils/hydro_compute_edgestate_and_flux.cpp
+7 −4 Utils/hydro_extrap_vel_to_faces.cpp
+6 −1 Utils/hydro_utils.H