Correct initialisation overlaps for MD-DSMC coupling

MicroNanoFlows · Nov 21, 2019 · 9b8a299 · 9b8a299
1 parent 8b1c025
commit 9b8a299
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 47 deletions.
diff --git a/src/lagrangian/dsmc/controllers/basic/dsmcControllers/dsmcControllers.C b/src/lagrangian/dsmc/controllers/basic/dsmcControllers/dsmcControllers.C
@@ -558,18 +558,6 @@ void dsmcControllers::initialConfig()
         couplingControllers_[cC]->initialConfiguration(1);
     }
 
-    //- Wait here until other side has finished sending initialisation values (blocking)
-    forAll(couplingControllers_, cC)
-	{
-    	couplingControllers_[cC]->barrier(static_cast<label>(1));
-	}
-
-    //- Forget initial configuration time frame
-    forAll(couplingControllers_, cC)
-	{
-		couplingControllers_[cC]->forget(static_cast<label>(1), true);
-	}
-
     //- Run initial configuration stage 2
     forAll(couplingControllers_, cC)
     {
@@ -579,13 +567,13 @@ void dsmcControllers::initialConfig()
     //- Wait here until other side has finished sending initialisation values (blocking)
     forAll(couplingControllers_, cC)
     {
-        couplingControllers_[cC]->barrier(static_cast<label>(1));
+        couplingControllers_[cC]->barrier(static_cast<label>(0));
     }
 
     //- Forget initial configuration time frame
     forAll(couplingControllers_, cC)
     {
-        couplingControllers_[cC]->forget(static_cast<label>(1), true);
+        couplingControllers_[cC]->forget(true);
     }
 }
 

diff --git a/src/lagrangian/dsmc/controllers/derived/coupling/dsmcMdCoupling/dsmcMdCoupling.C b/src/lagrangian/dsmc/controllers/derived/coupling/dsmcMdCoupling/dsmcMdCoupling.C
@@ -697,7 +697,7 @@ void dsmcMdCoupling::initialConfiguration(label stage)
 
     forAll(sendInterfaces_, iface)
     {
-        sendInterfaces_[iface]->commit(static_cast<label>(1));
+        sendInterfaces_[iface]->commit(static_cast<label>(-1));
         interfaceCommits.append(sendInterfaceNames_[iface]);
     }
 
@@ -706,7 +706,7 @@ void dsmcMdCoupling::initialConfiguration(label stage)
         label index = findIndex(interfaceCommits, recvInterfaceNames_[iface]);
         if(index == -1)
         {
-            recvInterfaces_[iface]->commit(static_cast<label>(1));
+            recvInterfaces_[iface]->commit(static_cast<label>(-1));
         }
     }
 #endif
@@ -754,11 +754,6 @@ void dsmcMdCoupling::controlParcelsAfterCollisions(int stage)
 void dsmcMdCoupling::sendCoupledRegion(bool init)
 {
 #ifdef USE_MUI
-    if(init)
-    {
-        currIteration_ = 1;
-    }
-
     dsmcParcel* parcel = NULL;
 
 	// Iterate through all sending interfaces for this controller
@@ -829,11 +824,6 @@ void dsmcMdCoupling::sendCoupledRegion(bool init)
             sendInterfaces_[iface]->commit(currIteration_);
 	    }
 	}
-
-	if(init)
-	{
-	    currIteration_ = 0;
-	}
 #endif
 }
 

diff --git a/...agrangian/molecularDynamics/polyCloud/controllers/basic/polyControllers/polyControllers.C b/...agrangian/molecularDynamics/polyCloud/controllers/basic/polyControllers/polyControllers.C
@@ -579,18 +579,6 @@ void polyControllers::initialConfig()
         couplingControllers_[cC]->initialConfiguration(1);
     }
 
-    //- Wait here until other side has finished sending initialisation values (blocking)
-    forAll(couplingControllers_, cC)
-    {
-        couplingControllers_[cC]->barrier(static_cast<label>(1));
-    }
-
-    //- Forget initial configuration time frame and reset log to -inf
-    forAll(couplingControllers_, cC)
-    {
-        couplingControllers_[cC]->forget(true);
-    }
-
     //- Run initial configuration stage 2 (blocking)
     forAll(couplingControllers_, cC)
     {

diff --git a/.../molecularDynamics/polyCloud/controllers/derived/coupling/mdDsmcCoupling/mdDsmcCoupling.C b/.../molecularDynamics/polyCloud/controllers/derived/coupling/mdDsmcCoupling/mdDsmcCoupling.C
@@ -654,7 +654,7 @@ bool mdDsmcCoupling::initialConfiguration(label stage)
 
     forAll(sendInterfaces_, iface)
     {
-        sendInterfaces_[iface]->commit(static_cast<label>(1));
+        sendInterfaces_[iface]->commit(static_cast<label>(-1));
         interfaceCommits.append(sendInterfaceNames_[iface]);
     }
 
@@ -663,7 +663,7 @@ bool mdDsmcCoupling::initialConfiguration(label stage)
         label index = findIndex(interfaceCommits, recvInterfaceNames_[iface]);
         if(index == -1)
         {
-            recvInterfaces_[iface]->commit(static_cast<label>(1));
+            recvInterfaces_[iface]->commit(static_cast<label>(-1));
         }
     }
 #endif
@@ -719,11 +719,6 @@ bool mdDsmcCoupling::receiveCoupledRegion(bool init)
 {
     bool molChanged = false;
 #ifdef USE_MUI
-    if(init)
-	{
-	    currIteration_ = 1;
-	}
-
 	if(receivingRegion_)
     {
 	    label molCount = 0;
@@ -1030,8 +1025,6 @@ bool mdDsmcCoupling::receiveCoupledRegion(bool init)
                 recvInterfaces_[iface]->commit(currIteration_);
             }
         }
-
-        currIteration_ = 0;
     }
 #endif
     return molChanged;