Add null check when getting Coordinates from Mesh

If Coordinates are in the process of being constructed the object may not have been registered with Mesh yet.
tomc271 · Dec 21, 2024 · af34f77 · af34f77
1 parent 15cffda
commit af34f77
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/field/field_data.cxx b/src/field/field_data.cxx
@@ -238,7 +238,11 @@ BOUT_HOST_DEVICE Coordinates* FieldData::getCoordinates() const {
   if (fieldCoordinates_shared) {
     return fieldCoordinates_shared.get();
   }
-  fieldCoordinates = getMesh()->getCoordinatesSmart(FieldData::getLocation());
+  coordinates_from_mesh = getMesh()->getCoordinatesSmart(FieldData::getLocation());
+  // If Coordinates are in the process of being constructed the object may not have been registered with Mesh yet
+  if (coordinates_from_mesh != nullptr) {
+    fieldCoordinates = coordinates_from_mesh;
+  }
   return fieldCoordinates.lock().get();
 }