Merge branch 'f3dparallel' into move-ops

Author: dschwoerer

include/bout/field3d.hxx

@@ -342,7 +342,7 @@ public:
   const Region<Ind3D>& getValidRegionWithDefault(const std::string& region_name) const;
   void setRegion(const std::string& region_name) override;
   void resetRegion() override { regionID.reset(); };
-  void resetRegionParallel();
+  void resetRegionParallel(bool force = false);
   void setRegion(size_t id) override { regionID = id; };
   void setRegion(std::optional<size_t> id) override { regionID = id; };
   std::optional<size_t> getRegionID() const override { return regionID; };

src/field/field3d.cxx

@@ -883,8 +883,8 @@ void Field3D::setRegion(const std::string& region_name) {
   regionID = fieldmesh->getRegionID(region_name);
 }
 
-void Field3D::resetRegionParallel() {
-  if (isFci()) {
+void Field3D::resetRegionParallel(const bool force) {
+  if (force or isFci()) {
     for (int i = 0; i < fieldmesh->ystart; ++i) {
       yup_fields[i].setRegion(fmt::format("RGN_YPAR_{:+d}", i + 1));
       ydown_fields[i].setRegion(fmt::format("RGN_YPAR_{:+d}", -i - 1));

src/mesh/coordinates.cxx

@@ -1111,15 +1111,11 @@ int Coordinates::geometry(bool recalculate_staggered,
     if (localmesh->get(d2y, "d2y" + suffix, 0.0, false, location)) {
       output_warn.write(
           "\tWARNING: differencing quantity 'd2y' not found. Calculating from dy\n");
-      if (dy.isFci()) {
-        d1_dy = BoutNaN;
-      } else {
-        d1_dy = DDY(1. / dy.asField3DParallel()); // d/di(1/dy)
+      d1_dy = DDY(1. / dy.asField3DParallel()); // d/di(1/dy)
 
-        localmesh->communicate_no_slices(d1_dy);
-        d1_dy =
-            interpolateAndExtrapolate(d1_dy, location, true, true, true, transform.get());
-      }
+      localmesh->communicate_no_slices(d1_dy);
+      d1_dy =
+          interpolateAndExtrapolate(d1_dy, location, true, true, true, transform.get());
     } else {
       d2y.setLocation(location);
       // set boundary cells if necessary

src/mesh/parallel/fci.cxx

@@ -88,6 +88,7 @@ void load_parallel_metric_component(std::string name, Field3D& component, int of
   if (!component.hasParallelSlices()) {
     component.splitParallelSlices();
     component.disallowCalcParallelSlices();
+    component.resetRegionParallel(true);
   }
   auto& pcom = component.ynext(offset);
   pcom.allocate();
@@ -104,6 +105,7 @@ void load_parallel_metric_components(Coordinates* coords, int offset) {
   LOAD_PAR(g_22);
   LOAD_PAR(g_33);
   LOAD_PAR(g_13);
+  LOAD_PAR(dy);
   LOAD_PAR(Bxy);
 
 #undef LOAD_PAR
@@ -457,9 +459,11 @@ void FCITransform::outputVars(Options& output_options) {
 
 void FCITransform::loadParallelMetrics(Coordinates* coords) {
 #if BOUT_USE_METRIC_3D
+  output_info.write("\tLoading parallel metrics\n");
   const auto JB0 = coords->J * coords->Bxy;
   coords->J.splitParallelSlices();
   coords->J.disallowCalcParallelSlices();
+  coords->J.resetRegionParallel(true);
   for (int i = 1; i <= mesh.ystart; ++i) {
     load_parallel_metric_components(coords, -i);
     load_parallel_metric_components(coords, i);