Skip to content

Commit ed088c9

Browse files
pancettatorbjoernk
authored andcommitted
QUAD: uniform -> Uniform
1 parent 191b391 commit ed088c9

File tree

2 files changed

+5
-18
lines changed

2 files changed

+5
-18
lines changed

include/pfasst/quadrature.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ namespace pfasst
161161
}
162162
};
163163

164-
enum class QuadratureType { GaussLegendre, GaussLobatto, GaussRadau, ClenshawCurtis, uniform };
164+
enum class QuadratureType { GaussLegendre, GaussLobatto, GaussRadau, ClenshawCurtis, Uniform };
165165
template<typename node = time_precision>
166166
vector<node> compute_nodes(size_t nnodes, QuadratureType qtype)
167167
{
@@ -199,7 +199,7 @@ namespace pfasst
199199
nodes[j] = 0.5 * (1.0 - cos(j * PI / (nnodes - 1)));
200200
}
201201

202-
} else if (qtype == QuadratureType::uniform) {
202+
} else if (qtype == QuadratureType::Uniform) {
203203
for (size_t j = 0; j < nnodes; j++) {
204204
nodes[j] = node(j) / (nnodes - 1);
205205
}

tests/test_quadrature.cpp

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -209,13 +209,13 @@ TEST(NodesTest, UniformNodes)
209209
1.0
210210
};
211211

212-
auto u2 = pfasst::compute_nodes<long double>(2, pfasst::QuadratureType::uniform);
212+
auto u2 = pfasst::compute_nodes<long double>(2, pfasst::QuadratureType::Uniform);
213213
EXPECT_THAT(u2, testing::Pointwise(DoubleNear(), u2e));
214214

215-
auto u3 = pfasst::compute_nodes<long double>(3, pfasst::QuadratureType::uniform);
215+
auto u3 = pfasst::compute_nodes<long double>(3, pfasst::QuadratureType::Uniform);
216216
EXPECT_THAT(u3, testing::Pointwise(DoubleNear(), u3e));
217217

218-
auto u5 = pfasst::compute_nodes<long double>(5, pfasst::QuadratureType::uniform);
218+
auto u5 = pfasst::compute_nodes<long double>(5, pfasst::QuadratureType::Uniform);
219219
EXPECT_THAT(u5, testing::Pointwise(DoubleNear(), u5e));
220220
}
221221

@@ -282,19 +282,6 @@ TEST(QuadratureTest, ClenshawCurtisNodes)
282282
EXPECT_THAT(s4.data(), testing::Pointwise(DoubleNear(), s4e));
283283
}
284284

285-
286-
//TEST_P(QmatTest)
287-
//{
288-
// time_t
289-
// for (size_t m = 1; m < nnodes; ++m) {
290-
// qsum = 0;
291-
// for (size_t j = 1; j < nnodes; ++j) {
292-
// qsum += q[m,i];
293-
// }
294-
// EXPECT_THAT(qsum-nodes[m], testing::DoubleNear(0, 1E-04))
295-
//
296-
//}
297-
298285
int main(int argc, char** argv)
299286
{
300287
testing::InitGoogleTest(&argc, argv);

0 commit comments

Comments
 (0)