From db1017e32f2f8d3b389df0a93b362bf44ea4f306 Mon Sep 17 00:00:00 2001 From: Peter Munch Date: Mon, 9 Mar 2020 07:37:09 +0100 Subject: [PATCH] Step-69: fix warnings --- examples/step-69/step-69.cc | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/examples/step-69/step-69.cc b/examples/step-69/step-69.cc index fca2a20386..836e27c8eb 100644 --- a/examples/step-69/step-69.cc +++ b/examples/step-69/step-69.cc @@ -1547,10 +1547,10 @@ namespace Step69 // conserved quantities. The return array consists of density $\rho$, // velocity $u$, pressure $p$ and local speed of sound $a$: - return {projected_U[0], - projected_U[1] / projected_U[0], - ProblemDescription<1>::pressure(projected_U), - ProblemDescription<1>::speed_of_sound(projected_U)}; + return {{projected_U[0], + projected_U[1] / projected_U[0], + ProblemDescription<1>::pressure(projected_U), + ProblemDescription<1>::speed_of_sound(projected_U)}}; } // At this point we also define two small functions that return the @@ -1704,22 +1704,16 @@ namespace Step69 // naming the corresponding components: template <> - const std::array ProblemDescription<1>::component_names{"rho", - "m", - "E"}; + const std::array ProblemDescription<1>::component_names{ + {"rho", "m", "E"}}; template <> - const std::array ProblemDescription<2>::component_names{"rho", - "m_1", - "m_2", - "E"}; + const std::array ProblemDescription<2>::component_names{ + {"rho", "m_1", "m_2", "E"}}; template <> - const std::array ProblemDescription<3>::component_names{"rho", - "m_1", - "m_2", - "m_3", - "E"}; + const std::array ProblemDescription<3>::component_names{ + {"rho", "m_1", "m_2", "m_3", "E"}}; // @sect4{Initial values} -- 2.39.5