Skip to content

Commit 568ad42

Browse files
committed
applyParallelBoundary can be a no-op for non-fci
1 parent c840122 commit 568ad42

File tree

1 file changed

+30
-5
lines changed

1 file changed

+30
-5
lines changed

src/field/field3d.cxx

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,12 @@ void Field3D::applyParallelBoundary() {
544544
TRACE("Field3D::applyParallelBoundary()");
545545

546546
checkData(*this);
547-
ASSERT1(hasParallelSlices());
547+
if (isFci()) {
548+
ASSERT1(hasParallelSlices());
549+
}
550+
if (!hasParallelSlices()) {
551+
return;
552+
}
548553

549554
// Apply boundary to this field
550555
for (const auto& bndry : getBoundaryOpPars()) {
@@ -557,7 +562,12 @@ void Field3D::applyParallelBoundary(BoutReal t) {
557562
TRACE("Field3D::applyParallelBoundary(t)");
558563

559564
checkData(*this);
560-
ASSERT1(hasParallelSlices());
565+
if (isFci()) {
566+
ASSERT1(hasParallelSlices());
567+
}
568+
if (!hasParallelSlices()) {
569+
return;
570+
}
561571

562572
// Apply boundary to this field
563573
for (const auto& bndry : getBoundaryOpPars()) {
@@ -570,7 +580,12 @@ void Field3D::applyParallelBoundary(const std::string& condition) {
570580
TRACE("Field3D::applyParallelBoundary(condition)");
571581

572582
checkData(*this);
573-
ASSERT1(hasParallelSlices());
583+
if (isFci()) {
584+
ASSERT1(hasParallelSlices());
585+
}
586+
if (!hasParallelSlices()) {
587+
return;
588+
}
574589

575590
/// Get the boundary factory (singleton)
576591
BoundaryFactory* bfact = BoundaryFactory::getInstance();
@@ -589,7 +604,12 @@ void Field3D::applyParallelBoundary(const std::string& region,
589604
TRACE("Field3D::applyParallelBoundary(region, condition)");
590605

591606
checkData(*this);
592-
ASSERT1(hasParallelSlices());
607+
if (isFci()) {
608+
ASSERT1(hasParallelSlices());
609+
}
610+
if (!hasParallelSlices()) {
611+
return;
612+
}
593613

594614
/// Get the boundary factory (singleton)
595615
BoundaryFactory* bfact = BoundaryFactory::getInstance();
@@ -611,7 +631,12 @@ void Field3D::applyParallelBoundary(const std::string& region,
611631
TRACE("Field3D::applyParallelBoundary(region, condition, f)");
612632

613633
checkData(*this);
614-
ASSERT1(hasParallelSlices());
634+
if (isFci()) {
635+
ASSERT1(hasParallelSlices());
636+
}
637+
if (!hasParallelSlices()) {
638+
return;
639+
}
615640

616641
/// Get the boundary factory (singleton)
617642
BoundaryFactory* bfact = BoundaryFactory::getInstance();

0 commit comments

Comments
 (0)