Skip to content

Commit 834b090

Browse files
tomc271github-actions[bot]
authored andcommitted
Apply clang-format changes
1 parent 09162ca commit 834b090

2 files changed

Lines changed: 13 additions & 10 deletions

File tree

include/bout/metric_tensor.hxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ public:
6161
g23_m = metric_tensor.g23();
6262
}
6363

64-
MetricTensor inverse(const std::string& region = "RGN_ALL", const bool communicate = true);
64+
MetricTensor inverse(const std::string& region = "RGN_ALL",
65+
const bool communicate = true);
6566

6667
// Transforms the MetricTensor by applying the given function to every component
6768
template <class F>
@@ -78,7 +79,6 @@ public:
7879

7980
private:
8081
FieldMetric g11_m, g22_m, g33_m, g12_m, g13_m, g23_m;
81-
8282
};
8383

8484
class CovariantMetricTensor : public MetricTensor {

src/mesh/coordinates.cxx

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -501,9 +501,11 @@ void Coordinates::interpolateFromCoordinates(Options* mesh_options,
501501
checkCovariant();
502502

503503
setJ(interpolateAndExtrapolate(coords_in->J(), location, true, true, false,
504-
transform.get()), false);
504+
transform.get()),
505+
false);
505506
setBxy(interpolateAndExtrapolate(coords_in->Bxy(), location, true, true, false,
506-
transform.get()), false);
507+
transform.get()),
508+
false);
507509

508510
bout::checkFinite(J(), "The Jacobian", "RGN_NOCORNERS");
509511
bout::checkPositive(J(), "The Jacobian", "RGN_NOCORNERS");
@@ -618,7 +620,8 @@ void Coordinates::readFromMesh(Options* mesh_options, const std::string& suffix)
618620
output_warn.write("\tWARNING! Covariant components of metric tensor set manually. "
619621
"Contravariant components NOT recalculated\n");
620622
} else {
621-
covariantMetricTensor.setMetricTensor(contravariantMetricTensor.inverse("RGN_ALL", false));
623+
covariantMetricTensor.setMetricTensor(
624+
contravariantMetricTensor.inverse("RGN_ALL", false));
622625
output_warn.write("Not all covariant components of metric tensor found. "
623626
"Calculating all from the contravariant tensor\n");
624627
}
@@ -647,7 +650,8 @@ void Coordinates::readFromMesh(Options* mesh_options, const std::string& suffix)
647650
// More robust to extrapolate derived quantities directly, rather than
648651
// deriving from extrapolated covariant metric components
649652
setJ(interpolateAndExtrapolate(J(), location, extrapolate_x, extrapolate_y, false,
650-
transform.get()), false);
653+
transform.get()),
654+
false);
651655

652656
// Check jacobian
653657
bout::checkFinite(J(), "J" + suffix, "RGN_NOCORNERS");
@@ -670,7 +674,8 @@ void Coordinates::readFromMesh(Options* mesh_options, const std::string& suffix)
670674
}
671675

672676
setBxy(interpolateAndExtrapolate(Bxy(), location, extrapolate_x, extrapolate_y, false,
673-
transform.get()), false);
677+
transform.get()),
678+
false);
674679

675680
// Check Bxy
676681
bout::checkFinite(Bxy(), "Bxy" + suffix, "RGN_NOCORNERS");
@@ -1542,6 +1547,4 @@ void Coordinates::communicateMetricTensor() {
15421547
covariantMetricTensor.communicate();
15431548
}
15441549

1545-
void Coordinates::communicateDz() {
1546-
localmesh->communicate(dz_);
1547-
}
1550+
void Coordinates::communicateDz() { localmesh->communicate(dz_); }

0 commit comments

Comments
 (0)