From 1ab64a0dd935e15463e39d6921a0d2cc5953a1e1 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 27 Jun 2016 16:31:51 +0100
Subject: [PATCH] rigidBodyMeshMotion: Check for attempted assignment of
 patches to a merged body

---
 src/rigidBodyMeshMotion/rigidBodyMeshMotion.C | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C b/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C
index 1de13ce14f..490f988738 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C
@@ -130,13 +130,24 @@ Foam::rigidBodyMeshMotion::rigidBodyMeshMotion
 
         if (bodyDict.found("patches"))
         {
+            const label bodyID = model_.bodyID(iter().keyword());
+
+            if (bodyID == -1)
+            {
+                FatalErrorInFunction
+                    << "Body " << iter().keyword()
+                    << " has been merged with another body"
+                       " and cannot be assigned a set of patches"
+                    << exit(FatalError);
+            }
+
             bodyMeshes_.append
             (
                 new bodyMesh
                 (
                     mesh,
                     iter().keyword(),
-                    model_.bodyID(iter().keyword()),
+                    bodyID,
                     bodyDict
                 )
             );