From 32ec2147b86cdb2246b19d00bce17727b91e089f Mon Sep 17 00:00:00 2001 From: cfdem Date: Tue, 8 Jan 2013 15:30:42 +0100 Subject: [PATCH] release on 2013-01-08_15-30-41 --- README | 82 ++++++++++++ doc/CFDEMcoupling_Manual.pdf | Bin 515794 -> 515794 bytes doc/githubAccess_public.pdf | Bin 362471 -> 362471 bytes src/lagrangian/cfdemParticle/Make/files | 24 +++- .../cfdemParticle/cfdemCloud/cfdemCloud.C | 41 ++---- .../cfdemParticle/cfdemCloud/cfdemCloud.H | 5 - .../cfdemParticle/cfdemCloud/cfdemCloudI.H | 5 - .../derived/cfdemCloudIB/cfdemCloudIB.C | 17 +-- .../derived/cfdemCloudMS/cfdemCloudMS.C | 5 +- .../averagingModel/averagingModel.C | 30 ++--- .../subModels/averagingModel/dense/dense.C | 12 +- .../subModels/averagingModel/dilute/dilute.C | 12 +- .../clockModel/clockModel/clockModel.C | 119 ++++++++++++++++++ .../clockModel/clockModel/clockModel.H | 4 + .../forceModel/Archimedes/Archimedes.C | 6 +- .../forceModel/ArchimedesIB/ArchimedesIB.C | 6 +- .../forceModel/DiFeliceDrag/DiFeliceDrag.C | 6 +- .../forceModel/GidaspowDrag/GidaspowDrag.C | 6 +- .../forceModel/KochHillDrag/KochHillDrag.C | 6 +- .../LaEuScalarTemp/LaEuScalarTemp.C | 8 +- .../LaEuScalarTemp/LaEuScalarTemp.H | 1 - .../subModels/forceModel/MeiLift/MeiLift.C | 6 +- .../SchillerNaumannDrag/SchillerNaumannDrag.C | 6 +- .../forceModel/ShirgaonkarIB/ShirgaonkarIB.C | 6 +- .../forceModel/gradPForce/gradPForce.C | 6 +- .../forceModel/interface/interface.C | 6 +- .../subModels/forceModel/noDrag/noDrag.C | 6 +- .../virtualMassForce/virtualMassForce.C | 6 +- .../forceModel/viscForce/viscForce.C | 6 +- .../locateModel/engineSearch/engineSearch.C | 3 +- .../engineSearchIB/engineSearchIB.C | 3 +- .../standardSearch/standardSearch.C | 3 +- .../turboEngineSearch/turboEngineSearch.C | 3 +- .../momCoupleModel/noCouple/noCouple.C | 1 - .../GaussVoidFraction/GaussVoidFraction.C | 9 +- .../IBVoidFraction/IBVoidFraction.C | 7 +- .../bigParticleVoidFraction.C | 7 +- .../centreVoidFraction/centreVoidFraction.C | 6 +- .../dividedVoidFraction/dividedVoidFraction.C | 7 +- .../dividedVoidFractionMS.C | 7 +- .../voidFractionModel/voidFractionModel.C | 5 +- .../voidFractionModel/voidFractionModel.H | 2 +- 42 files changed, 344 insertions(+), 162 deletions(-) create mode 100644 README diff --git a/README b/README new file mode 100644 index 00000000..a677e0a8 --- /dev/null +++ b/README @@ -0,0 +1,82 @@ +/*---------------------------------------------------------------------------*\ + CFDEMcoupling - Open Source CFD-DEM coupling + + CFDEMcoupling is part of the CFDEMproject + www.cfdem.com + Christoph Goniva, christoph.goniva@cfdem.com + Copyright 2009-2012 JKU Linz + Copyright 2012- DCS Computing GmbH, Linz +------------------------------------------------------------------------------- +License + This file is part of CFDEMcoupling. + + CFDEMcoupling is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 3 of the License, or (at your + option) any later version. + + CFDEMcoupling is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with CFDEMcoupling; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +Description + This code is designed to realize coupled CFD-DEM simulations using LIGGGHTS + and OpenFOAM. Note: this code is not part of OpenFOAM (see DISCLAIMER). +\*---------------------------------------------------------------------------*/ + + +CFDEM coupling provides an open source parallel coupled CFD-DEM framework +combining the strengths of LIGGGHTS DEM code and the Open Source +CFD package OpenFOAM(R)(*). The CFDEMcoupling toolbox allows to expand +standard CFD solvers of OpenFOAM(R)(*) to include a coupling to the DEM +code LIGGGHTS. In this toolbox the particle representation within the +CFD solver is organized by "cloud" classes. Key functionalities are organised +in sub-models (e.g. force models, data exchange models, etc.) which can easily +be selected and combined by dictionary settings. + +The coupled solvers run fully parallel on distributed-memory clusters. + +Features are: + +- its modular approach allows users to easily implement new models +- its MPI parallelization enables to use it for large scale problems +- the "forum"_lws on CFD-DEM gives the possibility to exchange with other + users / developers +- the use of GIT allows to easily update to the latest version +- basic documentation is provided + +The file structure: + +- "src" directory including the source files of the coupling toolbox and models +- "applications" directory including the solver files for coupled CFD-DEM simulations +- "doc" directory including the documentation of CFDEMcoupling +- "tutorials" directory including basic tutorial cases showing the functionality + + + +Details on installation are given on the "www.cfdem.com" + +The functionality of this CFD-DEM framwork is described via "tutorial cases" showing +how to use different solvers and models. + +CFDEMcoupling stands for Computational Fluid Dynamics (CFD) - +Discrete Element Method (DEM) coupling. + +CFDEMcoupling is an open-source code, distributed freely under the terms of the +GNU Public License (GPL). + +Core development of CFDEMcoupling is done by +Christoph Goniva and Christoph Kloss, both at DCS Computing GmbH, 2012 + + +\*---------------------------------------------------------------------------*/ +(*) "OpenFOAM(R)"_of is a registered trade mark of Silicon Graphics +International Corp. This offering is not affiliated, approved or endorsed by +Silicon Graphics International Corp., the producer of the OpenFOAM(R) software +and owner of the OpenFOAM(R) trademark. +\*---------------------------------------------------------------------------*/ diff --git a/doc/CFDEMcoupling_Manual.pdf b/doc/CFDEMcoupling_Manual.pdf index 671a2cce9860aec55bd17e4c290f3da54c30db96..06dd414a201bee9765debaa5163b25f5a8af26be 100644 GIT binary patch delta 136 zcmcb#SN_so`3aru7KWzA2F9k16Iv%QwoYJboxt2Wfu(fJ}INCg5@ zLn9+&%S0msbCWdli%KerQq#ChEG-Sq47gNP IUH#p-0A7G8@&Et; delta 136 zcmcb#SN_so`3aru=7yF=CPs#h6Iv%QwoYJboxt2Wfu(fJ|3H8e0x zPO(U~G*3)1NwqMwOfgJON;Wk!woFV*N;R{yA*dqO&W@|NB(bQZq9`?u%f!;s(9D2K KRn^tsjSB$H^DGAd diff --git a/doc/githubAccess_public.pdf b/doc/githubAccess_public.pdf index cbd54c63668ab285a33b18f6adf6ae2211853657..9f28fbe5178b26964023d07e0897132103e7b792 100644 GIT binary patch delta 106 zcmaFfFZR4&Y(giyg`ugjfw5`hgw_d+trM79Cos28VA(o>^;estu~CYFMY4s7L9#)r ifnlnFu}M;rX_}Emvbm{Inz@mkjUfRQ(@(dv$^Zaq)*%f5 delta 106 zcmaFfFZR4&Y(giyxuK^;er?T2iuwrMaO+vZ+B* iikXRJikY#cWs-?uYLa clockModel_; - autoPtr regionModel_; - autoPtr meshMotionModel_; autoPtr* liggghtsCommand_; @@ -273,8 +270,6 @@ public: inline const clockModel& clockM() const; - inline const regionModel& regionM() const; - inline const meshMotionModel& meshMotionM() const; inline const wordList& liggghtsCommandModelList() const; diff --git a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H index 36577458..3bf79c50 100644 --- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H +++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H @@ -169,11 +169,6 @@ inline const clockModel& cfdemCloud::clockM() const return clockModel_; } -inline const regionModel& cfdemCloud::regionM() const -{ - return regionModel_; -} - inline const meshMotionModel& cfdemCloud::meshMotionM() const { return meshMotionModel_; diff --git a/src/lagrangian/cfdemParticle/derived/cfdemCloudIB/cfdemCloudIB.C b/src/lagrangian/cfdemParticle/derived/cfdemCloudIB/cfdemCloudIB.C index cf854805..90fe7035 100644 --- a/src/lagrangian/cfdemParticle/derived/cfdemCloudIB/cfdemCloudIB.C +++ b/src/lagrangian/cfdemParticle/derived/cfdemCloudIB/cfdemCloudIB.C @@ -33,7 +33,6 @@ Description #include "cfdemCloudIB.H" #include "voidFractionModel.H" #include "forceModel.H" -#include "regionModel.H" #include "locateModel.H" #include "dataExchangeModel.H" #include "IOModel.H" @@ -94,22 +93,18 @@ bool Foam::cfdemCloudIB::evolve() Info << "\n timeStepFraction() = " << dataExchangeM().timeStepFraction() << endl; doCouple=true; - if(verbose_) Info << "- defineRegion()" << endl; - regionM().defineRegion(); - if(verbose_) Info << "defineRegion done." << endl; - if(verbose_) Info << "- getDEMdata()" << endl; getDEMdata(); Info << "nr particles = " << numberOfParticles() << endl; // search cellID of particles if(verbose_) Info << "- findCell()" << endl; - locateM().findCell(regionM().inRegion(),positions_,cellIDs_,numberOfParticles()); + locateM().findCell(NULL,positions_,cellIDs_,numberOfParticles()); if(verbose_) Info << "findCell done." << endl; // set void fraction field if(verbose_) Info << "- setvoidFraction()" << endl; - voidFractionM().setvoidFraction(regionM().inRegion(),voidfractions_,particleWeights_,particleVolumes_); + voidFractionM().setvoidFraction(NULL,voidfractions_,particleWeights_,particleVolumes_); if(verbose_) Info << "setvoidFraction done." << endl; // set particles forces @@ -120,7 +115,7 @@ bool Foam::cfdemCloudIB::evolve() expForces_[index][i] = 0; } } - for (int i=0;i Foam::clockModel::calcShift() const } return shifts; } + +/*void Foam::clockModel::normHist() const +{ + int myrank=-10; + int numprocs=-10; + MPI_Comm_rank(MPI_COMM_WORLD,&myrank); + MPI_Comm_size(MPI_COMM_WORLD, &numprocs); + + + double buffOut=0.; + double buffIn=0.; + + // code to examine + List< int > codeParts(4); + codeParts[0]=1; // Global + codeParts[1]=2; // Coupling + codeParts[2]=3; // LIGGGHTS + codeParts[3]=26;// Flow + + forAll(codeParts,i) + { + Info << "i=" << i << " ,codeParts[i]=" << codeParts[i] << endl; + buffIn = double(deltaT_[codeParts[i]]); + MPI_Allreduce(&buffIn, &buffOut, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD); + buffIn = buffIn/buffOut; + Pout << "[" << myrank << "]: " << identifier_[codeParts[i]] << " " << buffIn << '\n'; + + Info << "CPU time % of " < globalTime(numprocs); + forAll(globalTime,procI) + globalTime[procI]=buffIn; + + forAll(globalTime,procI) + Info<< globalTime[procI] << ", "; + Info << endl; + } + return; +}*/ + + +void Foam::clockModel::normHist() const +{ + int myrank=-10; + MPI_Comm_rank(MPI_COMM_WORLD,&myrank); + int numprocs=-10; + MPI_Comm_size(MPI_COMM_WORLD, &numprocs); + double buffOut=0.; + double buffIn=0.; + + Info << "==========================" << endl; + Info << " PROCESSOR LOAD HISTOGRAM" << endl; + + //Global = 1 + buffIn = double(deltaT_[1]); + MPI_Allreduce(&buffIn, &buffOut, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD); + if(buffOut>SMALL) buffIn /= buffOut; + plotHist(buffIn,identifier_[1],numprocs,myrank); + + //LIGGGHTS = 3 + buffIn = double(deltaT_[3]); + MPI_Allreduce(&buffIn, &buffOut, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD); + if(buffOut>SMALL) buffIn /= buffOut; + plotHist(buffIn,identifier_[3],numprocs,myrank); + + //Coupling - LIGGGHTS = 2 - 3 + buffIn = double(deltaT_[2]) - buffIn; + MPI_Allreduce(&buffIn, &buffOut, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD); + if(buffOut>SMALL) buffIn /= buffOut; + plotHist(buffIn,"Coupling (routines)",numprocs,myrank); + + //Flow = 26 + buffIn = double(deltaT_[26]); + MPI_Allreduce(&buffIn, &buffOut, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD); + if(buffOut>SMALL) buffIn /= buffOut; + plotHist(buffIn,identifier_[26],numprocs,myrank); + Info << "===========================" << endl; + + return; +} + +void Foam::clockModel::plotHist(double buffIn,std::string identifier,int numprocs,int myrank) const +{ + double* globalTime=NULL; + double* globalTime_all=NULL; + particleCloud_.dataExchangeM().allocateArray(globalTime,0.,numprocs); + particleCloud_.dataExchangeM().allocateArray(globalTime_all,0.,numprocs); + + globalTime[myrank]=buffIn; + MPI_Allreduce(globalTime, globalTime_all, numprocs, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD); + + for(int j=0;j // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -127,6 +128,9 @@ public: virtual void evalPar() const; void initElems(); std::vector calcShift() const; //detects empty indices in vector, when times are evaluated + void Hist() const; //calc Histogram + void normHist() const; //calc normalized Histogram + void plotHist(double,std::string,int,int) const; //plot histogramm to terminal }; diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/Archimedes/Archimedes.C b/src/lagrangian/cfdemParticle/subModels/forceModel/Archimedes/Archimedes.C index 96755973..c21664fe 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/Archimedes/Archimedes.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/Archimedes/Archimedes.C @@ -110,8 +110,8 @@ void Archimedes::setForce for(int index = 0;index < particleCloud_.numberOfParticles(); ++index) { - if(mask[index][0]) - { + //if(mask[index][0]) + //{ label cellI = particleCloud_.cellIDs()[index][0]; force=vector::zero; @@ -130,7 +130,7 @@ void Archimedes::setForce if(treatDEM_) for(int j=0;j<3;j++) DEMForces[index][j] += force[j]; else if(treatExplicit_) for(int j=0;j<3;j++) expForces[index][j] += force[j]; else for(int j=0;j<3;j++) impForces[index][j] += force[j]; - } + //} } } diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/ArchimedesIB/ArchimedesIB.C b/src/lagrangian/cfdemParticle/subModels/forceModel/ArchimedesIB/ArchimedesIB.C index c1e0c2f3..b657d15b 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/ArchimedesIB/ArchimedesIB.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/ArchimedesIB/ArchimedesIB.C @@ -111,8 +111,8 @@ void ArchimedesIB::setForce vector force; for(int index = 0;index < particleCloud_.numberOfParticles(); ++index) { - if(mask[index][0]) - { + //if(mask[index][0]) + //{ force=vector::zero; for(int subCell=0;subCell= 0) @@ -200,7 +200,7 @@ void LaEuScalarTemp::manipulateScalarField(volScalarField& EuField) const Info << "ptempField_[cellI] = " << tempField_[cellI] << endl ; }*/ } - } + //} } particleCloud_.averagingM().setScalarSum @@ -208,7 +208,7 @@ void LaEuScalarTemp::manipulateScalarField(volScalarField& EuField) const EuField, partHeatFlux_, particleCloud_.particleWeights(), - particleCloud_.regionM().inRegion() + NULL ); // scale with -1/(Vcell*rho*Cp) diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/LaEuScalarTemp/LaEuScalarTemp.H b/src/lagrangian/cfdemParticle/subModels/forceModel/LaEuScalarTemp/LaEuScalarTemp.H index 2875fd4c..a2566088 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/LaEuScalarTemp/LaEuScalarTemp.H +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/LaEuScalarTemp/LaEuScalarTemp.H @@ -45,7 +45,6 @@ SourceFiles #define LaEuScalarTemp_H #include "forceModel.H" -#include "regionModel.H" #include "averagingModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/MeiLift/MeiLift.C b/src/lagrangian/cfdemParticle/subModels/forceModel/MeiLift/MeiLift.C index 7c0d9240..7965dbc2 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/MeiLift/MeiLift.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/MeiLift/MeiLift.C @@ -121,8 +121,8 @@ void MeiLift::setForce for(int index = 0;index < particleCloud_.numberOfParticles(); index++) { - if(mask[index][0]) - { + //if(mask[index][0]) + //{ lift=vector::zero; label cellI = particleCloud_.cellIDs()[index][0]; @@ -173,7 +173,7 @@ void MeiLift::setForce if(treatDEM_) for(int j=0;j<3;j++) DEMForces[index][j] += lift[j]; else if(!treatExplicit_) for(int j=0;j<3;j++) impForces[index][j] += lift[j]; else for(int j=0;j<3;j++) expForces[index][j] += lift[j]; - } + //} } } diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/SchillerNaumannDrag/SchillerNaumannDrag.C b/src/lagrangian/cfdemParticle/subModels/forceModel/SchillerNaumannDrag/SchillerNaumannDrag.C index cc57ce77..335cd4ce 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/SchillerNaumannDrag/SchillerNaumannDrag.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/SchillerNaumannDrag/SchillerNaumannDrag.C @@ -100,8 +100,8 @@ void SchillerNaumannDrag::setForce for(int index = 0;index < particleCloud_.numberOfParticles(); index++) { - if(mask[index][0]) - { + //if(mask[index][0]) + //{ vector drag(0,0,0); label cellI = particleCloud_.cellIDs()[index][0]; @@ -150,7 +150,7 @@ void SchillerNaumannDrag::setForce // set force on particle if(treatExplicit_) for(int j=0;j<3;j++) expForces[index][j] += drag[j]; else for(int j=0;j<3;j++) impForces[index][j] += drag[j]; - } + //} } } diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/ShirgaonkarIB/ShirgaonkarIB.C b/src/lagrangian/cfdemParticle/subModels/forceModel/ShirgaonkarIB/ShirgaonkarIB.C index 6e6dcf89..4d21df80 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/ShirgaonkarIB/ShirgaonkarIB.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/ShirgaonkarIB/ShirgaonkarIB.C @@ -117,8 +117,8 @@ void ShirgaonkarIB::setForce for(int index=0; index< particleCloud_.numberOfParticles(); index++) { - if(mask[index][0]) - { + //if(mask[index][0]) + //{ drag=vector::zero; for(int subCell=0;subCell SMALL) + //if(mask[index][0] && particleCloud_.radius(index) > SMALL) + if(particleCloud_.radius(index) > SMALL) { // create pos vector diff --git a/src/lagrangian/cfdemParticle/subModels/locateModel/engineSearchIB/engineSearchIB.C b/src/lagrangian/cfdemParticle/subModels/locateModel/engineSearchIB/engineSearchIB.C index b1d8a80d..0b97a824 100644 --- a/src/lagrangian/cfdemParticle/subModels/locateModel/engineSearchIB/engineSearchIB.C +++ b/src/lagrangian/cfdemParticle/subModels/locateModel/engineSearchIB/engineSearchIB.C @@ -92,7 +92,8 @@ label engineSearchIB::findCell { cellIDs[index][0]=-1; double radius=particleCloud_.radius(index); - if(mask[index][0] && radius > SMALL) + //if(mask[index][0] && radius > SMALL) + if(radius > SMALL) { // create pos vector for(int i=0;i<3;i++) position[i] = positions[index][i]; diff --git a/src/lagrangian/cfdemParticle/subModels/locateModel/standardSearch/standardSearch.C b/src/lagrangian/cfdemParticle/subModels/locateModel/standardSearch/standardSearch.C index 3c79367d..7bc800d8 100644 --- a/src/lagrangian/cfdemParticle/subModels/locateModel/standardSearch/standardSearch.C +++ b/src/lagrangian/cfdemParticle/subModels/locateModel/standardSearch/standardSearch.C @@ -85,7 +85,8 @@ label standardSearch::findCell cellIDs[index][0]=-1; - if(mask[index][0] && particleCloud_.radius(index) > SMALL) + //if(mask[index][0] && particleCloud_.radius(index) > SMALL) + if(particleCloud_.radius(index) > SMALL) { // create pos vector for(int i=0;i<3;i++) position[i] = positions[index][i]; diff --git a/src/lagrangian/cfdemParticle/subModels/locateModel/turboEngineSearch/turboEngineSearch.C b/src/lagrangian/cfdemParticle/subModels/locateModel/turboEngineSearch/turboEngineSearch.C index 97883995..ea40ed58 100644 --- a/src/lagrangian/cfdemParticle/subModels/locateModel/turboEngineSearch/turboEngineSearch.C +++ b/src/lagrangian/cfdemParticle/subModels/locateModel/turboEngineSearch/turboEngineSearch.C @@ -94,7 +94,8 @@ label turboEngineSearch::findCell { cellIDs[index][0]=-1; - if(mask[index][0] && particleCloud_.radius(index) > SMALL) + //if(mask[index][0] && particleCloud_.radius(index) > SMALL) + if(particleCloud_.radius(index) > SMALL) { // create pos vector for(int i=0;i<3;i++) position[i] = positions[index][i]; diff --git a/src/lagrangian/cfdemParticle/subModels/momCoupleModel/noCouple/noCouple.C b/src/lagrangian/cfdemParticle/subModels/momCoupleModel/noCouple/noCouple.C index 06306956..789907df 100644 --- a/src/lagrangian/cfdemParticle/subModels/momCoupleModel/noCouple/noCouple.C +++ b/src/lagrangian/cfdemParticle/subModels/momCoupleModel/noCouple/noCouple.C @@ -33,7 +33,6 @@ Description #include "noCouple.H" #include "addToRunTimeSelectionTable.H" -#include "regionModel.H" #include "voidFractionModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/GaussVoidFraction/GaussVoidFraction.C b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/GaussVoidFraction/GaussVoidFraction.C index 1a8b8503..0ffb5618 100644 --- a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/GaussVoidFraction/GaussVoidFraction.C +++ b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/GaussVoidFraction/GaussVoidFraction.C @@ -25,7 +25,7 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Description - This code is designed to realize coupled CFD-DEM simulations using LIGGGHTS + 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). \*---------------------------------------------------------------------------*/ @@ -34,7 +34,6 @@ Description #include "GaussVoidFraction.H" #include "addToRunTimeSelectionTable.H" #include "locateModel.H" -#include "regionModel.H" #include "dataExchangeModel.H" @@ -96,8 +95,8 @@ void GaussVoidFraction::setvoidFraction(double** const& mask,double**& voidfract for(int index=0; index< particleCloud_.numberOfParticles(); index++) { - if(mask[index][0]) - { + //if(mask[index][0]) + //{ //reset for(int subcell=0;subcell