Skip to content

Commit

Permalink
Merge pull request #12839 from drwells/use-more-std-array
Browse files Browse the repository at this point in the history
Use some more std::arrays.
  • Loading branch information
peterrum committed Oct 17, 2021
2 parents f102a78 + 474e23b commit 7de7bfe
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions source/grid/grid_generator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2528,7 +2528,7 @@ namespace GridGenerator
}

// calculate deltas and validate input
std::vector<Point<spacedim>> delta(dim);
std::array<Point<spacedim>, dim> delta;
for (unsigned int i = 0; i < dim; ++i)
{
Assert(repetitions[i] >= 1, ExcInvalidRepetitions(repetitions[i]));
Expand Down Expand Up @@ -3041,8 +3041,8 @@ namespace GridGenerator

Assert(spacing.size() == dim, ExcInvalidRepetitionsDimension(dim));

std::vector<unsigned int> repetitions(dim);
double delta = std::numeric_limits<double>::max();
std::array<unsigned int, dim> repetitions;
double delta = std::numeric_limits<double>::max();
for (unsigned int i = 0; i < dim; ++i)
{
repetitions[i] = spacing[i].size();
Expand Down Expand Up @@ -3156,8 +3156,8 @@ namespace GridGenerator
// are >= 1, and calculate deltas
// convert repetitions from double
// to int by taking the ceiling.
std::vector<Point<spacedim>> delta(dim);
unsigned int repetitions[dim];
std::array<Point<spacedim>, dim> delta;
std::array<unsigned int, dim> repetitions;
for (unsigned int i = 0; i < dim; ++i)
{
Assert(holes[i] >= 1,
Expand Down

0 comments on commit 7de7bfe

Please sign in to comment.