Skip to content

Adding point classification #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cwsmith merged 3 commits into from
Nov 26, 2025
Merged

Adding point classification #83

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be71a79
Adding point classification
Joshua-Kloepfer Nov 26, 2025
aad589d
Adding comments to Integration point
Joshua-Kloepfer Nov 26, 2025
98b651e
formatting
Joshua-Kloepfer Nov 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions src/MeshField_Integrate.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,16 @@ namespace MeshField {
template <size_t pointSize> struct IntegrationPoint {
// template parameter pointSize specifies the length of the integration point
// array for one point
IntegrationPoint(Kokkos::Array<Real, pointSize> const &p, double w)
: param(p), weight(w) {}
IntegrationPoint(Kokkos::Array<Real, pointSize> const &p, double w, int d,
int i)
: param(p), weight(w), dim(d), idx(i) {}
Kokkos::Array<Real, pointSize> param;
double weight;
// dim and idx represent the topological mesh entity the point is classified
// on dim represents whether it is edge, vertex, face, etc idx represents the
// index of the entity as defined by the shape function
int dim;
int idx;
};
template <size_t pointSize> class Integration {
public:
Expand Down Expand Up @@ -47,7 +53,8 @@ class TriangleIntegration : public EntityIntegration<3> {
public:
virtual int countPoints() const { return 1; }
virtual std::vector<IntegrationPoint<3>> getPoints() const {
return {IntegrationPoint(Vector3{1. / 3., 1. / 3., 1. / 3.}, 1.0 / 2.0)};
return {IntegrationPoint(Vector3{1. / 3., 1. / 3., 1. / 3.}, 1.0 / 2.0, 2,
0)};
}
virtual int getAccuracy() const { return 1; }
}; // end N1
Expand All @@ -57,13 +64,13 @@ class TriangleIntegration : public EntityIntegration<3> {
virtual std::vector<IntegrationPoint<3>> getPoints() const {
return {IntegrationPoint(Vector3{0.666666666666667, 0.166666666666667,
0.166666666666667},
1. / 3. / 2.0),
1. / 3. / 2.0, 2, 0),
IntegrationPoint(Vector3{0.166666666666667, 0.666666666666667,
0.166666666666667},
1. / 3. / 2.0),
1. / 3. / 2.0, 2, 0),
IntegrationPoint(Vector3{0.166666666666667, 0.166666666666667,
0.666666666666667},
1. / 3. / 2.0)};
1. / 3. / 2.0, 2, 0)};
}
virtual int getAccuracy() const { return 2; }
}; // end N2
Expand All @@ -82,7 +89,8 @@ class TetrahedronIntegration : public EntityIntegration<4> {
public:
virtual int countPoints() const { return 1; }
virtual std::vector<IntegrationPoint<4>> getPoints() const {
return {IntegrationPoint(Vector4{0.25, 0.25, 0.25, 0.25}, 1.0 / 6.0)};
return {
IntegrationPoint(Vector4{0.25, 0.25, 0.25, 0.25}, 1.0 / 6.0, 3, 0)};
}
virtual int getAccuracy() const { return 1; }
};
Expand All @@ -93,16 +101,16 @@ class TetrahedronIntegration : public EntityIntegration<4> {

return {IntegrationPoint(Vector4{0.138196601125011, 0.138196601125011,
0.138196601125011, 0.585410196624969},
0.25 / 6.0),
0.25 / 6.0, 3, 0),
IntegrationPoint(Vector4{0.585410196624969, 0.138196601125011,
0.138196601125011, 0.138196601125011},
0.25 / 6.0),
0.25 / 6.0, 3, 0),
IntegrationPoint(Vector4{0.138196601125011, 0.585410196624969,
0.138196601125011, 0.138196601125011},
0.25 / 6.0),
0.25 / 6.0, 3, 0),
IntegrationPoint(Vector4{0.138196601125011, 0.138196601125011,
0.585410196624969, 0.138196601125011},
0.25 / 6.0)};
0.25 / 6.0, 3, 0)};
}
virtual int getAccuracy() const { return 2; }
};
Expand Down
Loading