From c7d9c6d17d98339e9c4cf5299e9f7bf63b2534c4 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 19 Jun 2017 15:38:46 +0100
Subject: [PATCH] CollidingCloud: Allow instantiation of the NoCollision model
 for steady-state operation

---
 .../Templates/CollidingCloud/CollidingCloud.C | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.C b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.C
index 84facfc88..1edb13bb7 100644
--- a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,6 +25,7 @@ License
 
 #include "CollidingCloud.H"
 #include "CollisionModel.H"
+#include "NoCollision.H"
 
 // * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
 
@@ -95,13 +96,6 @@ Foam::CollidingCloud<CloudType>::CollidingCloud
     constProps_(this->particleProperties()),
     collisionModel_(nullptr)
 {
-    if (this->solution().steadyState())
-    {
-        FatalErrorInFunction
-            << "Collision modelling not currently available for steady state "
-            << "calculations" << exit(FatalError);
-    }
-
     if (this->solution().active())
     {
         setModels();
@@ -111,6 +105,17 @@ Foam::CollidingCloud<CloudType>::CollidingCloud
             parcelType::readFields(*this);
             this->deleteLostParticles();
         }
+
+        if
+        (
+            this->solution().steadyState()
+         && !isType<NoCollision<CollidingCloud<CloudType>>>(collisionModel_())
+        )
+        {
+            FatalErrorInFunction
+                << "Collision modelling not currently available "
+                << "for steady state calculations" << exit(FatalError);
+        }
     }
 }