Skip to content

Commit

Permalink
Merge branch 'build-production' into production
Browse files Browse the repository at this point in the history
  • Loading branch information
majosm committed Jul 17, 2023
2 parents 863ffcc + b866c9c commit 7d10db2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 55 deletions.
2 changes: 1 addition & 1 deletion mirgecom/boundary.py
Original file line number Diff line number Diff line change
Expand Up @@ -1542,7 +1542,7 @@ def outflow_state(self, dcoll, dd_bdry, gas_model, state_minus, **kwargs):
"""
actx = state_minus.array_context
nhat = actx.thaw(dcoll.normal(dd_bdry))
ones = actx.zeros_like(state_minus.temperature) + 1.
ones = actx.np.zeros_like(state_minus.temperature) + 1.

free_stream_state = self.free_stream_state_func(
dcoll, dd_bdry, gas_model, state_minus, **kwargs)
Expand Down
56 changes: 2 additions & 54 deletions mirgecom/multiphysics/thermally_coupled_fluid_wall.py
Original file line number Diff line number Diff line change
Expand Up @@ -1274,20 +1274,12 @@ def coupled_grad_t_operator(
If `True`, interface boundaries on the fluid side will be treated as
no-slip walls. If `False` they will be treated as slip walls.
interface_radiation: bool
If `True`, interface includes a radiation sink term in the heat flux. See
:class:`~mirgecom.multiphysics.thermally_coupled_fluid_wall.InterfaceWallRadiationBoundary`
for details. Additional arguments *wall_emissivity*, *sigma*, and
*ambient_temperature* are required if enabled and *wall_grad_temperature*
is not `None`.
use_kappa_weighted_grad_flux_in_fluid: bool
Indicates whether the temperature gradient flux on the fluid side of the
interface should be computed using a simple average of temperatures or by
weighting the temperature from each side by its respective thermal
conductivity. Not used if *interface_radiation* is `True`.
conductivity.
quadrature_tag:
Expand Down Expand Up @@ -1349,7 +1341,6 @@ def coupled_grad_t_operator(
fluid_state, wall_kappa, wall_temperature,
fluid_boundaries, wall_boundaries,
interface_noslip=interface_noslip,
interface_radiation=interface_radiation,
quadrature_tag=quadrature_tag)
else:
fluid_all_boundaries_no_grad = _fluid_all_boundaries_no_grad
Expand Down Expand Up @@ -1378,11 +1369,7 @@ def coupled_ns_heat_operator(
*,
time=0.,
interface_noslip=True,
interface_radiation=False,
use_kappa_weighted_grad_flux_in_fluid=None,
wall_emissivity=None,
sigma=None,
ambient_temperature=None,
wall_penalty_amount=None,
quadrature_tag=DISCR_TAG_BASE,
limiter_func=None,
Expand Down Expand Up @@ -1454,37 +1441,12 @@ def coupled_ns_heat_operator(
If `True`, interface boundaries on the fluid side will be treated as
no-slip walls. If `False` they will be treated as slip walls.
interface_radiation: bool
If `True`, interface includes a radiation sink term in the heat flux. See
:class:`~mirgecom.multiphysics.thermally_coupled_fluid_wall.InterfaceWallRadiationBoundary`
for details. Additional arguments *wall_emissivity*, *sigma*, and
*ambient_temperature* are required if enabled.
use_kappa_weighted_grad_flux_in_fluid: bool
Indicates whether the temperature gradient flux on the fluid side of the
interface should be computed using a simple average of temperatures or by
weighting the temperature from each side by its respective thermal
conductivity. Not used if *interface_radiation* is `True`.
wall_emissivity: float or :class:`meshmode.dof_array.DOFArray`
Emissivity of the wall material.
sigma: float
Stefan-Boltzmann constant.
ambient_temperature: :class:`meshmode.dof_array.DOFArray`
Ambient temperature of the environment.
wall_penalty_amount: float
Coefficient $c$ for the interior penalty on the heat flux. See
:class:`~mirgecom.multiphysics.thermally_coupled_fluid_wall.InterfaceFluidBoundary`
for details. Not used if *interface_radiation* is `True`.
conductivity.
wall_penalty_amount: float
Expand Down Expand Up @@ -1522,15 +1484,6 @@ def coupled_ns_heat_operator(
":func:`add_interface_boundaries` and include them when calling the "
"individual operators instead.", DeprecationWarning, stacklevel=2)

if interface_radiation:
if (
wall_emissivity is None
or sigma is None
or ambient_temperature is None):
raise TypeError(
"Arguments 'wall_emissivity', 'sigma' and 'ambient_temperature'"
"are required if using surface radiation.")

if use_kappa_weighted_grad_flux_in_fluid is None:
warn(
"Default value of use_kappa_weighted_grad_flux_in_fluid has changed "
Expand Down Expand Up @@ -1565,7 +1518,6 @@ def coupled_ns_heat_operator(
fluid_state, wall_kappa, wall_temperature,
fluid_boundaries, wall_boundaries,
interface_noslip=interface_noslip,
interface_radiation=interface_radiation,
quadrature_tag=quadrature_tag)

# Get the operator fluid states
Expand Down Expand Up @@ -1600,10 +1552,6 @@ def coupled_ns_heat_operator(
fluid_grad_temperature, wall_grad_temperature,
fluid_boundaries, wall_boundaries,
interface_noslip=interface_noslip,
interface_radiation=interface_radiation,
wall_emissivity=wall_emissivity,
sigma=sigma,
ambient_temperature=ambient_temperature,
wall_penalty_amount=wall_penalty_amount,
quadrature_tag=quadrature_tag)

Expand Down

0 comments on commit 7d10db2

Please sign in to comment.