diff --git a/src/Interaction/contactSearch/methods/cellBased/NBS/NBS.cpp b/src/Interaction/contactSearch/methods/cellBased/NBS/NBS.cpp index 916cb117..3b4410e5 100644 --- a/src/Interaction/contactSearch/methods/cellBased/NBS/NBS.cpp +++ b/src/Interaction/contactSearch/methods/cellBased/NBS/NBS.cpp @@ -46,7 +46,7 @@ pFlow::NBS::NBS diam), sizeRatio_(max(dict.getVal("sizeRatio"), one)), cellExtent_(max(dict.getVal("cellExtent"), half)), - adjustableBox_(dict.getVal("adjustableBox")), + adjustableBox_(false),//adjustableBox_(dict.getVal("adjustableBox")), NBSLevel0_ ( this->domainBox_, diff --git a/src/Interaction/contactSearch/methods/cellBased/NBS/mapperNBS.cpp b/src/Interaction/contactSearch/methods/cellBased/NBS/mapperNBS.cpp index b0f16804..b0ebf6cf 100644 --- a/src/Interaction/contactSearch/methods/cellBased/NBS/mapperNBS.cpp +++ b/src/Interaction/contactSearch/methods/cellBased/NBS/mapperNBS.cpp @@ -23,7 +23,7 @@ Licence: #include "streams.hpp" pFlow::uint32 pFlow::mapperNBS::checkInterval_ = 1000; -pFlow::real pFlow::mapperNBS::enlargementFactor_ = 1.1; +pFlow::real pFlow::mapperNBS::enlargementFactor_ = 1.5; bool pFlow::mapperNBS::setSearchBox ( diff --git a/src/Interaction/sphereInteraction/boundaries/boundarySphereInteraction/boundarySphereInteraction.hpp b/src/Interaction/sphereInteraction/boundaries/boundarySphereInteraction/boundarySphereInteraction.hpp index 221d09c4..2ea6015f 100644 --- a/src/Interaction/sphereInteraction/boundaries/boundarySphereInteraction/boundarySphereInteraction.hpp +++ b/src/Interaction/sphereInteraction/boundaries/boundarySphereInteraction/boundarySphereInteraction.hpp @@ -161,10 +161,13 @@ public: const anyList& varList ) override { - + if(msg.equivalentTo(message::BNDR_RESET)) + { + // do nothing + return true; + } pOutput<<"Function (hearChanges in boundarySphereInteractions)is not implmented Message "<< msg <boundaryName() <<" type "<< this->type()<("checkForCollision"); + //checkForCollision_ = getVal("checkForCollision"); REPORT(1) << "Particle insertion mechanism is " << Yellow_Text("active") << " in the simulation." << END_REPORT; diff --git a/src/Particles/Insertion/insertion/insertion.hpp b/src/Particles/Insertion/insertion/insertion.hpp index f39f5c35..0c3ee885 100644 --- a/src/Particles/Insertion/insertion/insertion.hpp +++ b/src/Particles/Insertion/insertion/insertion.hpp @@ -42,7 +42,7 @@ private: Logical active_ = "No"; /// Check for collision? It is not active now - Logical checkForCollision_ = "No"; + Logical checkForCollision_ = "Yes"; /// if increase velocity in case particles are failed /// to be inserted due to collision diff --git a/src/phasicFlow/containers/List/anyList/anyList.hpp b/src/phasicFlow/containers/List/anyList/anyList.hpp index 0b655d56..91a93360 100644 --- a/src/phasicFlow/containers/List/anyList/anyList.hpp +++ b/src/phasicFlow/containers/List/anyList/anyList.hpp @@ -179,7 +179,17 @@ public: "list of variables is \n"<() != types_[i]; + return getTypeName() == types_[i]; + } + + word getObjectTypeName(const word& name)const + { + int32 i = names_.findi(name); + if(i == -1 ) + { + return "NAME_NOT_FOUND"; + } + return types_[i]; } /// Get the const reference to variable by name diff --git a/src/phasicFlow/containers/pointField/internalField/internalField.cpp b/src/phasicFlow/containers/pointField/internalField/internalField.cpp index 87ab830e..58fd03e2 100644 --- a/src/phasicFlow/containers/pointField/internalField/internalField.cpp +++ b/src/phasicFlow/containers/pointField/internalField/internalField.cpp @@ -194,7 +194,9 @@ bool pFlow::internalField:: hearChanges auto varName = message::eventName(message::RANGE_CHANGED); if( !varList.checkObjectType(varName) ) { - fatalErrorInFunction<<"Wrong type for variable "<< varName<()<<" but the type is"<< + varList.getObjectTypeName(varName)<notify(iter, t, dt, msgBndry, aList) ) + if( !this->notify(time().TimeInfo(), msgBndry, aList) ) { fatalErrorInFunction<<"Error in notify operation in boundary "<< name() <