xfygogo/phasicFlow
1
0
Fork 0
mirror of https://github.com/PhasicFlow/phasicFlow.git synced 2025-06-22 16:28:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

correction in the macros to be compatible with OpenFOAM

Browse Source
This commit is contained in:
hamidrezanorouzi
2022-12-24 15:00:00 +03:30
parent 080f7dea7d
commit 853d50e96f
61 changed files with 670 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Interaction/Models/contactForce/linearCF.hpp
View File

@ -135,7 +135,7 @@ protected:
realVector etha_n(nElem);
realVector etha_t(nElem);
forAll(i , kn)
ForAll(i , kn)
{
etha_n[i] = -2.0*log(en[i])*sqrt(kn[i])/
sqrt(pow(log(en[i]),2.0)+ pow(Pi,2.0));
@ -145,7 +145,7 @@ protected:
}
Vector<linearProperties> prop(nElem);
forAll(i,kn)
ForAll(i,kn)
{
prop[i] = {kn[i], kt[i], etha_n[i], etha_t[i], mu[i]};
}

4
src/Interaction/Models/contactForce/nonLinearCF.hpp
View File

@ -123,7 +123,7 @@ protected:
realVector etha_n(nElem);
forAll(i , en)
ForAll(i , en)
{
//K_hertz = 4.0/3.0*Yeff*sqrt(Reff);
//-2.2664*log(en)*sqrt(meff*K_hertz)/sqrt( log(en)**2 + 10.1354);
@ -138,7 +138,7 @@ protected:
}
Vector<nonLinearProperties> prop(nElem);
forAll(i,Yeff)
ForAll(i,Yeff)
{
prop[i] = {Yeff[i], Geff[i], etha_n[i], mu[i]};
}

2
src/Interaction/Models/contactForce/nonLinearMod.hpp
View File

@ -122,7 +122,7 @@ protected:
Vector<nonLinearProperties> prop(nElem);
forAll(i,Yeff)
ForAll(i,Yeff)
{
prop[i] = {Yeff[i], Geff[i], etha_n[i], mu[i]};
}

8
src/Interaction/contactSearch/ContactSearch/ContactSearch.hpp
View File

@ -98,8 +98,8 @@ public:
position,
diam
);
Report(2)<<"Contact search algorithm for particle-particle is "<<
greenText(particleContactSearch_().typeName())<<endReport;
REPORT(2)<<"Contact search algorithm for particle-particle is "<<
greenText(particleContactSearch_().typeName())<<endREPORT;
auto wmDict = dict().subDict(wmMethod+"Info");
@ -120,8 +120,8 @@ public:
wPoints,
wVertices
);
Report(2)<<"Wall mapping algorithm for particle-wall is "<<
greenText(wallMapping_().typeName())<< endReport;
REPORT(2)<<"Wall mapping algorithm for particle-wall is "<<
greenText(wallMapping_().typeName())<< endREPORT;
}

4
src/Interaction/contactSearch/contactSearch/contactSearch.cpp
View File

@ -53,13 +53,13 @@ pFlow::uniquePtr<pFlow::contactSearch> pFlow::contactSearch::create(
auto model = angleBracketsNames2("ContactSearch", baseMethName, wallMethod);
Report(1)<<"Selecting contact search model . . ."<<endReport;
REPORT(1)<<"Selecting contact search model . . ."<<endREPORT;
if( dictionaryvCtorSelector_.search(model))
{
auto objPtr = dictionaryvCtorSelector_[model] (dict, domain, prtcl, geom, timers);
Report(2)<<"Model "<< greenText(model)<<" is created."<<endReport;
REPORT(2)<<"Model "<< greenText(model)<<" is created."<<endREPORT;
return objPtr;
}
else

4
src/Interaction/contactSearch/methods/NBSLevel0.hpp
View File

@ -200,8 +200,8 @@ public:
pairs.increaseCapacityBy(len);
Info<< "The contact pair container capacity increased from "<<
oldCap << " to "<<pairs.capacity()<<" in NBSLevel0."<<endInfo;
INFORMATION<< "The contact pair container capacity increased from "<<
oldCap << " to "<<pairs.capacity()<<" in NBSLevel0."<<endINFO;
}

