use MPI.Group.Compare for the comm tests in ManualEnsemble

firedrakeproject · May 7, 2024 · 9113af8 · 9113af8
1 parent b5ccbfe
commit 9113af8
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/asQ/ensemble.py b/asQ/ensemble.py
@@ -89,12 +89,11 @@ def __init__(self, global_comm, spatial_comm, ensemble_comm, **kwargs):
         if MPI.Group.Intersection(spatial_group, ensemble_group).size != 1:
             raise PyOP2CommError("spatial and ensemble comms must be cartesian product in global_comm")
 
-        spatial_intersection = MPI.Group.Intersection(global_group, spatial_group)
-        ensemble_intersection = MPI.Group.Intersection(global_group, ensemble_group)
+        is_subgroup = lambda sub, group: MPI.Group.Compare(sub, MPI.Group.Intersection(sub, group)) in {MPI.IDENT, MPI.CONGRUENT}
 
-        if MPI.Group.Compare(spatial_intersection, spatial_group) not in {MPI.IDENT, MPI.CONGRUENT}:
+        if not is_subgroup(spatial_group, global_group):
             raise PyOP2CommError("spatial_comm must be subgroup of global_comm")
-        if MPI.Group.Compare(ensemble_intersection, ensemble_group) not in {MPI.IDENT, MPI.CONGRUENT}:
+        if not is_subgroup(ensemble_group, global_group):
             raise PyOP2CommError("ensemble_comm must be subgroup of global_comm")
 
         # create internal duplicates and name comms for debugging