Skip to content

V5 #8

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

Draft
coco-yeung wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

V5 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cf3a43a
Removed optional secondBoundaryConds()
coco-yeung Feb 2, 2026
1fddccc
remove const
coco-yeung Feb 2, 2026
75f8dbb
remove const
coco-yeung Feb 2, 2026
178f20c
added boolean flag
coco-yeung Feb 2, 2026
1e5c55c
fixing error
coco-yeung Feb 2, 2026
590423f
fixing error
coco-yeung Feb 2, 2026
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
4 changes: 2 additions & 2 deletions Code.v05-00/include/FVM_ANDS/AdvDiffSystem.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,8 +337,8 @@ namespace FVM_ANDS{
if(point->bcDirection() == direction){
return point->corrPoint();
}
else if (point->secondBoundaryConds() && point->secondBoundaryConds().value().direction == direction){
return point->secondBoundaryConds().value().corrPoint;
else if (const auto* bc = point->secondBoundaryConds(); bc && bc->direction == direction) {
return bc->corrPoint;
}
return neighbor_point_interior(direction, pointID);
}
Expand Down
11 changes: 6 additions & 5 deletions Code.v05-00/include/FVM_ANDS/BoundaryCondition.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ namespace FVM_ANDS{
inline virtual void setSecondaryBC(BoundaryCondDescription bc) {
return;
}
virtual inline std::optional<BoundaryCondDescription> secondBoundaryConds() const {
return std::nullopt;
virtual inline BoundaryCondDescription* secondBoundaryConds() {
return nullptr;
}
protected:
BoundaryCondDescription bc_;
Expand All @@ -75,12 +75,13 @@ namespace FVM_ANDS{
inline void setSecondaryBC(BoundaryCondDescription bc) override {
secondary_bc_ = bc;
}
inline std::optional<BoundaryCondDescription> secondBoundaryConds() const override{
return secondary_bc_;
inline BoundaryCondDescription* secondBoundaryConds() override{
return has_secondary_bc_ ? &secondary_bc_ : nullptr;
}

private:
std::optional<BoundaryCondDescription> secondary_bc_;
BoundaryCondDescription secondary_bc_;
bool has_secondary_bc_;
};
struct BoundaryConditions {
BoundaryConditionFlag bcType_top;
Expand Down
52 changes: 32 additions & 20 deletions Code.v05-00/src/FVM_ANDS/AdvDiffSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,9 @@ namespace FVM_ANDS{
isSouthBoundary = points_[i]->bcDirection() == FaceDirection::SOUTH;

//Corner cases...
bool secondaryWestBound = (points_[i]->secondBoundaryConds() && points_[i]->secondBoundaryConds().value().direction == FaceDirection::WEST);
bool secondaryEastBound = (points_[i]->secondBoundaryConds() && points_[i]->secondBoundaryConds().value().direction == FaceDirection::EAST);
const auto* secondBC = points_[i]->secondBoundaryConds();
bool secondaryWestBound = (secondBC && secondBC->direction == FaceDirection::WEST);
bool secondaryEastBound = (secondBC && secondBC->direction == FaceDirection::EAST);

isWestBoundary = (points_[i]->bcDirection() == FaceDirection::WEST || secondaryWestBound);
isEastBoundary = (points_[i]->bcDirection() == FaceDirection::EAST || secondaryEastBound);
Expand Down Expand Up @@ -358,14 +359,15 @@ namespace FVM_ANDS{
case FaceDirection::ERROR:
throw std::runtime_error("Invalid FaceDirection in Dirichlet boundary condition");
}
if (!points_[i]->secondBoundaryConds()) break;
BoundaryCondDescription bc_2 = points_[i]->secondBoundaryConds().value();
switch(bc_2.direction){
const auto* bc_2 = points_[i]->secondBoundaryConds();
if (!bc_2) break;

switch(bc_2->direction){
case FaceDirection::EAST:
rhs_[i] -= u_vec_[i] * dt_ / dx_ * bc_2.bcVal;
rhs_[i] -= u_vec_[i] * dt_ / dx_ * bc_2->bcVal;
break;
case FaceDirection::WEST:
rhs_[i] += u_vec_[i] * dt_ / dx_ * bc_2.bcVal;
rhs_[i] += u_vec_[i] * dt_ / dx_ * bc_2->bcVal;
break;
default:
throw std::runtime_error("Can't have anything but EAST or WEST as secondary BC!");
Expand Down Expand Up @@ -420,8 +422,12 @@ namespace FVM_ANDS{
//corner cases
if(j == 0 || j == ny_ - 1){
int bPointID_cornerLeft = twoDIdx_to_vecIdx(0, j, nx_, ny_, format_);
int ghostPointID = points_[bPointID_cornerLeft]->secondBoundaryConds().value().corrPoint;
double bcVal = points_[bPointID_cornerLeft]->secondBoundaryConds().value().bcVal;
const auto* bc_left = points_[bPointID_cornerLeft]->secondBoundaryConds();
if (!bc_left) {
throw std::runtime_error("Expected secondary BC on corner left point");
}
int ghostPointID = bc_left->corrPoint;
double bcVal = bc_left->bcVal;
switch(bcType_left_){
case BoundaryConditionFlag::DIRICHLET_INT_BPOINT: {
phi_[ghostPointID] = 2 * bcVal - phi_[bPointID_cornerLeft];
Expand All @@ -433,8 +439,12 @@ namespace FVM_ANDS{
}

int bPointID_cornerRight = twoDIdx_to_vecIdx(nx_ - 1, j, nx_, ny_, format_);
ghostPointID = points_[bPointID_cornerRight]->secondBoundaryConds().value().corrPoint;
bcVal = points_[bPointID_cornerRight]->secondBoundaryConds().value().bcVal;
const auto* bc_right = points_[bPointID_cornerRight]->secondBoundaryConds();
if (!bc_right) {
throw std::runtime_error("Expected secondary BC on corner right point");
}
ghostPointID = bc_right->corrPoint;
bcVal = bc_right->bcVal;

switch(bcType_right_){
case BoundaryConditionFlag::DIRICHLET_INT_BPOINT: {
Expand Down Expand Up @@ -558,26 +568,28 @@ namespace FVM_ANDS{
int idx_N = i + 1;
int idx_S = i - 1;

Point* point = points_[i].get();
const auto* secondBC = point->secondBoundaryConds();

//commenting out this results in ~30% speedup
//The calls involving the optional are maybe 1/3 of the cost. Maybe something to look at later.
if(points_[i]->bcType() != BoundaryConditionFlag::INTERIOR){
Point* point = points_[i].get();
FaceDirection direction = point->bcDirection();
isNorthBoundary = direction == FaceDirection::NORTH;
isSouthBoundary = direction == FaceDirection::SOUTH;

//Corner cases...
bool secondaryWestBound = (point->secondBoundaryConds() && point->secondBoundaryConds()->direction == FaceDirection::WEST);
bool secondaryEastBound = (point->secondBoundaryConds() && point->secondBoundaryConds()->direction == FaceDirection::EAST);
bool secondaryWestBound = (secondBC && secondBC->direction == FaceDirection::WEST);
bool secondaryEastBound = (secondBC && secondBC->direction == FaceDirection::EAST);

isWestBoundary = (direction == FaceDirection::WEST || secondaryWestBound);
isEastBoundary = (direction == FaceDirection::EAST || secondaryEastBound);

//only call this lookup function on boundary nodes which are inconsequential in number
idx_N = isNorthBoundary? point->corrPoint() : idx_N;
idx_S = isSouthBoundary? point->corrPoint() : idx_S;
idx_E = isEastBoundary? (secondaryEastBound ? point->secondBoundaryConds()->corrPoint : point->corrPoint()) : idx_E;
idx_W = isWestBoundary? (secondaryEastBound ? point->secondBoundaryConds()->corrPoint : point->corrPoint()) : idx_W;
idx_N = isNorthBoundary ? point->corrPoint() : idx_N;
idx_S = isSouthBoundary ? point->corrPoint() : idx_S;
idx_E = isEastBoundary ? (secondaryEastBound ? secondBC->corrPoint : point->corrPoint()) : idx_E;
idx_W = isWestBoundary ? (secondaryWestBound ? secondBC->corrPoint : point->corrPoint()) : idx_W;
}
//When you declare these vars (inside or outside loop) has 0 impact)
//takes ~ 6 out of 18 ns on background var calcs
Expand Down Expand Up @@ -627,7 +639,7 @@ namespace FVM_ANDS{
}

if(isWestBoundary){
phi_W = secondaryWestBound ? points_[i]->secondBoundaryConds().value().bcVal : points_[i]->bcVal();
phi_W = secondaryWestBound ? secondBC->bcVal : points_[i]->bcVal();
}
else if (u_local >= 0){
phi_W = phi_[idx_W] + 0.5 * minmod_W_vPos(i) * (phi_[i] - phi_[idx_W]);
Expand All @@ -637,7 +649,7 @@ namespace FVM_ANDS{
}

if(isEastBoundary){
phi_E = secondaryEastBound ? points_[i]->secondBoundaryConds().value().bcVal : points_[i]->bcVal();
phi_E = secondaryEastBound ? secondBC->bcVal : points_[i]->bcVal();
}
else if (u_local >= 0){
phi_E = phi_[i] + 0.5 * minmod_E_vPos(i) * (phi_[idx_E] - phi_[i]);
Expand Down
6 changes: 2 additions & 4 deletions Code.v05-00/src/FVM_ANDS/BoundaryCondition.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,10 @@ namespace FVM_ANDS {
setBC(bc);
}
IntBoundPoint::IntBoundPoint(BoundaryCondDescription bc1)
: Point(bc1) {
secondary_bc_= std::nullopt;
: Point(bc1), secondary_bc_(), has_secondary_bc_(false) {
}
IntBoundPoint::IntBoundPoint(BoundaryCondDescription bc1, BoundaryCondDescription bc2)
: Point(bc1) {
secondary_bc_ = bc2;
: Point(bc1), secondary_bc_(bc2), has_secondary_bc_(true){
}

BoundaryCondDescription::BoundaryCondDescription()
Expand Down