Merge pull request #3319 from boutproject/no-compute-ynext

ZedThree · web-flow · commit e97bb6281a3e · 2026-03-12T09:39:31.000Z
Prevent accidential overwriting of parallel slices
diff --git a/src/field/field3d.cxx b/src/field/field3d.cxx
@@ -343,6 +343,7 @@ Field3D& Field3D::operator=(const BoutReal val) {
 }
 
 void Field3D::calcParallelSlices() {
+  ASSERT1(areCalcParallelSlicesAllowed());
   getCoordinates()->getParallelTransform().calcParallelSlices(*this);
 }
 
diff --git a/src/mesh/parallel/fci.cxx b/src/mesh/parallel/fci.cxx
@@ -378,7 +378,7 @@ void FCITransform::checkInputGrid() {
 }
 
 void FCITransform::calcParallelSlices(Field3D& f) {
-
+  ASSERT1(f.areCalcParallelSlicesAllowed());
   ASSERT1(f.getDirectionY() == YDirectionType::Standard);
   // Only have forward_map/backward_map for CELL_CENTRE, so can only deal with
   // CELL_CENTRE inputs

Original file line number	Diff line number	Diff line change
`@@ -343,6 +343,7 @@ Field3D& Field3D::operator=(const BoutReal val) {`
`343`	`343`	`}`
`344`	`344`
`345`	`345`	`void Field3D::calcParallelSlices() {`
	`346`	`+ ASSERT1(areCalcParallelSlicesAllowed());`
`346`	`347`	`getCoordinates()->getParallelTransform().calcParallelSlices(*this);`
`347`	`348`	`}`
`348`	`349`
Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,7 @@ void FCITransform::checkInputGrid() {`
`378`	`378`	`}`
`379`	`379`
`380`	`380`	`void FCITransform::calcParallelSlices(Field3D& f) {`
`381`		`-`
	`381`	`+ ASSERT1(f.areCalcParallelSlicesAllowed());`
`382`	`382`	`ASSERT1(f.getDirectionY() == YDirectionType::Standard);`
`383`	`383`	`// Only have forward_map/backward_map for CELL_CENTRE, so can only deal with`
`384`	`384`	`// CELL_CENTRE inputs`