From b462327d2d5243656b04b9310bc05652851407dd Mon Sep 17 00:00:00 2001 From: danielque Date: Fri, 26 Jul 2019 15:59:04 +0200 Subject: [PATCH] apply some formatting changes [ci skip] --- src/lagrangian/cfdemParticle/cfdTools/versionInfo.H | 4 ++-- src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C | 2 +- .../dataExchangeModel/dataExchangeModel.H | 10 +++++----- .../subModels/dataExchangeModel/twoWayMPI/twoWayMPI.C | 6 +++--- .../subModels/forceModel/BeetstraDrag/BeetstraDrag.H | 9 +++++++-- .../subModels/forceModel/GidaspowDrag/GidaspowDrag.H | 5 +++++ .../forceSubModels/forceSubModel/forceSubModel.H | 1 + .../subModels/forceModel/interface/interface.H | 6 ++++++ .../forceModel/virtualMassForce/virtualMassForce.H | 4 ++++ .../liggghtsCommandModel/newLiggghtsCommandModel.C | 2 +- .../liggghtsCommandModel/writeLiggghts/writeLiggghts.C | 4 ++-- 11 files changed, 37 insertions(+), 16 deletions(-) diff --git a/src/lagrangian/cfdemParticle/cfdTools/versionInfo.H b/src/lagrangian/cfdemParticle/cfdTools/versionInfo.H index 7297ac62..32d0d0a9 100755 --- a/src/lagrangian/cfdemParticle/cfdTools/versionInfo.H +++ b/src/lagrangian/cfdemParticle/cfdTools/versionInfo.H @@ -39,7 +39,7 @@ word compatibleLIGGGHTSversion="PFM 19.02"; word OFversion="4.x"; Info << "\nCFDEMcoupling version: " << CFDEMversion << endl; -Info << ", compatible to LIGGGHTS version: " << compatibleLIGGGHTSversion << endl; -Info << ", compatible to OpenFOAM version: " << OFversion << endl; +Info << "compatible to LIGGGHTS version: " << compatibleLIGGGHTSversion << endl; +Info << "compatible to OpenFOAM version: " << OFversion << endl; #endif diff --git a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C index d5c4efab..8067ff26 100644 --- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C +++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C @@ -665,7 +665,7 @@ bool cfdemCloud::evolve } //============================================ - //CHECK JUST TIME-INTERPOATE ALREADY SMOOTHENED VOIDFRACTIONNEXT AND UsNEXT FIELD + //CHECK JUST TIME-INTERPOLATE ALREADY SMOOTHENED VOIDFRACTIONNEXT AND UsNEXT FIELD // IMPLICIT FORCE CONTRIBUTION AND SOLVER USE EXACTLY THE SAME AVERAGED // QUANTITIES AT THE GRID! scalar timeStepFrac = dataExchangeM().timeStepFraction(); diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/dataExchangeModel/dataExchangeModel.H b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/dataExchangeModel/dataExchangeModel.H index 672f1138..e146b0ff 100755 --- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/dataExchangeModel/dataExchangeModel.H +++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/dataExchangeModel/dataExchangeModel.H @@ -186,15 +186,15 @@ public: inline int couplingInterval() const { return couplingInterval_; } - inline scalar couplingTime() const { return couplingInterval_*DEMts_; } + inline scalar couplingTime() const { return couplingInterval_ * DEMts_; } inline scalar TSstart() const { return particleCloud_.mesh().time().startTime().value() + (couplingStep_-1) * couplingTime(); } - inline scalar TSend() const { return particleCloud_.mesh().time().startTime().value() - + (couplingStep_) * couplingTime(); } + inline scalar TSend() const { return particleCloud_.mesh().time().startTime().value() + + (couplingStep_ ) * couplingTime(); } - inline int DEMstepsTillT(scalar t) const { return (t - (particleCloud_.mesh().time().value() - couplingTime()) + SMALL) / DEMts_; } + inline int DEMstepsTillT(scalar t) const { return (t - (particleCloud_.mesh().time().value() - couplingTime()) + SMALL) / DEMts_; } inline void checkTSsize() const { @@ -210,7 +210,7 @@ public: Info << "particleCloud_.mesh().time().deltaT().value() = " << particleCloud_.mesh().time().deltaT().value() << endl; Info << "couplingInterval_ = " << couplingInterval_ << endl; Info << "DEMts_ = " << DEMts_ << endl; - Warning << "\nWarning - Coupling time (= DEM time step * coupling interval) is not a multiple of CFD time-step!\n" << endl; + Warning << "\nWarning - Coupling time (= DEM time step * coupling interval) is not a multiple of CFD time-step!\n" << endl; } if (!particleCloud_.allowCFDsubTimestep()) if (particleCloud_.mesh().time().deltaT().value() < couplingInterval_ * DEMts_ + SMALL) diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.C b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.C index 875399fa..eda5f290 100644 --- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.C +++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.C @@ -66,7 +66,7 @@ twoWayMPI::twoWayMPI propsDict_(dict.subDict(typeName + "Props")), lmp(NULL) { - Info<<"Starting up LIGGGHTS for first time execution"<input->file(liggghtsPath.c_str()); // get DEM time step size diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/BeetstraDrag/BeetstraDrag.H b/src/lagrangian/cfdemParticle/subModels/forceModel/BeetstraDrag/BeetstraDrag.H index bc2b1c03..cfeeea39 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/BeetstraDrag/BeetstraDrag.H +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/BeetstraDrag/BeetstraDrag.H @@ -17,6 +17,11 @@ Description drag law for monodisperse systems according to Beetstra et al. AIChE J 53.2 (2007) +Reference + R. Beetstra, M.A. van der Hoef, J.A.M. Kuipers + "Drag force of intermediate Reynolds number flow past mono- and bidisperse arrays of spheres" + AIChE Journal, 53 (2007) + SourceFiles BeetstraDrag.C \*---------------------------------------------------------------------------*/ @@ -86,12 +91,12 @@ protected: virtual void adaptVoidfraction(double&, label) const {} virtual scalar effDiameter(double d, label cellI, label index) const {return d;} - + virtual scalar meanSauterDiameter(double d, label cellI) const {return d;} double F(double, double) const; - double terminalVelocity(double, double, double, double, double, double) const; + double terminalVelocity(double, double, double, double, double, double) const; double a(double) const; diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/GidaspowDrag/GidaspowDrag.H b/src/lagrangian/cfdemParticle/subModels/forceModel/GidaspowDrag/GidaspowDrag.H index 76102bcb..db1e9be4 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/GidaspowDrag/GidaspowDrag.H +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/GidaspowDrag/GidaspowDrag.H @@ -34,6 +34,11 @@ Description - splits off explicit drag component due to fluctuation in fluid and particle velocity (optional via forceSubModel "ImExCorr") +Reference + D. Gidaspow + "Multiphase flow and fluidization: Continuum and kinetic theory description", + 1994 + Class GidaspowDrag diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/forceSubModel/forceSubModel.H b/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/forceSubModel/forceSubModel.H index 591c525a..407ecce8 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/forceSubModel/forceSubModel.H +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/forceSubModel/forceSubModel.H @@ -82,6 +82,7 @@ protected: List switchesList_; // switches which are requested from dict + // a Switch is set to false in the default Switch constructor List switches_; // switch status mutable volScalarField nu_; diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/interface/interface.H b/src/lagrangian/cfdemParticle/subModels/forceModel/interface/interface.H index 1bc0047f..d101caad 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/interface/interface.H +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/interface/interface.H @@ -28,6 +28,12 @@ Description This code is designed to realize coupled CFD-DEM simulations using LIGGGHTS and OpenFOAM(R). Note: this code is not part of OpenFOAM(R) (see DISCLAIMER). +Reference + G. Wierink, C. Goniva, B. Niceno, K. Heiskanen, + "Mechanistic Modelling of Particle-Interface Interaction in Three-Phase Flows", + Proc. of the 8th Int. Conf. on CFD in Oil and Gas, Metallurgical and Process Industries, + Trondheim, 2011 + Class interface diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/virtualMassForce/virtualMassForce.H b/src/lagrangian/cfdemParticle/subModels/forceModel/virtualMassForce/virtualMassForce.H index b645fc4b..292679b6 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/virtualMassForce/virtualMassForce.H +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/virtualMassForce/virtualMassForce.H @@ -28,6 +28,10 @@ Description This code is designed to realize coupled CFD-DEM simulations using LIGGGHTS and OpenFOAM(R). Note: this code is not part of OpenFOAM(R) (see DISCLAIMER). +Reference + Crowe, Clayton T.; Sommerfeld, Martin; Tsuji, Yutaka (1998). + "Multiphase flows with droplets and particles" + Class virtualMassForce diff --git a/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/liggghtsCommandModel/newLiggghtsCommandModel.C b/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/liggghtsCommandModel/newLiggghtsCommandModel.C index 1403bcc1..2aabee2f 100644 --- a/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/liggghtsCommandModel/newLiggghtsCommandModel.C +++ b/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/liggghtsCommandModel/newLiggghtsCommandModel.C @@ -50,7 +50,7 @@ autoPtr liggghtsCommandModel::New ) { Info<< "Selecting liggghtsCommandModel " - << liggghtsCommandType << " ,provide dicts, numbered from 0 to n" << endl; + << liggghtsCommandType << ", provide dicts, numbered from 0 to n" << endl; dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(liggghtsCommandType); diff --git a/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/writeLiggghts/writeLiggghts.C b/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/writeLiggghts/writeLiggghts.C index 1e0bd5a0..9a061b2b 100644 --- a/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/writeLiggghts/writeLiggghts.C +++ b/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/writeLiggghts/writeLiggghts.C @@ -94,7 +94,7 @@ writeLiggghts::writeLiggghts { overwrite_ = Switch(propsDict_.lookup("overwrite")); } - + if (writeLast_) { runLast_ = true; @@ -103,7 +103,7 @@ writeLiggghts::writeLiggghts { //Warning << "Using invalid options of writeLiggghts, please use 'writeLast' option." << endl; runEveryWriteStep_ = true; - } + } command_ += " " + path_ + "/" + writeName_;