Skip to content

Commit

Permalink
Merge branch 'production' into production-pilot
Browse files Browse the repository at this point in the history
  • Loading branch information
MTCam committed Nov 15, 2023
2 parents b0b8098 + b9d8230 commit 12720de
Show file tree
Hide file tree
Showing 20 changed files with 1,790 additions and 1,019 deletions.
1 change: 1 addition & 0 deletions examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ The examples and the unique features they exercise are as follows:
- `sod.py`: Sod's shock case: Fluid test case with strong shock
- `vortex.py`: Isentropic vortex advection: outflow boundaries, verification
- `hotplate.py`: Isothermal BC verification (prescribed exact soln)
- `blasius.py`: Inflow, outflow and no-slip wall BC verification
- `doublemach.py`: AV test case
- `poiseuille.py`: Poiseuille flow verification case
- `poiseuille-multispecies.py`: Poiseuille flow with passive scalars
Expand Down
3 changes: 2 additions & 1 deletion examples/ablation-workshop.py
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,8 @@ def pressure(self, cv: ConservedVars, temperature: DOFArray) -> DOFArray:
return cv.mass*gas_const*temperature

def gas_const(self, cv: Optional[ConservedVars] = None,
temperature: Optional[DOFArray] = None) -> DOFArray:
temperature: Optional[DOFArray] = None,
species_mass_fractions: Optional[np.ndarray] = None) -> DOFArray:
coeffs = self._cs_molar_mass.c
bnds = self._cs_molar_mass.x
molar_mass = eval_spline(temperature, bnds, coeffs)
Expand Down
7 changes: 3 additions & 4 deletions examples/autoignition.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
from mirgecom.integrators import rk4_step
from mirgecom.steppers import advance_state
from mirgecom.boundary import AdiabaticSlipBoundary
from mirgecom.initializers import MixtureInitializer
from mirgecom.initializers import Uniform
from mirgecom.eos import PyrometheusMixture
from mirgecom.gas_model import (
GasModel, make_fluid_state
Expand Down Expand Up @@ -265,9 +265,8 @@ def main(actx_class, use_leap=False, use_overintegration=False,
# (density, pressure, temperature, mass_fractions)
print(f"Cantera state (rho,T,P,Y) = ({can_rho}, {can_t}, {can_p}, {can_y}")
velocity = np.zeros(shape=(dim,))
initializer = MixtureInitializer(dim=dim, nspecies=nspecies,
pressure=can_p, temperature=can_t,
massfractions=can_y, velocity=velocity)
initializer = Uniform(dim=dim, pressure=can_p, temperature=can_t,
species_mass_fractions=can_y, velocity=velocity)

my_boundary = AdiabaticSlipBoundary()
boundaries = {BTAG_ALL: my_boundary}
Expand Down
49 changes: 49 additions & 0 deletions examples/blasius.geo
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
//

lcar0 = 0.002;
lcar1 = 0.020;

xI = 0.04;
xO = 0.04;
yy = 0.04;
Point(1) = { -xI, 0.0, 0.0, lcar1};
Point(2) = { 0.0, 0.0, 0.0, lcar0};
Point(3) = { +xO, 0.0, 0.0, lcar1};
Point(4) = { +xO, +yy, 0.0, lcar1};
Point(5) = { 0.0, +yy, 0.0, lcar0};
Point(6) = { -xI, +yy, 0.0, lcar1};

//Define bounding box edges
Line( 1) = {1, 2};
Line( 2) = {2, 3};
Line( 3) = {3, 4};
Line( 4) = {4, 5};
Line( 5) = {5, 6};
Line( 6) = {6, 1};
Line( 7) = {2, 5};

Transfinite Line {-1} = 27 Using Progression 1.1;
Transfinite Line { 5} = 27 Using Progression 1.1;

Transfinite Line {3} = 61 Using Progression 1.05;
Transfinite Line {-6} = 61 Using Progression 1.05;
Transfinite Line {7} = 61 Using Progression 1.05;

Transfinite Line {2} = 61 Using Progression 1.02;
Transfinite Line {-4} = 61 Using Progression 1.02;

Line Loop(1) = {6,1,7,5};
Plane Surface(1) = {-1};
Transfinite Surface {1} Alternate;

Line Loop(2) = {4,-7,2,3};
Plane Surface(2) = {-2};
Transfinite Surface {2} Alternate;

Physical Line("inlet") = {6};
Physical Line("outlet") = {3};
Physical Line("slip") = {1};
Physical Line("wall") = {2};
Physical Line("farfield") = {4,5};
Physical Surface("domain") = {1,2};

Loading

0 comments on commit 12720de

Please sign in to comment.