10
src/Interaction/contactSearch/methods/NBSLevels.hpp
View File

@ -108,11 +108,11 @@ protected:
copy(sizeRangeLevels_, sizeRangeLevelsHost_);
copy(maxSizeLevels_, maxSizeLevelsHost_);
Report(2)<<"Grids with "<< yellowText(numLevels_)<< " levels have been created."<<endReport;
REPORT(2)<<"Grids with "<< yellowText(numLevels_)<< " levels have been created."<<endREPORT;
for(int32 lvl=0; lvl<numLevels_; lvl++)
{
Report(3)<<"Cell gird No "<< yellowText(lvl)<<" with size range ("
<<sizeRangeLevelsHost_[lvl].first<<","<<sizeRangeLevelsHost_[lvl].second<<"]."<<endReport;
REPORT(3)<<"Cell gird No "<< yellowText(lvl)<<" with size range ("
<<sizeRangeLevelsHost_[lvl].first<<","<<sizeRangeLevelsHost_[lvl].second<<"]."<<endREPORT;
}
return true;
@ -235,8 +235,8 @@ public:
pairs.increaseCapacityBy(len);
Info<< "The contact pair container capacity increased from "<<
oldCap << " to "<<pairs.capacity()<<" in NBSLevels."<<endInfo;
INFORMATION<< "The contact pair container capacity increased from "<<
oldCap << " to "<<pairs.capacity()<<" in NBSLevels."<<endINFO;
}

4
src/Interaction/contactSearch/wallMappings/cellsWallLevel0.hpp
View File

@ -196,9 +196,9 @@ public:
auto oldCap = pairs.capacity();
pairs.increaseCapacityBy(len);
Info<<"Contact pair container capacity increased from "<<
INFORMATION<<"Contact pair container capacity increased from "<<
oldCap << " to "
<< pairs.capacity() <<" in cellsWallLevel0."<<endInfo;
<< pairs.capacity() <<" in cellsWallLevel0."<<endINFO;
Kokkos::fence();
}

4
src/Interaction/contactSearch/wallMappings/cellsWallLevels.hpp
View File

@ -132,9 +132,9 @@ public:
auto oldCap = pairs.capacity();
pairs.increaseCapacityBy(len);
Info<<"Contact pair container capacity increased from "<<
INFORMATION<<"Contact pair container capacity increased from "<<
oldCap << " to "
<< pairs.capacity() <<" in cellsWallLevels."<<endInfo;
<< pairs.capacity() <<" in cellsWallLevels."<<endINFO;
Kokkos::fence();
}

4
src/Interaction/contactSearch/wallMappings/multiGridMapping.hpp
View File

@ -115,8 +115,8 @@ public:
)
{
Report(3)<<"Multi-grid wall mapping with "<<
yellowText(numLevels)<<" levels has been created."<<endReport;
REPORT(3)<<"Multi-grid wall mapping with "<<
yellowText(numLevels)<<" levels has been created."<<endREPORT;
}

4
src/Interaction/interaction/interaction.cpp
View File

@ -79,14 +79,14 @@ pFlow::uniquePtr<pFlow::interaction> pFlow::interaction::create
clType);
Report(1)<< "Selecting interaction model..."<<endReport;
REPORT(1)<< "Selecting interaction model..."<<endREPORT;
if( systemControlvCtorSelector_.search(interactionModel) )
{
auto objPtr =
systemControlvCtorSelector_[interactionModel]
(control, prtcl, geom);
Report(2)<<"Model "<<greenText(interactionModel)<<" is created."<<endReport;
REPORT(2)<<"Model "<<greenText(interactionModel)<<" is created."<<endREPORT;
return objPtr;
}
else

2
src/Interaction/sphereInteraction/sphereInteraction.cpp
View File

@ -30,7 +30,7 @@ bool pFlow::sphereInteraction<contactForceModel,geometryMotionModel, contactList
auto modelDict = this->fileDict().subDict("model");
Report(1)<<"Createing contact force model . . ."<<endReport;
REPORT(1)<<"Createing contact force model . . ."<<endREPORT;
forceModel_ = makeUnique<ContactForceModel>(
this->numMaterials(),
rhoD.deviceVector(),