Skip to content

Commit e885f69

Browse files
committed
resolved most of the tests, up to 86% passing
1 parent 79f2bd9 commit e885f69

11 files changed

Lines changed: 1761 additions & 22 deletions

src/common/default_options.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ const nlohmann::json default_options{
2828
{"Pr", 0.72}, // the Prandtl number
2929
{"mu",
3030
-1.0}, // nondimensional viscosity (if negative, use Sutherland's)
31+
{"inviscid-mms", false}, // if true, include the inviscid MMS terms
3132
{"viscous-mms", false} // if true, include MMS terms for viscous test
3233
}},
3334

src/common/mfem_extensions.cpp

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,17 @@ void RRKImplicitMidpointSolver::Step(Vector &x, double &t, double &dt)
5555
x_new.Add(0.5 * dt, k);
5656
// double delta_entropy = f_ode->EntropyChange(dt / 2, x, k);
5757
double delta_entropy = f_ode->EntropyChange(0.5 * dt, x_new, k);
58-
if (out != nullptr)
59-
{
60-
//*out << "delta_entropy is " << delta_entropy << '\n';
61-
*out << std::setprecision(16);
62-
double supply_rate = f_ode->SupplyRate(0.5*dt, x_new, k);
63-
*out << ">>>>> supply rate at midpoint is listed below :" << '\n';
64-
*out << t << ' ' << supply_rate << '\n';
65-
}
58+
59+
// The following code was used for the flow-control paper;
60+
// it should be generalized or deleted eventually
61+
// if (out != nullptr)
62+
// {
63+
// //*out << "delta_entropy is " << delta_entropy << '\n';
64+
// *out << std::setprecision(16);
65+
// double supply_rate = f_ode->SupplyRate(0.5*dt, x_new, k);
66+
// *out << ">>>>> supply rate at midpoint is listed below :" << '\n';
67+
// *out << t << ' ' << supply_rate << '\n';
68+
// }
6669
double entropy_old = f_ode->Entropy(x);
6770
if (out != nullptr)
6871
{

src/physics/fluidflow/euler_integ_def.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ void FarFieldBC<dim, entvar>::calcFlux(const mfem::Vector &x,
541541
const mfem::Vector &q,
542542
mfem::Vector &flux_vec)
543543
{
544-
calcFarFieldFlux2<double, dim, entvar>(dir.GetData(),
544+
calcFarFieldFlux<double, dim, entvar>(dir.GetData(),
545545
qfs.GetData(),
546546
q.GetData(),
547547
work_vec.GetData(),

src/physics/fluidflow/flow_residual.cpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,13 @@ void FlowResidual<dim, entvar>::addFlowDomainIntegrators(
154154
" state!\n");
155155
}
156156
res.addDomainIntegrator(new EulerIntegrator<dim>(stack));
157-
if (flow["inviscid-mms"])
158-
{
159-
res.addDomainIntegrator(new InviscidMMSIntegrator(-1.0,dim));
160-
}
161157
}
158+
159+
if (flow.value("inviscid-mms", false))
160+
{
161+
res.addDomainIntegrator(new InviscidMMSIntegrator(-1.0,dim));
162+
}
163+
162164
// add the LPS stabilization, if necessary
163165
auto lps_coeff = space_dis["lps-coeff"];
164166
if (lps_coeff > 0.0)
@@ -171,7 +173,7 @@ void FlowResidual<dim, entvar>::addFlowDomainIntegrators(
171173
{
172174
res.addDomainIntegrator(
173175
new ESViscousIntegrator<dim>(stack, re_fs, pr_fs, mu));
174-
if (flow["viscous-mms"])
176+
if (flow.value("viscous-mms", false))
175177
{
176178
if (dim != 2)
177179
{

src/physics/miso_nonlinearform.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ mfem::Operator &getJacobian(MISONonlinearForm &form,
106106
const MISOInputs &inputs,
107107
const std::string &wrt)
108108
{
109+
// TODO: the warning below should be active at some level of verbosity
109110
std::cout << "Re-assembling Jacobian!\n";
110111

111112
mfem::Vector state;

test/README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
# Contents of the Test directory
22

3-
As you would expect, this is where the unit tests will go
3+
The tests are built (from the `build` folder) by running `make tests`. See the **Tests** Section of the main README file for more details.
4+
5+
If you only want to recompile and then run a single test, you can do so as follows:
6+
```
7+
make <test name without .cpp>.bin
8+
mpirun -n 1 ./<test name without .cpp>.bin
9+
```

test/regression/test_steady_vortex.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ auto options = R"(
1515
{
1616
"print-options": false,
1717
"flow-param": {
18-
"miso": 1.0,
18+
"mach": 1.0,
1919
"aoa": 0.0
2020
},
2121
"space-dis": {

0 commit comments

Comments
 (0)