release on 2014-06-02_18-34-52

This commit is contained in:
goniva
2014-06-02 18:34:53 +02:00
parent c3bfe130c6
commit 9c78ca97f7
48 changed files with 1312 additions and 871 deletions

81
README
View File

@ -1,81 +0,0 @@
/*---------------------------------------------------------------------------*\
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 the ESI Group.
This offering is not affiliated, approved or endorsed by ESI Group,
the producer of the OpenFOAM® software and owner of the OpenFOAM® trade mark.
\*---------------------------------------------------------------------------*/

Binary file not shown.

Binary file not shown.

View File

@ -3,10 +3,10 @@ forceModels = subModels/forceModel
forceModelsMS = subModels/forceModelMS
IOModels = subModels/IOModel
voidFractionModels = subModels/voidFractionModel
voidFractionModelsMS = subModels/voidFractionModelMS
locateModels = subModels/locateModel
meshMotionModels = subModels/meshMotionModel
momCoupleModels = subModels/momCoupleModel
regionModels = subModels/regionModel
dataExchangeModels = subModels/dataExchangeModel
averagingModels = subModels/averagingModel
clockModels = subModels/clockModel
@ -15,6 +15,7 @@ smoothingModels = subModels/smoothingModel
probeModels = subModels/probeModel
$(cfdemCloud)/cfdemCloud.C
derived/cfdemCloudBiDisperse/cfdemCloudBiDisperse.C
derived/cfdemCloudIB/cfdemCloudIB.C
derived/cfdemCloudMS/cfdemCloudMS.C
@ -23,36 +24,59 @@ $(forceModels)/forceModel/newForceModel.C
$(forceModels)/noDrag/noDrag.C
$(forceModels)/checkCouplingInterval/checkCouplingInterval.C
$(forceModels)/DiFeliceDrag/DiFeliceDrag.C
$(forceModels)/DiFeliceDragNLift/DiFeliceDragNLift.C
$(forceModels)/GidaspowDrag/GidaspowDrag.C
$(forceModels)/SchillerNaumannDrag/SchillerNaumannDrag.C
$(forceModels)/Archimedes/Archimedes.C
$(forceModels)/ArchimedesIB/ArchimedesIB.C
$(forceModels)/interface/interface.C
$(forceModels)/ShirgaonkarIB/ShirgaonkarIB.C
$(forceModels)/interfaceParticleProbe/interfaceParticleProbe.C
$(forceModels)/fieldStore/fieldStore.C
$(forceModels)/fieldTimeAverage/fieldTimeAverage.C
$(forceModels)/fieldBound/fieldBound.C
$(forceModels)/volWeightedAverage/volWeightedAverage.C
$(forceModels)/totalMomentumExchange/totalMomentumExchange.C
$(forceModels)/KochHillDrag/KochHillDrag.C
$(forceModels)/KochHillRWDrag/KochHillRWDrag.C
$(forceModels)/BeetstraDrag/multiphaseFlowBasic/multiphaseFlowBasic.C
$(forceModels)/BeetstraDrag/BeetstraDrag.C
$(forceModels)/LaEuScalarLiquid/LaEuScalarLiquid.C
$(forceModels)/LaEuScalarTemp/LaEuScalarTemp.C
$(forceModels)/LaEuScalarDust/LaEuScalarDust.C
$(forceModels)/virtualMassForce/virtualMassForce.C
$(forceModels)/gradPForce/gradPForce.C
$(forceModels)/gradULiftForce/gradULiftForce.C
$(forceModels)/HollowayDrag/HollowayDrag.C
$(forceModels)/viscForce/viscForce.C
$(forceModels)/MeiLift/MeiLift.C
$(forceModels)/melting/melting.C
$(forceModels)/KochHillDragNLift/KochHillDragNLift.C
$(forceModels)/stokesSpheroidDrag/stokesSpheroidDrag.C
$(forceModels)/solidsPressureForce/solidsPressureForce.C
$(forceModels)/periodicPressure/periodicPressure.C
$(forceModels)/periodicPressureControl/periodicPressureControl.C
$(forceModels)/averageSlipVel/averageSlipVel.C
$(forceModels)/particleCellVolume/particleCellVolume.C
$(forceModels)/fieldTimeAverage/fieldTimeAverage.C
$(forceModels)/volWeightedAverage/volWeightedAverage.C
$(forceModelsMS)/forceModelMS/forceModelMS.C
$(forceModelsMS)/forceModelMS/newForceModelMS.C
$(forceModelsMS)/DiFeliceDragMS/DiFeliceDragMS.C
$(forceModelsMS)/GidaspowDragMS/GidaspowDragMS.C
$(forceModelsMS)/noDragMS/noDragMS.C
$(probeModels)/probeModel/probeModel.C
$(probeModels)/probeModel/newProbeModel.C
$(probeModels)/noProbe/noProbe.C
$(probeModels)/particleProbe/particleProbe.C
/*$(probeModels)/interfaceParticleProbe/interfaceParticleProbe.C*/
$(IOModels)/IOModel/IOModel.C
$(IOModels)/IOModel/newIOModel.C
$(IOModels)/noIO/noIO.C
$(IOModels)/basicIO/basicIO.C
$(IOModels)/tempIO/tempIO.C
$(IOModels)/colorIO/colorIO.C
$(IOModels)/trackIO/trackIO.C
$(IOModels)/sophIO/sophIO.C
@ -60,34 +84,39 @@ $(voidFractionModels)/voidFractionModel/voidFractionModel.C
$(voidFractionModels)/voidFractionModel/newVoidFractionModel.C
$(voidFractionModels)/centreVoidFraction/centreVoidFraction.C
$(voidFractionModels)/dividedVoidFraction/dividedVoidFraction.C
$(voidFractionModels)/dividedVoidFractionMS/dividedVoidFractionMS.C
$(voidFractionModels)/dividedVoidFractionBiDi/dividedVoidFractionBiDi.C
$(voidFractionModels)/bigParticleVoidFraction/bigParticleVoidFraction.C
$(voidFractionModels)/GaussVoidFraction/GaussVoidFraction.C
$(voidFractionModels)/IBVoidFraction/IBVoidFraction.C
$(voidFractionModels)/weightedNeigbhorsVoidFraction/weightedNeigbhorsVoidFraction.C
$(voidFractionModelsMS)/voidFractionModelMS/voidFractionModelMS.C
$(voidFractionModelsMS)/voidFractionModelMS/newVoidFractionModelMS.C
$(voidFractionModelsMS)/dividedVoidFractionMS/dividedVoidFractionMS.C
$(locateModels)/locateModel/locateModel.C
$(locateModels)/locateModel/newLocateModel.C
$(locateModels)/standardSearch/standardSearch.C
$(locateModels)/engineSearch/engineSearch.C
$(locateModels)/engineSearchMany2Many/engineSearchMany2Many.C
$(locateModels)/turboEngineSearch/turboEngineSearch.C
$(locateModels)/turboEngineSearchM2M/turboEngineSearchM2M.C
$(locateModels)/engineSearchIB/engineSearchIB.C
$(locateModels)/hyperEngineSearch/hyperEngineSearch.C
$(locateModels)/ijkSearch/ijkSearch.C
$(meshMotionModels)/meshMotionModel/meshMotionModel.C
$(meshMotionModels)/meshMotionModel/newMeshMotionModel.C
$(meshMotionModels)/noMeshMotion/noMeshMotion.C
$(meshMotionModels)/DEMdrivenMeshMotion/DEMdrivenMeshMotion.C
$(momCoupleModels)/momCoupleModel/momCoupleModel.C
$(momCoupleModels)/momCoupleModel/newMomCoupleModel.C
$(momCoupleModels)/explicitCouple/explicitCouple.C
$(momCoupleModels)/explicitCoupleSource/explicitCoupleSource.C
$(momCoupleModels)/implicitCouple/implicitCouple.C
$(momCoupleModels)/noCouple/noCouple.C
$(regionModels)/regionModel/regionModel.C
$(regionModels)/regionModel/newRegionModel.C
$(regionModels)/allRegion/allRegion.C
$(dataExchangeModels)/dataExchangeModel/dataExchangeModel.C
$(dataExchangeModels)/dataExchangeModel/newDataExchangeModel.C
$(dataExchangeModels)/oneWayVTK/oneWayVTK.C
@ -95,11 +124,13 @@ $(dataExchangeModels)/twoWayFiles/twoWayFiles.C
$(dataExchangeModels)/noDataExchange/noDataExchange.C
$(dataExchangeModels)/twoWayMPI/twoWayMPI.C
$(dataExchangeModels)/twoWayM2M/twoWayM2M.C
$(dataExchangeModels)/twoWayMany2Many/twoWayMany2Many.C
$(averagingModels)/averagingModel/averagingModel.C
$(averagingModels)/averagingModel/newAveragingModel.C
$(averagingModels)/dilute/dilute.C
$(averagingModels)/dense/dense.C
$(averagingModels)/denseBiDi/denseBiDi.C
$(clockModels)/clockModel/clockModel.C
$(clockModels)/clockModel/newClockModel.C
@ -108,6 +139,7 @@ $(clockModels)/noClock/noClock.C
$(liggghtsCommandModels)/liggghtsCommandModel/liggghtsCommandModel.C
$(liggghtsCommandModels)/liggghtsCommandModel/newLiggghtsCommandModel.C
$(liggghtsCommandModels)/colorParticles/colorParticles.C
$(liggghtsCommandModels)/execute/execute.C
$(liggghtsCommandModels)/runLiggghts/runLiggghts.C
$(liggghtsCommandModels)/writeLiggghts/writeLiggghts.C
@ -117,5 +149,6 @@ $(smoothingModels)/smoothingModel/smoothingModel.C
$(smoothingModels)/smoothingModel/newSmoothingModel.C
$(smoothingModels)/noSmoothing/noSmoothing.C
$(smoothingModels)/constDiffSmoothing/constDiffSmoothing.C
$(smoothingModels)/localPSizeDiffSmoothing/localPSizeDiffSmoothing.C
LIB = $(FOAM_USER_LIBBIN)/lib$(CFDEM_LIB_NAME)
LIB = $(CFDEM_LIB_DIR)/lib$(CFDEM_LIB_NAME)

View File

@ -14,6 +14,7 @@ EXE_INC = \
-I$(LIB_SRC)/OpenFOAM/containers/HashTables/labelHashSet \
-I$(CFDEM_LIGGGHTS_SRC_DIR) \
-I$(CFDEM_M2MLIB_PATH) \
-I$(CFDEM_Many2ManyLIB_PATH) \
-I$(CFDEM_SRC_DIR)/cfdTools \
LIB_LIBS = \
@ -28,4 +29,10 @@ LIB_LIBS = \
-L$(CFDEM_LIGGGHTS_SRC_DIR) \
-l$(CFDEM_LIGGGHTS_LIB_NAME) \
-L$(CFDEM_M2MLIB_PATH) \
-lcouple
-lcouple \
-L$(CFDEM_Many2ManyLIB_PATH) \
-lcoupleMany2Many \
/* add -I$(CFDEM_POEMSLIB_PATH) \ to EXE_INC */
/* -L$(CFDEM_POEMSLIB_PATH) \ */
/* -lpoems */

View File

@ -1,6 +1,6 @@
word CFDEMversion="cfdem-2.6.4";
word compatibleLIGGGHTSversion="3.0.1";
word OFversion="2.2.x-commit-61b850bc107bdd60bbf1bf9a6417b9faf701d128";
word CFDEMversion="cfdem-2.7.0";
word compatibleLIGGGHTSversion="3.0.2";
word OFversion="2.3.x-commit-4d6f4a3115ff76ec4154c580eb041bc95ba4ec09";
Info << "\nCFDEMcoupling version: " << CFDEMversion << "\n" << endl;
Info << "\n, compatible to LIGGGHTS version: " << compatibleLIGGGHTSversion << "\n" << endl;

View File

@ -59,17 +59,21 @@ cfdemCloudMS::cfdemCloudMS
exCM_(NULL),
eyCM_(NULL),
ezCM_(NULL),
VclumpCM_(NULL),
SclumpCM_(NULL),
scalingCM_(NULL),
typeCM_(NULL),
Cclump_ex_(NULL),
Cclump_ey_(NULL),
typeVolCM_(NULL),
VclumpCM_(NULL),
particleWeightsCM_(NULL),
dHCM_(NULL),
//SclumpCM_(NULL),
//scalingCM_(NULL),
//Cclump_ex_(NULL),
//Cclump_ey_(NULL),
impForcesCM_(NULL),
expForcesCM_(NULL),
DEMForcesCM_(NULL),
particleWeightsCM_(NULL),
numberOfClumps_(-1),
overlapCorr_(readScalar(couplingProperties_.lookup("overlapCorr"))),
monoMS_(Switch(couplingProperties_.lookup("monoMS"))),
numberOfClumpsChanged_(false),
useforcePerClump_(false),
forceModels_(couplingProperties_.lookup("forceModelsMS"))
@ -84,6 +88,9 @@ cfdemCloudMS::cfdemCloudMS
forceModels_[i]
);
}
if(overlapCorr_>1.0) FatalError << "overlapCorr_ must be <= 1."<< abort(FatalError);
Info << "overlapCorr_=" << overlapCorr_ << endl;
}
@ -99,16 +106,18 @@ cfdemCloudMS::~cfdemCloudMS()
delete exCM_;
delete eyCM_;
delete ezCM_;
delete VclumpCM_;
delete SclumpCM_;
delete scalingCM_;
delete typeCM_;
delete Cclump_ex_;
delete Cclump_ey_;
delete typeVolCM_;
delete VclumpCM_;
delete particleWeightsCM_;
delete dHCM_;
//delete SclumpCM_;
//delete scalingCM_;
//delete Cclump_ex_;
//delete Cclump_ey_;
delete impForcesCM_;
delete expForcesCM_;
delete DEMForcesCM_;
delete particleWeightsCM_;
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
@ -129,12 +138,14 @@ void cfdemCloudMS::getDEMdata()
dataExchangeM().getData("ey_space","vector-multisphere",eyCM_); // axis of inertia
dataExchangeM().getData("ez_space","vector-multisphere",ezCM_); // axis of inertia
// dataExchangeM().getScalarData("Vclump",VclumpCM_); // Volume of the clump
// dataExchangeM().getData("typeCM","scalar-multisphere",typeCM_); // type of the clump
// dataExchangeM().getData("nTypes","scalar-global",nTypes_); // nr of clump types
// dataExchangeM().getData("Vclump","vector-global",typeVolCM_); // Volume of the clump type
setClumpVolume(); // can be replaced once volume is communicated!!!
setdHCM(); // calc and store dHCM
// dataExchangeM().getScalarData("Sclump",SclumpCM_); // surface area of the clump
// dataExchangeM().getScalarData("scaling",scalingCM_); // scaling of the clump
// dataExchangeM().getScalarData("typeCM",typeCM_); // type of the clump
// dataExchangeM().getScalarData("Cclump_ex",Cclump_ex_); // cross section of the clump in ex normal direction
// dataExchangeM().getScalarData("Cclump_ey",Cclump_ey_); // cross section of the clump in ey normal direction
@ -179,22 +190,24 @@ bool cfdemCloudMS::reAllocArrays() const
// get arrays of new length
dataExchangeM().allocateArray(positionsCM_,0,3,"nbodies");
dataExchangeM().allocateArray(velocitiesCM_,0,3,"nbodies");
dataExchangeM().allocateArray(cellIDsCM_,0,1,"nbodies");
dataExchangeM().allocateArray(bodies_,0,3);
dataExchangeM().allocateArray(cellIDsCM_,-1,1,"nbodies");
dataExchangeM().allocateArray(bodies_,0,1);
dataExchangeM().allocateArray(nrigids_,0,1,"nbodies");
dataExchangeM().allocateArray(exCM_,0,3,"nbodies");
dataExchangeM().allocateArray(eyCM_,0,3,"nbodies");
dataExchangeM().allocateArray(ezCM_,0,3,"nbodies");
dataExchangeM().allocateArray(VclumpCM_,0,3,nClumpTypes);
dataExchangeM().allocateArray(SclumpCM_,0,3,nClumpTypes);
dataExchangeM().allocateArray(scalingCM_,0,3,"nbodies");
dataExchangeM().allocateArray(typeCM_,0,3,"nbodies");
dataExchangeM().allocateArray(Cclump_ex_,0,3,nClumpTypes);
dataExchangeM().allocateArray(Cclump_ey_,0,3,nClumpTypes);
dataExchangeM().allocateArray(typeCM_,0,1,"nbodies");
dataExchangeM().allocateArray(typeVolCM_,0,1,nClumpTypes);
dataExchangeM().allocateArray(VclumpCM_,0,1,"nbodies");
dataExchangeM().allocateArray(particleWeightsCM_,1,1,"nbodies");
dataExchangeM().allocateArray(dHCM_,1.,1,"nbodies");
//dataExchangeM().allocateArray(SclumpCM_,0,3,nClumpTypes);
//dataExchangeM().allocateArray(scalingCM_,0,3,"nbodies");
//dataExchangeM().allocateArray(Cclump_ex_,0,3,nClumpTypes);
//dataExchangeM().allocateArray(Cclump_ey_,0,3,nClumpTypes);
dataExchangeM().allocateArray(impForcesCM_,0,3,"nbodies");
dataExchangeM().allocateArray(expForcesCM_,0,3,"nbodies");
dataExchangeM().allocateArray(DEMForcesCM_,0,3,"nbodies");
dataExchangeM().allocateArray(particleWeightsCM_,1,1,"nbodies"); // filed is never changed-correct only for centre
return true;
}
return false;
@ -259,6 +272,95 @@ void Foam::cfdemCloudMS::setParticleForceField()
}
}
void Foam::cfdemCloudMS::setClumpVolume()
{
//============================================
// final version if vol is transferred
label type;
for(int ind = 0;ind < numberOfClumps(); ind++)
{
type = typeCM()[ind][0];
VclumpCM()[ind][0] = typeVolCM()[type][0];
}
//============================================
//============================================
// prelim version
scalar r(0);
int nrigidC(-1);
label ind(-1);
label prevInd(-2);
// loop all particles
// NOTE: this approach is inefficient and
// assumes same overlap for all clumps
for(int index = 0;index < numberOfParticles(); index++)
{
ind=body(index);
// clump not found
if (ind < 0) Warning <<"clump was deleted??? ind = "<< ind << endl;
else if(cellIDCM(ind) > -1) // clump found
//if (cellIDs()[index][0] > -1) // particle Found
{
//if(verbose_) Pout <<"clump :"<< ind << " found on this proc, cellIDCM(ind)=" << cellIDCM(ind) << endl;
// particles of clump have same size
// Note: does this work in parallel???
if(monoMS_)
{
if(prevInd!=ind)
{
prevInd=ind;
nrigidC=nrigid(ind);
if (nrigidC <= 0)
{
Warning <<"A BUG occurred in Foam::cfdemCloudMS::setClumpVolume() nrigidC = "
<< nrigidC <<", ind = " << ind <<", index=" << index <<"\n" << endl;
nrigidC = 1;
}
r=radius(index);
VclumpCM_[ind][0]=nrigidC*r*r*r*M_PI/6*overlapCorr_;
//if(verbose_) Pout << "ind=" << ind << " ,VclumpCM_[ind][0]" << VclumpCM_[ind][0] << endl;
}
}
// particles of clump can have different size
else
{
r=radius(index);
VclumpCM_[ind][0]+=r*r*r*M_PI/6*overlapCorr_;
//if(verbose_) Pout << "summing up volume: " << "ind=" << ind << " ,VclumpCM_[ind][0]" << VclumpCM_[ind][0] << endl;
}
}
//else
//if(verbose_) Pout <<"clump :"<< ind << " not found on this proc." << endl;
}
if(verbose_)
{
for(int ind = 0;ind < numberOfClumps(); ind++)
Pout << "clumpVolume: " << "ind=" << ind << " ,VclumpCM_[ind][0]" << VclumpCM_[ind][0] << endl;
}
//============================================
}
void Foam::cfdemCloudMS::setdHCM()
{
// calc a hydraulic diameter as d of vol equal sphere
for(int ind = 0;ind < numberOfClumps(); ind++)
{
if (ind < 0)
{
Warning <<"clump was deleted??? ind = "<< ind << endl;
}
else
{
dHCM_[ind][0]=pow(VclumpCM_[ind][0]/(M_PI*4/3),1./3.);
}
}
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// PUBLIC MEMBER FUNCTIONS

View File

@ -70,22 +70,25 @@ private:
mutable double **eyCM_;
mutable double **ezCM_;
mutable double **VclumpCM_;
mutable double **SclumpCM_;
mutable double **scalingCM_;
mutable double **typeCM_;
mutable double **typeVolCM_;
mutable double **VclumpCM_;
mutable double **particleWeightsCM_;
mutable double **Cclump_ex_;
mutable double **Cclump_ey_;
mutable double **dHCM_;
//mutable double **SclumpCM_;
//mutable double **scalingCM_;
//mutable double **Cclump_ex_;
//mutable double **Cclump_ey_;
mutable double **impForcesCM_;
mutable double **expForcesCM_;
mutable double **DEMForcesCM_;
mutable double **particleWeightsCM_;
int numberOfClumps_;
scalar overlapCorr_; // ratio between clump vol and sum(particle vol)
Switch monoMS_;
bool numberOfClumpsChanged_;
bool useforcePerClump_;
@ -101,6 +104,8 @@ private:
void findCells();
void setForces();
void setParticleForceField();
void setClumpVolume(); // can be replaced once volume is communicated!!!
void setdHCM();
public:
@ -134,6 +139,14 @@ public:
inline double **& velocitiesCM() const;
inline double **& typeCM() const;
inline double **& typeVolCM() const;
inline double **& VclumpCM() const;
inline double **& dHCM() const;
inline double **& impForcesCM() const;
inline double **& expForcesCM() const;

View File

@ -44,6 +44,26 @@ inline double **& cfdemCloudMS::velocitiesCM() const
return velocitiesCM_;
}
inline double **& cfdemCloudMS::typeCM() const
{
return typeCM_;
}
inline double **& cfdemCloudMS::typeVolCM() const
{
return typeVolCM_;
}
inline double **& cfdemCloudMS::VclumpCM() const
{
return VclumpCM_;
}
inline double **& cfdemCloudMS::dHCM() const
{
return dHCM_;
}
inline double **& cfdemCloudMS::impForcesCM() const
{
return impForcesCM_;

View File

@ -1,5 +1,5 @@
//#define version23 // currently being tested
#define version22 // currently being used
#define version23 // currently being tested
//#define version22 // currently being used
//#define version21
//#define version16ext
//#define version15

View File

@ -14,6 +14,12 @@ logDir="log"
cd $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc
mkdir -p $logDir
#================================================================================#
# copy LIGGGHTS patch files if available
#================================================================================#
echo "copying patch files for LIGGGHTS if available"
cp $CFDEM_SRC_DIR/LIGGGHTSpatch/* $CFDEM_LIGGGHTS_SRC_DIR
#--------------------------------------------------------------------------------#
#- define variables
logpath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")/$logDir"

View File

@ -1,4 +0,0 @@
#syntax: makefileName/dir
#note: dir is not a path, just a keyword here
###############################################
M2M/dir

View File

@ -1 +1,11 @@
lagrangian/cfdemParticle/dir
#====================================================='
#- RADL
fvOptions/dir
cylPorousMedia/dir
#====================================================='
#- other
finiteVolume/dir

View File

@ -1,4 +1,13 @@
cfdemSolverPisoMS/dir
cfdemSolverPiso/dir
cfdemSolverIB/dir
cfdemSolverPisoScalar/dir
cfdemSolverPimpleImEx/dir
cfdemSolverIBInterLubrication/dir
cfdemSolverIBScalar/dir
cfdemSolverInterDyM/dir
cfdemSolverInterDyMPC/dir
cfdemSolverBubble/dir
cfdemSolverPisoMS/dir
cfdemSolverPimpleDyM_22x/dir
cfdemSolverPimpleDyMMS_22x/dir
cfdemSolverPimpleDyMScalar_22x/dir

View File

@ -7,15 +7,51 @@
#===================================================================#
cfdemSolverPiso/settlingTestMPI/dir
cfdemSolverPiso/ErgunTestMPI/dir
cfdemSolverPiso/ErgunTestMPI_cgs/dir
cfdemSolverPiso/ErgunTestMPI_restart/dir
cfdemSolverIB/twoSpheresGlowinskiMPI/dir
cfdemSolverPisoScalar/packedBedTemp/dir
#===================================================================#
# RADL
cfdemSolverPimpleImEx/settlingTestMPI/dir
cfdemSolverPimpleImEx/ErgunTestMPI/dir
#cfdemSolverPimpleImEx/crossFlow/dir
#cfdemSolverIB/periodicCase/dir
#cfdemSolverIB/cfdemIBPeriodicCubicalBox_fullyPeriodic/dir
#cfdemSolverIBInterLubrication/twoCoatedParticlesRelMotion_smallTest/dir
#cfdemSolverIBScalar/cfdemIBPeriodicCubicalBoxScalar/dir
#===================================================================#
# NesteJacobs
#Projects/Neste/cfdemSolverBubble/3pFBreactor/dir
#Projects/Neste/cfdemSolverInterDyM/3pFBreactor/dir
#===================================================================#
# not in release:
#cfdemSolverPiso/settlingTestBigParticleMPI/dir
cfdemSolverPiso/ErgunTestCG/dir
cfdemSolverPiso/ErgunTestM2M/dir
#cfdemSolverPiso/HopperEmptying/dir
cfdemSolverPimpleDyM/ErgunTestMPI/dir
#cfdemSolverPisoMS/settlingTestMPI/dir
#cfdemSolverPisoMS/ErgunTestMPI/dir
#cfdemSolverInterDyM/twoPhaseSettlingTest/dir
#cfdemSolverInterDyM/ErgunTestMPI/dir
#cfdemSolverInterDyM/granularPiston/dir
#cfdemSolverInterDyM/sugarNcoffee/dir
#cfdemSolverBubble/ErgunTestMPI_pureLiquid/dir
#- these examples are already designed for 2.3.x
#cfdemSolverInterDyMPC/sugarNcoffee/dir
#cfdemSolverInterDyMPC/granularPiston/dir
#cfdemSolverInterDyMPC/meltingPot/dir

View File

@ -1,31 +1,127 @@
error.o: error.cpp \
/home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi.h \
error.o: error.cpp /usr/lib/openmpi/include/mpi.h \
/usr/lib/gcc/x86_64-linux-gnu/4.6/include/stddef.h \
/home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi_portable_platform.h \
/usr/include/stdlib.h /usr/include/features.h \
/usr/include/x86_64-linux-gnu/bits/predefs.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/mpicxx.h \
/usr/include/c++/4.6/map /usr/include/c++/4.6/bits/stl_tree.h \
/usr/include/c++/4.6/bits/stl_algobase.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/c++config.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/os_defines.h \
/usr/include/features.h /usr/include/x86_64-linux-gnu/bits/predefs.h \
/usr/include/x86_64-linux-gnu/sys/cdefs.h \
/usr/include/x86_64-linux-gnu/bits/wordsize.h \
/usr/include/x86_64-linux-gnu/gnu/stubs.h \
/usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
/usr/include/x86_64-linux-gnu/bits/waitflags.h \
/usr/include/x86_64-linux-gnu/bits/waitstatus.h /usr/include/endian.h \
/usr/include/x86_64-linux-gnu/bits/endian.h \
/usr/include/x86_64-linux-gnu/bits/byteswap.h /usr/include/xlocale.h \
/usr/include/x86_64-linux-gnu/sys/types.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/cpu_defines.h \
/usr/include/c++/4.6/bits/functexcept.h \
/usr/include/c++/4.6/bits/exception_defines.h \
/usr/include/c++/4.6/bits/cpp_type_traits.h \
/usr/include/c++/4.6/ext/type_traits.h \
/usr/include/c++/4.6/ext/numeric_traits.h \
/usr/include/c++/4.6/bits/stl_pair.h /usr/include/c++/4.6/bits/move.h \
/usr/include/c++/4.6/bits/concept_check.h \
/usr/include/c++/4.6/bits/stl_iterator_base_types.h \
/usr/include/c++/4.6/bits/stl_iterator_base_funcs.h \
/usr/include/c++/4.6/bits/stl_iterator.h \
/usr/include/c++/4.6/debug/debug.h /usr/include/c++/4.6/bits/allocator.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/c++allocator.h \
/usr/include/c++/4.6/ext/new_allocator.h /usr/include/c++/4.6/new \
/usr/include/c++/4.6/exception /usr/include/c++/4.6/bits/stl_function.h \
/usr/include/c++/4.6/backward/binders.h \
/usr/include/c++/4.6/bits/stl_map.h \
/usr/include/c++/4.6/initializer_list \
/usr/include/c++/4.6/bits/stl_multimap.h \
/usr/include/c++/4.6/bits/range_access.h /usr/include/c++/4.6/utility \
/usr/include/c++/4.6/bits/stl_relops.h \
/usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h /usr/include/stdio.h \
/usr/include/x86_64-linux-gnu/bits/types.h \
/usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/time.h \
/usr/include/x86_64-linux-gnu/sys/select.h \
/usr/include/x86_64-linux-gnu/bits/select.h \
/usr/include/x86_64-linux-gnu/bits/sigset.h \
/usr/include/x86_64-linux-gnu/bits/time.h \
/usr/include/x86_64-linux-gnu/bits/select2.h \
/usr/include/x86_64-linux-gnu/sys/sysmacros.h \
/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h /usr/include/alloca.h \
/usr/include/x86_64-linux-gnu/bits/stdlib.h /usr/include/stdio.h \
/usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
/usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h \
/usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/libio.h \
/usr/include/_G_config.h /usr/include/wchar.h \
/usr/include/x86_64-linux-gnu/bits/stdio_lim.h \
/usr/include/x86_64-linux-gnu/bits/sys_errlist.h \
/usr/include/x86_64-linux-gnu/bits/stdio.h \
/usr/include/x86_64-linux-gnu/bits/stdio2.h error.h
/usr/include/x86_64-linux-gnu/bits/stdio2.h \
/usr/include/c++/4.6/iostream /usr/include/c++/4.6/ostream \
/usr/include/c++/4.6/ios /usr/include/c++/4.6/iosfwd \
/usr/include/c++/4.6/bits/stringfwd.h \
/usr/include/c++/4.6/bits/postypes.h /usr/include/c++/4.6/cwchar \
/usr/include/x86_64-linux-gnu/bits/wchar.h /usr/include/xlocale.h \
/usr/include/x86_64-linux-gnu/bits/wchar2.h \
/usr/include/c++/4.6/bits/char_traits.h \
/usr/include/c++/4.6/bits/localefwd.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/c++locale.h \
/usr/include/c++/4.6/clocale /usr/include/locale.h \
/usr/include/x86_64-linux-gnu/bits/locale.h /usr/include/c++/4.6/cctype \
/usr/include/ctype.h /usr/include/endian.h \
/usr/include/x86_64-linux-gnu/bits/endian.h \
/usr/include/x86_64-linux-gnu/bits/byteswap.h \
/usr/include/c++/4.6/bits/ios_base.h \
/usr/include/c++/4.6/ext/atomicity.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/gthr.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/gthr-default.h \
/usr/include/pthread.h /usr/include/sched.h /usr/include/time.h \
/usr/include/x86_64-linux-gnu/bits/sched.h \
/usr/include/x86_64-linux-gnu/bits/time.h \
/usr/include/x86_64-linux-gnu/bits/timex.h \
/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h \
/usr/include/x86_64-linux-gnu/bits/setjmp.h /usr/include/unistd.h \
/usr/include/x86_64-linux-gnu/bits/posix_opt.h \
/usr/include/x86_64-linux-gnu/bits/environments.h \
/usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/getopt.h \
/usr/include/x86_64-linux-gnu/bits/unistd.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/atomic_word.h \
/usr/include/c++/4.6/bits/locale_classes.h /usr/include/c++/4.6/string \
/usr/include/c++/4.6/bits/ostream_insert.h \
/usr/include/c++/4.6/bits/cxxabi_forced.h \
/usr/include/c++/4.6/bits/basic_string.h \
/usr/include/c++/4.6/bits/basic_string.tcc \
/usr/include/c++/4.6/bits/locale_classes.tcc \
/usr/include/c++/4.6/streambuf /usr/include/c++/4.6/bits/streambuf.tcc \
/usr/include/c++/4.6/bits/basic_ios.h \
/usr/include/c++/4.6/bits/locale_facets.h /usr/include/c++/4.6/cwctype \
/usr/include/wctype.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/ctype_base.h \
/usr/include/c++/4.6/bits/streambuf_iterator.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/ctype_inline.h \
/usr/include/c++/4.6/bits/locale_facets.tcc \
/usr/include/c++/4.6/bits/basic_ios.tcc \
/usr/include/c++/4.6/bits/ostream.tcc /usr/include/c++/4.6/istream \
/usr/include/c++/4.6/bits/istream.tcc \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/constants.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/exception.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions_inln.h \
/usr/include/string.h /usr/include/x86_64-linux-gnu/bits/string3.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file_inln.h \
/usr/include/stdlib.h /usr/include/x86_64-linux-gnu/bits/waitflags.h \
/usr/include/x86_64-linux-gnu/bits/waitstatus.h \
/usr/include/x86_64-linux-gnu/sys/types.h \
/usr/include/x86_64-linux-gnu/sys/select.h \
/usr/include/x86_64-linux-gnu/bits/select.h \
/usr/include/x86_64-linux-gnu/bits/sigset.h \
/usr/include/x86_64-linux-gnu/bits/select2.h \
/usr/include/x86_64-linux-gnu/sys/sysmacros.h /usr/include/alloca.h \
/usr/include/x86_64-linux-gnu/bits/stdlib.h error.h

View File

@ -27,6 +27,101 @@ irregular.o: irregular.cpp /usr/include/stdio.h /usr/include/features.h \
/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h /usr/include/alloca.h \
/usr/include/x86_64-linux-gnu/bits/stdlib.h /usr/include/string.h \
/usr/include/x86_64-linux-gnu/bits/string3.h irregular.h \
/home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi.h \
/home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi_portable_platform.h \
memory.h error.h
/usr/lib/openmpi/include/mpi.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/mpicxx.h \
/usr/include/c++/4.6/map /usr/include/c++/4.6/bits/stl_tree.h \
/usr/include/c++/4.6/bits/stl_algobase.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/c++config.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/os_defines.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/cpu_defines.h \
/usr/include/c++/4.6/bits/functexcept.h \
/usr/include/c++/4.6/bits/exception_defines.h \
/usr/include/c++/4.6/bits/cpp_type_traits.h \
/usr/include/c++/4.6/ext/type_traits.h \
/usr/include/c++/4.6/ext/numeric_traits.h \
/usr/include/c++/4.6/bits/stl_pair.h /usr/include/c++/4.6/bits/move.h \
/usr/include/c++/4.6/bits/concept_check.h \
/usr/include/c++/4.6/bits/stl_iterator_base_types.h \
/usr/include/c++/4.6/bits/stl_iterator_base_funcs.h \
/usr/include/c++/4.6/bits/stl_iterator.h \
/usr/include/c++/4.6/debug/debug.h /usr/include/c++/4.6/bits/allocator.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/c++allocator.h \
/usr/include/c++/4.6/ext/new_allocator.h /usr/include/c++/4.6/new \
/usr/include/c++/4.6/exception /usr/include/c++/4.6/bits/stl_function.h \
/usr/include/c++/4.6/backward/binders.h \
/usr/include/c++/4.6/bits/stl_map.h \
/usr/include/c++/4.6/initializer_list \
/usr/include/c++/4.6/bits/stl_multimap.h \
/usr/include/c++/4.6/bits/range_access.h /usr/include/c++/4.6/utility \
/usr/include/c++/4.6/bits/stl_relops.h /usr/include/c++/4.6/iostream \
/usr/include/c++/4.6/ostream /usr/include/c++/4.6/ios \
/usr/include/c++/4.6/iosfwd /usr/include/c++/4.6/bits/stringfwd.h \
/usr/include/c++/4.6/bits/postypes.h /usr/include/c++/4.6/cwchar \
/usr/include/x86_64-linux-gnu/bits/wchar.h \
/usr/include/x86_64-linux-gnu/bits/wchar2.h \
/usr/include/c++/4.6/bits/char_traits.h \
/usr/include/c++/4.6/bits/localefwd.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/c++locale.h \
/usr/include/c++/4.6/clocale /usr/include/locale.h \
/usr/include/x86_64-linux-gnu/bits/locale.h /usr/include/c++/4.6/cctype \
/usr/include/ctype.h /usr/include/c++/4.6/bits/ios_base.h \
/usr/include/c++/4.6/ext/atomicity.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/gthr.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/gthr-default.h \
/usr/include/pthread.h /usr/include/sched.h \
/usr/include/x86_64-linux-gnu/bits/sched.h \
/usr/include/x86_64-linux-gnu/bits/timex.h \
/usr/include/x86_64-linux-gnu/bits/setjmp.h /usr/include/unistd.h \
/usr/include/x86_64-linux-gnu/bits/posix_opt.h \
/usr/include/x86_64-linux-gnu/bits/environments.h \
/usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/getopt.h \
/usr/include/x86_64-linux-gnu/bits/unistd.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/atomic_word.h \
/usr/include/c++/4.6/bits/locale_classes.h /usr/include/c++/4.6/string \
/usr/include/c++/4.6/bits/ostream_insert.h \
/usr/include/c++/4.6/bits/cxxabi_forced.h \
/usr/include/c++/4.6/bits/basic_string.h \
/usr/include/c++/4.6/bits/basic_string.tcc \
/usr/include/c++/4.6/bits/locale_classes.tcc \
/usr/include/c++/4.6/streambuf /usr/include/c++/4.6/bits/streambuf.tcc \
/usr/include/c++/4.6/bits/basic_ios.h \
/usr/include/c++/4.6/bits/locale_facets.h /usr/include/c++/4.6/cwctype \
/usr/include/wctype.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/ctype_base.h \
/usr/include/c++/4.6/bits/streambuf_iterator.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/ctype_inline.h \
/usr/include/c++/4.6/bits/locale_facets.tcc \
/usr/include/c++/4.6/bits/basic_ios.tcc \
/usr/include/c++/4.6/bits/ostream.tcc /usr/include/c++/4.6/istream \
/usr/include/c++/4.6/bits/istream.tcc \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/constants.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/exception.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file_inln.h memory.h \
error.h

View File

@ -21,12 +21,108 @@ lammps_data_write.o: lammps_data_write.cpp /usr/include/stdlib.h \
/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h /usr/include/alloca.h \
/usr/include/x86_64-linux-gnu/bits/stdlib.h /usr/include/string.h \
/usr/include/x86_64-linux-gnu/bits/string3.h lammps_data_write.h \
send2one.h \
/home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi.h \
/home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi_portable_platform.h \
/usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
/usr/include/wchar.h /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h \
send2one.h /usr/lib/openmpi/include/mpi.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/mpicxx.h \
/usr/include/c++/4.6/map /usr/include/c++/4.6/bits/stl_tree.h \
/usr/include/c++/4.6/bits/stl_algobase.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/c++config.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/os_defines.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/cpu_defines.h \
/usr/include/c++/4.6/bits/functexcept.h \
/usr/include/c++/4.6/bits/exception_defines.h \
/usr/include/c++/4.6/bits/cpp_type_traits.h \
/usr/include/c++/4.6/ext/type_traits.h \
/usr/include/c++/4.6/ext/numeric_traits.h \
/usr/include/c++/4.6/bits/stl_pair.h /usr/include/c++/4.6/bits/move.h \
/usr/include/c++/4.6/bits/concept_check.h \
/usr/include/c++/4.6/bits/stl_iterator_base_types.h \
/usr/include/c++/4.6/bits/stl_iterator_base_funcs.h \
/usr/include/c++/4.6/bits/stl_iterator.h \
/usr/include/c++/4.6/debug/debug.h /usr/include/c++/4.6/bits/allocator.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/c++allocator.h \
/usr/include/c++/4.6/ext/new_allocator.h /usr/include/c++/4.6/new \
/usr/include/c++/4.6/exception /usr/include/c++/4.6/bits/stl_function.h \
/usr/include/c++/4.6/backward/binders.h \
/usr/include/c++/4.6/bits/stl_map.h \
/usr/include/c++/4.6/initializer_list \
/usr/include/c++/4.6/bits/stl_multimap.h \
/usr/include/c++/4.6/bits/range_access.h /usr/include/c++/4.6/utility \
/usr/include/c++/4.6/bits/stl_relops.h \
/usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h /usr/include/stdio.h \
/usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
/usr/include/x86_64-linux-gnu/bits/stdio_lim.h \
/usr/include/x86_64-linux-gnu/bits/sys_errlist.h \
/usr/include/x86_64-linux-gnu/bits/stdio.h \
/usr/include/x86_64-linux-gnu/bits/stdio2.h memory.h error.h
/usr/include/x86_64-linux-gnu/bits/stdio2.h \
/usr/include/c++/4.6/iostream /usr/include/c++/4.6/ostream \
/usr/include/c++/4.6/ios /usr/include/c++/4.6/iosfwd \
/usr/include/c++/4.6/bits/stringfwd.h \
/usr/include/c++/4.6/bits/postypes.h /usr/include/c++/4.6/cwchar \
/usr/include/x86_64-linux-gnu/bits/wchar.h \
/usr/include/x86_64-linux-gnu/bits/wchar2.h \
/usr/include/c++/4.6/bits/char_traits.h \
/usr/include/c++/4.6/bits/localefwd.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/c++locale.h \
/usr/include/c++/4.6/clocale /usr/include/locale.h \
/usr/include/x86_64-linux-gnu/bits/locale.h /usr/include/c++/4.6/cctype \
/usr/include/ctype.h /usr/include/c++/4.6/bits/ios_base.h \
/usr/include/c++/4.6/ext/atomicity.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/gthr.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/gthr-default.h \
/usr/include/pthread.h /usr/include/sched.h \
/usr/include/x86_64-linux-gnu/bits/sched.h \
/usr/include/x86_64-linux-gnu/bits/timex.h \
/usr/include/x86_64-linux-gnu/bits/setjmp.h /usr/include/unistd.h \
/usr/include/x86_64-linux-gnu/bits/posix_opt.h \
/usr/include/x86_64-linux-gnu/bits/environments.h \
/usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/getopt.h \
/usr/include/x86_64-linux-gnu/bits/unistd.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/atomic_word.h \
/usr/include/c++/4.6/bits/locale_classes.h /usr/include/c++/4.6/string \
/usr/include/c++/4.6/bits/ostream_insert.h \
/usr/include/c++/4.6/bits/cxxabi_forced.h \
/usr/include/c++/4.6/bits/basic_string.h \
/usr/include/c++/4.6/bits/basic_string.tcc \
/usr/include/c++/4.6/bits/locale_classes.tcc \
/usr/include/c++/4.6/streambuf /usr/include/c++/4.6/bits/streambuf.tcc \
/usr/include/c++/4.6/bits/basic_ios.h \
/usr/include/c++/4.6/bits/locale_facets.h /usr/include/c++/4.6/cwctype \
/usr/include/wctype.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/ctype_base.h \
/usr/include/c++/4.6/bits/streambuf_iterator.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/ctype_inline.h \
/usr/include/c++/4.6/bits/locale_facets.tcc \
/usr/include/c++/4.6/bits/basic_ios.tcc \
/usr/include/c++/4.6/bits/ostream.tcc /usr/include/c++/4.6/istream \
/usr/include/c++/4.6/bits/istream.tcc \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/constants.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/exception.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file_inln.h memory.h \
error.h

View File

@ -1,26 +1,15 @@
many2many.o: many2many.cpp \
/home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi.h \
many2many.o: many2many.cpp /usr/lib/openmpi/include/mpi.h \
/usr/lib/gcc/x86_64-linux-gnu/4.6/include/stddef.h \
/home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi_portable_platform.h \
/usr/include/stdio.h /usr/include/features.h \
/usr/include/x86_64-linux-gnu/bits/predefs.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/mpicxx.h \
/usr/include/c++/4.6/map /usr/include/c++/4.6/bits/stl_tree.h \
/usr/include/c++/4.6/bits/stl_algobase.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/c++config.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/os_defines.h \
/usr/include/features.h /usr/include/x86_64-linux-gnu/bits/predefs.h \
/usr/include/x86_64-linux-gnu/sys/cdefs.h \
/usr/include/x86_64-linux-gnu/bits/wordsize.h \
/usr/include/x86_64-linux-gnu/gnu/stubs.h \
/usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
/usr/include/x86_64-linux-gnu/bits/types.h \
/usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/libio.h \
/usr/include/_G_config.h /usr/include/wchar.h \
/usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h \
/usr/include/x86_64-linux-gnu/bits/stdio_lim.h \
/usr/include/x86_64-linux-gnu/bits/sys_errlist.h \
/usr/include/x86_64-linux-gnu/bits/stdio.h \
/usr/include/x86_64-linux-gnu/bits/stdio2.h many2many.h irregular.h \
memory.h error.h /usr/include/c++/4.6/map \
/usr/include/c++/4.6/bits/stl_tree.h \
/usr/include/c++/4.6/bits/stl_algobase.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/c++config.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/os_defines.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/cpu_defines.h \
/usr/include/c++/4.6/bits/functexcept.h \
/usr/include/c++/4.6/bits/exception_defines.h \
@ -40,4 +29,91 @@ many2many.o: many2many.cpp \
/usr/include/c++/4.6/bits/stl_map.h \
/usr/include/c++/4.6/initializer_list \
/usr/include/c++/4.6/bits/stl_multimap.h \
/usr/include/c++/4.6/bits/range_access.h
/usr/include/c++/4.6/bits/range_access.h /usr/include/c++/4.6/utility \
/usr/include/c++/4.6/bits/stl_relops.h \
/usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h /usr/include/stdio.h \
/usr/include/x86_64-linux-gnu/bits/types.h \
/usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/libio.h \
/usr/include/_G_config.h /usr/include/wchar.h \
/usr/include/x86_64-linux-gnu/bits/stdio_lim.h \
/usr/include/x86_64-linux-gnu/bits/sys_errlist.h \
/usr/include/x86_64-linux-gnu/bits/stdio.h \
/usr/include/x86_64-linux-gnu/bits/stdio2.h \
/usr/include/c++/4.6/iostream /usr/include/c++/4.6/ostream \
/usr/include/c++/4.6/ios /usr/include/c++/4.6/iosfwd \
/usr/include/c++/4.6/bits/stringfwd.h \
/usr/include/c++/4.6/bits/postypes.h /usr/include/c++/4.6/cwchar \
/usr/include/x86_64-linux-gnu/bits/wchar.h /usr/include/xlocale.h \
/usr/include/x86_64-linux-gnu/bits/wchar2.h \
/usr/include/c++/4.6/bits/char_traits.h \
/usr/include/c++/4.6/bits/localefwd.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/c++locale.h \
/usr/include/c++/4.6/clocale /usr/include/locale.h \
/usr/include/x86_64-linux-gnu/bits/locale.h /usr/include/c++/4.6/cctype \
/usr/include/ctype.h /usr/include/endian.h \
/usr/include/x86_64-linux-gnu/bits/endian.h \
/usr/include/x86_64-linux-gnu/bits/byteswap.h \
/usr/include/c++/4.6/bits/ios_base.h \
/usr/include/c++/4.6/ext/atomicity.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/gthr.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/gthr-default.h \
/usr/include/pthread.h /usr/include/sched.h /usr/include/time.h \
/usr/include/x86_64-linux-gnu/bits/sched.h \
/usr/include/x86_64-linux-gnu/bits/time.h \
/usr/include/x86_64-linux-gnu/bits/timex.h \
/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h \
/usr/include/x86_64-linux-gnu/bits/setjmp.h /usr/include/unistd.h \
/usr/include/x86_64-linux-gnu/bits/posix_opt.h \
/usr/include/x86_64-linux-gnu/bits/environments.h \
/usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/getopt.h \
/usr/include/x86_64-linux-gnu/bits/unistd.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/atomic_word.h \
/usr/include/c++/4.6/bits/locale_classes.h /usr/include/c++/4.6/string \
/usr/include/c++/4.6/bits/ostream_insert.h \
/usr/include/c++/4.6/bits/cxxabi_forced.h \
/usr/include/c++/4.6/bits/basic_string.h \
/usr/include/c++/4.6/bits/basic_string.tcc \
/usr/include/c++/4.6/bits/locale_classes.tcc \
/usr/include/c++/4.6/streambuf /usr/include/c++/4.6/bits/streambuf.tcc \
/usr/include/c++/4.6/bits/basic_ios.h \
/usr/include/c++/4.6/bits/locale_facets.h /usr/include/c++/4.6/cwctype \
/usr/include/wctype.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/ctype_base.h \
/usr/include/c++/4.6/bits/streambuf_iterator.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/ctype_inline.h \
/usr/include/c++/4.6/bits/locale_facets.tcc \
/usr/include/c++/4.6/bits/basic_ios.tcc \
/usr/include/c++/4.6/bits/ostream.tcc /usr/include/c++/4.6/istream \
/usr/include/c++/4.6/bits/istream.tcc \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/constants.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/exception.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions_inln.h \
/usr/include/string.h /usr/include/x86_64-linux-gnu/bits/string3.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file_inln.h many2many.h \
irregular.h memory.h error.h

View File

@ -1,31 +1,127 @@
many2one.o: many2one.cpp \
/home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi.h \
many2one.o: many2one.cpp /usr/lib/openmpi/include/mpi.h \
/usr/lib/gcc/x86_64-linux-gnu/4.6/include/stddef.h \
/home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi_portable_platform.h \
/usr/include/stdio.h /usr/include/features.h \
/usr/include/x86_64-linux-gnu/bits/predefs.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/mpicxx.h \
/usr/include/c++/4.6/map /usr/include/c++/4.6/bits/stl_tree.h \
/usr/include/c++/4.6/bits/stl_algobase.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/c++config.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/os_defines.h \
/usr/include/features.h /usr/include/x86_64-linux-gnu/bits/predefs.h \
/usr/include/x86_64-linux-gnu/sys/cdefs.h \
/usr/include/x86_64-linux-gnu/bits/wordsize.h \
/usr/include/x86_64-linux-gnu/gnu/stubs.h \
/usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/cpu_defines.h \
/usr/include/c++/4.6/bits/functexcept.h \
/usr/include/c++/4.6/bits/exception_defines.h \
/usr/include/c++/4.6/bits/cpp_type_traits.h \
/usr/include/c++/4.6/ext/type_traits.h \
/usr/include/c++/4.6/ext/numeric_traits.h \
/usr/include/c++/4.6/bits/stl_pair.h /usr/include/c++/4.6/bits/move.h \
/usr/include/c++/4.6/bits/concept_check.h \
/usr/include/c++/4.6/bits/stl_iterator_base_types.h \
/usr/include/c++/4.6/bits/stl_iterator_base_funcs.h \
/usr/include/c++/4.6/bits/stl_iterator.h \
/usr/include/c++/4.6/debug/debug.h /usr/include/c++/4.6/bits/allocator.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/c++allocator.h \
/usr/include/c++/4.6/ext/new_allocator.h /usr/include/c++/4.6/new \
/usr/include/c++/4.6/exception /usr/include/c++/4.6/bits/stl_function.h \
/usr/include/c++/4.6/backward/binders.h \
/usr/include/c++/4.6/bits/stl_map.h \
/usr/include/c++/4.6/initializer_list \
/usr/include/c++/4.6/bits/stl_multimap.h \
/usr/include/c++/4.6/bits/range_access.h /usr/include/c++/4.6/utility \
/usr/include/c++/4.6/bits/stl_relops.h \
/usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h /usr/include/stdio.h \
/usr/include/x86_64-linux-gnu/bits/types.h \
/usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/libio.h \
/usr/include/_G_config.h /usr/include/wchar.h \
/usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h \
/usr/include/x86_64-linux-gnu/bits/stdio_lim.h \
/usr/include/x86_64-linux-gnu/bits/sys_errlist.h \
/usr/include/x86_64-linux-gnu/bits/stdio.h \
/usr/include/x86_64-linux-gnu/bits/stdio2.h /usr/include/stdlib.h \
/usr/include/x86_64-linux-gnu/bits/waitflags.h \
/usr/include/x86_64-linux-gnu/bits/waitstatus.h /usr/include/endian.h \
/usr/include/x86_64-linux-gnu/bits/stdio2.h \
/usr/include/c++/4.6/iostream /usr/include/c++/4.6/ostream \
/usr/include/c++/4.6/ios /usr/include/c++/4.6/iosfwd \
/usr/include/c++/4.6/bits/stringfwd.h \
/usr/include/c++/4.6/bits/postypes.h /usr/include/c++/4.6/cwchar \
/usr/include/x86_64-linux-gnu/bits/wchar.h /usr/include/xlocale.h \
/usr/include/x86_64-linux-gnu/bits/wchar2.h \
/usr/include/c++/4.6/bits/char_traits.h \
/usr/include/c++/4.6/bits/localefwd.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/c++locale.h \
/usr/include/c++/4.6/clocale /usr/include/locale.h \
/usr/include/x86_64-linux-gnu/bits/locale.h /usr/include/c++/4.6/cctype \
/usr/include/ctype.h /usr/include/endian.h \
/usr/include/x86_64-linux-gnu/bits/endian.h \
/usr/include/x86_64-linux-gnu/bits/byteswap.h /usr/include/xlocale.h \
/usr/include/x86_64-linux-gnu/sys/types.h /usr/include/time.h \
/usr/include/x86_64-linux-gnu/bits/byteswap.h \
/usr/include/c++/4.6/bits/ios_base.h \
/usr/include/c++/4.6/ext/atomicity.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/gthr.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/gthr-default.h \
/usr/include/pthread.h /usr/include/sched.h /usr/include/time.h \
/usr/include/x86_64-linux-gnu/bits/sched.h \
/usr/include/x86_64-linux-gnu/bits/time.h \
/usr/include/x86_64-linux-gnu/bits/timex.h \
/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h \
/usr/include/x86_64-linux-gnu/bits/setjmp.h /usr/include/unistd.h \
/usr/include/x86_64-linux-gnu/bits/posix_opt.h \
/usr/include/x86_64-linux-gnu/bits/environments.h \
/usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/getopt.h \
/usr/include/x86_64-linux-gnu/bits/unistd.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/atomic_word.h \
/usr/include/c++/4.6/bits/locale_classes.h /usr/include/c++/4.6/string \
/usr/include/c++/4.6/bits/ostream_insert.h \
/usr/include/c++/4.6/bits/cxxabi_forced.h \
/usr/include/c++/4.6/bits/basic_string.h \
/usr/include/c++/4.6/bits/basic_string.tcc \
/usr/include/c++/4.6/bits/locale_classes.tcc \
/usr/include/c++/4.6/streambuf /usr/include/c++/4.6/bits/streambuf.tcc \
/usr/include/c++/4.6/bits/basic_ios.h \
/usr/include/c++/4.6/bits/locale_facets.h /usr/include/c++/4.6/cwctype \
/usr/include/wctype.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/ctype_base.h \
/usr/include/c++/4.6/bits/streambuf_iterator.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/ctype_inline.h \
/usr/include/c++/4.6/bits/locale_facets.tcc \
/usr/include/c++/4.6/bits/basic_ios.tcc \
/usr/include/c++/4.6/bits/ostream.tcc /usr/include/c++/4.6/istream \
/usr/include/c++/4.6/bits/istream.tcc \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/constants.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/exception.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions_inln.h \
/usr/include/string.h /usr/include/x86_64-linux-gnu/bits/string3.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file_inln.h \
/usr/include/stdlib.h /usr/include/x86_64-linux-gnu/bits/waitflags.h \
/usr/include/x86_64-linux-gnu/bits/waitstatus.h \
/usr/include/x86_64-linux-gnu/sys/types.h \
/usr/include/x86_64-linux-gnu/sys/select.h \
/usr/include/x86_64-linux-gnu/bits/select.h \
/usr/include/x86_64-linux-gnu/bits/sigset.h \
/usr/include/x86_64-linux-gnu/bits/time.h \
/usr/include/x86_64-linux-gnu/bits/select2.h \
/usr/include/x86_64-linux-gnu/sys/sysmacros.h \
/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h /usr/include/alloca.h \
/usr/include/x86_64-linux-gnu/sys/sysmacros.h /usr/include/alloca.h \
/usr/include/x86_64-linux-gnu/bits/stdlib.h many2one.h memory.h

View File

@ -1,31 +1,127 @@
memory.o: memory.cpp \
/home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi.h \
memory.o: memory.cpp /usr/lib/openmpi/include/mpi.h \
/usr/lib/gcc/x86_64-linux-gnu/4.6/include/stddef.h \
/home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi_portable_platform.h \
/usr/include/stdlib.h /usr/include/features.h \
/usr/include/x86_64-linux-gnu/bits/predefs.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/mpicxx.h \
/usr/include/c++/4.6/map /usr/include/c++/4.6/bits/stl_tree.h \
/usr/include/c++/4.6/bits/stl_algobase.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/c++config.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/os_defines.h \
/usr/include/features.h /usr/include/x86_64-linux-gnu/bits/predefs.h \
/usr/include/x86_64-linux-gnu/sys/cdefs.h \
/usr/include/x86_64-linux-gnu/bits/wordsize.h \
/usr/include/x86_64-linux-gnu/gnu/stubs.h \
/usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
/usr/include/x86_64-linux-gnu/bits/waitflags.h \
/usr/include/x86_64-linux-gnu/bits/waitstatus.h /usr/include/endian.h \
/usr/include/x86_64-linux-gnu/bits/endian.h \
/usr/include/x86_64-linux-gnu/bits/byteswap.h /usr/include/xlocale.h \
/usr/include/x86_64-linux-gnu/sys/types.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/cpu_defines.h \
/usr/include/c++/4.6/bits/functexcept.h \
/usr/include/c++/4.6/bits/exception_defines.h \
/usr/include/c++/4.6/bits/cpp_type_traits.h \
/usr/include/c++/4.6/ext/type_traits.h \
/usr/include/c++/4.6/ext/numeric_traits.h \
/usr/include/c++/4.6/bits/stl_pair.h /usr/include/c++/4.6/bits/move.h \
/usr/include/c++/4.6/bits/concept_check.h \
/usr/include/c++/4.6/bits/stl_iterator_base_types.h \
/usr/include/c++/4.6/bits/stl_iterator_base_funcs.h \
/usr/include/c++/4.6/bits/stl_iterator.h \
/usr/include/c++/4.6/debug/debug.h /usr/include/c++/4.6/bits/allocator.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/c++allocator.h \
/usr/include/c++/4.6/ext/new_allocator.h /usr/include/c++/4.6/new \
/usr/include/c++/4.6/exception /usr/include/c++/4.6/bits/stl_function.h \
/usr/include/c++/4.6/backward/binders.h \
/usr/include/c++/4.6/bits/stl_map.h \
/usr/include/c++/4.6/initializer_list \
/usr/include/c++/4.6/bits/stl_multimap.h \
/usr/include/c++/4.6/bits/range_access.h /usr/include/c++/4.6/utility \
/usr/include/c++/4.6/bits/stl_relops.h \
/usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h /usr/include/stdio.h \
/usr/include/x86_64-linux-gnu/bits/types.h \
/usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/time.h \
/usr/include/x86_64-linux-gnu/sys/select.h \
/usr/include/x86_64-linux-gnu/bits/select.h \
/usr/include/x86_64-linux-gnu/bits/sigset.h \
/usr/include/x86_64-linux-gnu/bits/time.h \
/usr/include/x86_64-linux-gnu/bits/select2.h \
/usr/include/x86_64-linux-gnu/sys/sysmacros.h \
/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h /usr/include/alloca.h \
/usr/include/x86_64-linux-gnu/bits/stdlib.h /usr/include/stdio.h \
/usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
/usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h \
/usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/libio.h \
/usr/include/_G_config.h /usr/include/wchar.h \
/usr/include/x86_64-linux-gnu/bits/stdio_lim.h \
/usr/include/x86_64-linux-gnu/bits/sys_errlist.h \
/usr/include/x86_64-linux-gnu/bits/stdio.h \
/usr/include/x86_64-linux-gnu/bits/stdio2.h memory.h error.h
/usr/include/x86_64-linux-gnu/bits/stdio2.h \
/usr/include/c++/4.6/iostream /usr/include/c++/4.6/ostream \
/usr/include/c++/4.6/ios /usr/include/c++/4.6/iosfwd \
/usr/include/c++/4.6/bits/stringfwd.h \
/usr/include/c++/4.6/bits/postypes.h /usr/include/c++/4.6/cwchar \
/usr/include/x86_64-linux-gnu/bits/wchar.h /usr/include/xlocale.h \
/usr/include/x86_64-linux-gnu/bits/wchar2.h \
/usr/include/c++/4.6/bits/char_traits.h \
/usr/include/c++/4.6/bits/localefwd.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/c++locale.h \
/usr/include/c++/4.6/clocale /usr/include/locale.h \
/usr/include/x86_64-linux-gnu/bits/locale.h /usr/include/c++/4.6/cctype \
/usr/include/ctype.h /usr/include/endian.h \
/usr/include/x86_64-linux-gnu/bits/endian.h \
/usr/include/x86_64-linux-gnu/bits/byteswap.h \
/usr/include/c++/4.6/bits/ios_base.h \
/usr/include/c++/4.6/ext/atomicity.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/gthr.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/gthr-default.h \
/usr/include/pthread.h /usr/include/sched.h /usr/include/time.h \
/usr/include/x86_64-linux-gnu/bits/sched.h \
/usr/include/x86_64-linux-gnu/bits/time.h \
/usr/include/x86_64-linux-gnu/bits/timex.h \
/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h \
/usr/include/x86_64-linux-gnu/bits/setjmp.h /usr/include/unistd.h \
/usr/include/x86_64-linux-gnu/bits/posix_opt.h \
/usr/include/x86_64-linux-gnu/bits/environments.h \
/usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/getopt.h \
/usr/include/x86_64-linux-gnu/bits/unistd.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/atomic_word.h \
/usr/include/c++/4.6/bits/locale_classes.h /usr/include/c++/4.6/string \
/usr/include/c++/4.6/bits/ostream_insert.h \
/usr/include/c++/4.6/bits/cxxabi_forced.h \
/usr/include/c++/4.6/bits/basic_string.h \
/usr/include/c++/4.6/bits/basic_string.tcc \
/usr/include/c++/4.6/bits/locale_classes.tcc \
/usr/include/c++/4.6/streambuf /usr/include/c++/4.6/bits/streambuf.tcc \
/usr/include/c++/4.6/bits/basic_ios.h \
/usr/include/c++/4.6/bits/locale_facets.h /usr/include/c++/4.6/cwctype \
/usr/include/wctype.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/ctype_base.h \
/usr/include/c++/4.6/bits/streambuf_iterator.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/ctype_inline.h \
/usr/include/c++/4.6/bits/locale_facets.tcc \
/usr/include/c++/4.6/bits/basic_ios.tcc \
/usr/include/c++/4.6/bits/ostream.tcc /usr/include/c++/4.6/istream \
/usr/include/c++/4.6/bits/istream.tcc \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/constants.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/exception.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions_inln.h \
/usr/include/string.h /usr/include/x86_64-linux-gnu/bits/string3.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file_inln.h \
/usr/include/stdlib.h /usr/include/x86_64-linux-gnu/bits/waitflags.h \
/usr/include/x86_64-linux-gnu/bits/waitstatus.h \
/usr/include/x86_64-linux-gnu/sys/types.h \
/usr/include/x86_64-linux-gnu/sys/select.h \
/usr/include/x86_64-linux-gnu/bits/select.h \
/usr/include/x86_64-linux-gnu/bits/sigset.h \
/usr/include/x86_64-linux-gnu/bits/select2.h \
/usr/include/x86_64-linux-gnu/sys/sysmacros.h /usr/include/alloca.h \
/usr/include/x86_64-linux-gnu/bits/stdlib.h memory.h error.h

View File

@ -1,8 +1,7 @@
one2many.o: one2many.cpp \
/home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi.h \
one2many.o: one2many.cpp /usr/lib/openmpi/include/mpi.h \
/usr/lib/gcc/x86_64-linux-gnu/4.6/include/stddef.h \
/home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi_portable_platform.h \
one2many.h /usr/include/c++/4.6/map /usr/include/c++/4.6/bits/stl_tree.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/mpicxx.h \
/usr/include/c++/4.6/map /usr/include/c++/4.6/bits/stl_tree.h \
/usr/include/c++/4.6/bits/stl_algobase.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/c++config.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/os_defines.h \
@ -30,4 +29,91 @@ one2many.o: one2many.cpp \
/usr/include/c++/4.6/bits/stl_map.h \
/usr/include/c++/4.6/initializer_list \
/usr/include/c++/4.6/bits/stl_multimap.h \
/usr/include/c++/4.6/bits/range_access.h memory.h
/usr/include/c++/4.6/bits/range_access.h /usr/include/c++/4.6/utility \
/usr/include/c++/4.6/bits/stl_relops.h \
/usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h /usr/include/stdio.h \
/usr/include/x86_64-linux-gnu/bits/types.h \
/usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/libio.h \
/usr/include/_G_config.h /usr/include/wchar.h \
/usr/include/x86_64-linux-gnu/bits/stdio_lim.h \
/usr/include/x86_64-linux-gnu/bits/sys_errlist.h \
/usr/include/x86_64-linux-gnu/bits/stdio.h \
/usr/include/x86_64-linux-gnu/bits/stdio2.h \
/usr/include/c++/4.6/iostream /usr/include/c++/4.6/ostream \
/usr/include/c++/4.6/ios /usr/include/c++/4.6/iosfwd \
/usr/include/c++/4.6/bits/stringfwd.h \
/usr/include/c++/4.6/bits/postypes.h /usr/include/c++/4.6/cwchar \
/usr/include/x86_64-linux-gnu/bits/wchar.h /usr/include/xlocale.h \
/usr/include/x86_64-linux-gnu/bits/wchar2.h \
/usr/include/c++/4.6/bits/char_traits.h \
/usr/include/c++/4.6/bits/localefwd.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/c++locale.h \
/usr/include/c++/4.6/clocale /usr/include/locale.h \
/usr/include/x86_64-linux-gnu/bits/locale.h /usr/include/c++/4.6/cctype \
/usr/include/ctype.h /usr/include/endian.h \
/usr/include/x86_64-linux-gnu/bits/endian.h \
/usr/include/x86_64-linux-gnu/bits/byteswap.h \
/usr/include/c++/4.6/bits/ios_base.h \
/usr/include/c++/4.6/ext/atomicity.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/gthr.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/gthr-default.h \
/usr/include/pthread.h /usr/include/sched.h /usr/include/time.h \
/usr/include/x86_64-linux-gnu/bits/sched.h \
/usr/include/x86_64-linux-gnu/bits/time.h \
/usr/include/x86_64-linux-gnu/bits/timex.h \
/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h \
/usr/include/x86_64-linux-gnu/bits/setjmp.h /usr/include/unistd.h \
/usr/include/x86_64-linux-gnu/bits/posix_opt.h \
/usr/include/x86_64-linux-gnu/bits/environments.h \
/usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/getopt.h \
/usr/include/x86_64-linux-gnu/bits/unistd.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/atomic_word.h \
/usr/include/c++/4.6/bits/locale_classes.h /usr/include/c++/4.6/string \
/usr/include/c++/4.6/bits/ostream_insert.h \
/usr/include/c++/4.6/bits/cxxabi_forced.h \
/usr/include/c++/4.6/bits/basic_string.h \
/usr/include/c++/4.6/bits/basic_string.tcc \
/usr/include/c++/4.6/bits/locale_classes.tcc \
/usr/include/c++/4.6/streambuf /usr/include/c++/4.6/bits/streambuf.tcc \
/usr/include/c++/4.6/bits/basic_ios.h \
/usr/include/c++/4.6/bits/locale_facets.h /usr/include/c++/4.6/cwctype \
/usr/include/wctype.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/ctype_base.h \
/usr/include/c++/4.6/bits/streambuf_iterator.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/ctype_inline.h \
/usr/include/c++/4.6/bits/locale_facets.tcc \
/usr/include/c++/4.6/bits/basic_ios.tcc \
/usr/include/c++/4.6/bits/ostream.tcc /usr/include/c++/4.6/istream \
/usr/include/c++/4.6/bits/istream.tcc \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/constants.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/exception.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions_inln.h \
/usr/include/string.h /usr/include/x86_64-linux-gnu/bits/string3.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file_inln.h one2many.h \
memory.h

View File

@ -1,31 +1,127 @@
send2one.o: send2one.cpp \
/home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi.h \
send2one.o: send2one.cpp /usr/lib/openmpi/include/mpi.h \
/usr/lib/gcc/x86_64-linux-gnu/4.6/include/stddef.h \
/home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi_portable_platform.h \
/usr/include/stdlib.h /usr/include/features.h \
/usr/include/x86_64-linux-gnu/bits/predefs.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/mpicxx.h \
/usr/include/c++/4.6/map /usr/include/c++/4.6/bits/stl_tree.h \
/usr/include/c++/4.6/bits/stl_algobase.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/c++config.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/os_defines.h \
/usr/include/features.h /usr/include/x86_64-linux-gnu/bits/predefs.h \
/usr/include/x86_64-linux-gnu/sys/cdefs.h \
/usr/include/x86_64-linux-gnu/bits/wordsize.h \
/usr/include/x86_64-linux-gnu/gnu/stubs.h \
/usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
/usr/include/x86_64-linux-gnu/bits/waitflags.h \
/usr/include/x86_64-linux-gnu/bits/waitstatus.h /usr/include/endian.h \
/usr/include/x86_64-linux-gnu/bits/endian.h \
/usr/include/x86_64-linux-gnu/bits/byteswap.h /usr/include/xlocale.h \
/usr/include/x86_64-linux-gnu/sys/types.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/cpu_defines.h \
/usr/include/c++/4.6/bits/functexcept.h \
/usr/include/c++/4.6/bits/exception_defines.h \
/usr/include/c++/4.6/bits/cpp_type_traits.h \
/usr/include/c++/4.6/ext/type_traits.h \
/usr/include/c++/4.6/ext/numeric_traits.h \
/usr/include/c++/4.6/bits/stl_pair.h /usr/include/c++/4.6/bits/move.h \
/usr/include/c++/4.6/bits/concept_check.h \
/usr/include/c++/4.6/bits/stl_iterator_base_types.h \
/usr/include/c++/4.6/bits/stl_iterator_base_funcs.h \
/usr/include/c++/4.6/bits/stl_iterator.h \
/usr/include/c++/4.6/debug/debug.h /usr/include/c++/4.6/bits/allocator.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/c++allocator.h \
/usr/include/c++/4.6/ext/new_allocator.h /usr/include/c++/4.6/new \
/usr/include/c++/4.6/exception /usr/include/c++/4.6/bits/stl_function.h \
/usr/include/c++/4.6/backward/binders.h \
/usr/include/c++/4.6/bits/stl_map.h \
/usr/include/c++/4.6/initializer_list \
/usr/include/c++/4.6/bits/stl_multimap.h \
/usr/include/c++/4.6/bits/range_access.h /usr/include/c++/4.6/utility \
/usr/include/c++/4.6/bits/stl_relops.h \
/usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h /usr/include/stdio.h \
/usr/include/x86_64-linux-gnu/bits/types.h \
/usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/time.h \
/usr/include/x86_64-linux-gnu/sys/select.h \
/usr/include/x86_64-linux-gnu/bits/select.h \
/usr/include/x86_64-linux-gnu/bits/sigset.h \
/usr/include/x86_64-linux-gnu/bits/time.h \
/usr/include/x86_64-linux-gnu/bits/select2.h \
/usr/include/x86_64-linux-gnu/sys/sysmacros.h \
/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h /usr/include/alloca.h \
/usr/include/x86_64-linux-gnu/bits/stdlib.h /usr/include/stdio.h \
/usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
/usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h \
/usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/libio.h \
/usr/include/_G_config.h /usr/include/wchar.h \
/usr/include/x86_64-linux-gnu/bits/stdio_lim.h \
/usr/include/x86_64-linux-gnu/bits/sys_errlist.h \
/usr/include/x86_64-linux-gnu/bits/stdio.h \
/usr/include/x86_64-linux-gnu/bits/stdio2.h send2one.h memory.h error.h
/usr/include/x86_64-linux-gnu/bits/stdio2.h \
/usr/include/c++/4.6/iostream /usr/include/c++/4.6/ostream \
/usr/include/c++/4.6/ios /usr/include/c++/4.6/iosfwd \
/usr/include/c++/4.6/bits/stringfwd.h \
/usr/include/c++/4.6/bits/postypes.h /usr/include/c++/4.6/cwchar \
/usr/include/x86_64-linux-gnu/bits/wchar.h /usr/include/xlocale.h \
/usr/include/x86_64-linux-gnu/bits/wchar2.h \
/usr/include/c++/4.6/bits/char_traits.h \
/usr/include/c++/4.6/bits/localefwd.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/c++locale.h \
/usr/include/c++/4.6/clocale /usr/include/locale.h \
/usr/include/x86_64-linux-gnu/bits/locale.h /usr/include/c++/4.6/cctype \
/usr/include/ctype.h /usr/include/endian.h \
/usr/include/x86_64-linux-gnu/bits/endian.h \
/usr/include/x86_64-linux-gnu/bits/byteswap.h \
/usr/include/c++/4.6/bits/ios_base.h \
/usr/include/c++/4.6/ext/atomicity.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/gthr.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/gthr-default.h \
/usr/include/pthread.h /usr/include/sched.h /usr/include/time.h \
/usr/include/x86_64-linux-gnu/bits/sched.h \
/usr/include/x86_64-linux-gnu/bits/time.h \
/usr/include/x86_64-linux-gnu/bits/timex.h \
/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h \
/usr/include/x86_64-linux-gnu/bits/setjmp.h /usr/include/unistd.h \
/usr/include/x86_64-linux-gnu/bits/posix_opt.h \
/usr/include/x86_64-linux-gnu/bits/environments.h \
/usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/getopt.h \
/usr/include/x86_64-linux-gnu/bits/unistd.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/atomic_word.h \
/usr/include/c++/4.6/bits/locale_classes.h /usr/include/c++/4.6/string \
/usr/include/c++/4.6/bits/ostream_insert.h \
/usr/include/c++/4.6/bits/cxxabi_forced.h \
/usr/include/c++/4.6/bits/basic_string.h \
/usr/include/c++/4.6/bits/basic_string.tcc \
/usr/include/c++/4.6/bits/locale_classes.tcc \
/usr/include/c++/4.6/streambuf /usr/include/c++/4.6/bits/streambuf.tcc \
/usr/include/c++/4.6/bits/basic_ios.h \
/usr/include/c++/4.6/bits/locale_facets.h /usr/include/c++/4.6/cwctype \
/usr/include/wctype.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/ctype_base.h \
/usr/include/c++/4.6/bits/streambuf_iterator.h \
/usr/include/c++/4.6/x86_64-linux-gnu/./bits/ctype_inline.h \
/usr/include/c++/4.6/bits/locale_facets.tcc \
/usr/include/c++/4.6/bits/basic_ios.tcc \
/usr/include/c++/4.6/bits/ostream.tcc /usr/include/c++/4.6/istream \
/usr/include/c++/4.6/bits/istream.tcc \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/constants.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/exception.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions_inln.h \
/usr/include/string.h /usr/include/x86_64-linux-gnu/bits/string3.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win_inln.h \
/usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file_inln.h \
/usr/include/stdlib.h /usr/include/x86_64-linux-gnu/bits/waitflags.h \
/usr/include/x86_64-linux-gnu/bits/waitstatus.h \
/usr/include/x86_64-linux-gnu/sys/types.h \
/usr/include/x86_64-linux-gnu/sys/select.h \
/usr/include/x86_64-linux-gnu/bits/select.h \
/usr/include/x86_64-linux-gnu/bits/sigset.h \
/usr/include/x86_64-linux-gnu/bits/select2.h \
/usr/include/x86_64-linux-gnu/sys/sysmacros.h /usr/include/alloca.h \
/usr/include/x86_64-linux-gnu/bits/stdlib.h send2one.h memory.h error.h

View File

@ -82,39 +82,28 @@ twoWayM2M::twoWayM2M
MPI_Comm_split(MPI_COMM_WORLD,liggghts,0,&comm_liggghts);
// open LIGGGHTS input script
FILE *fp=NULL;
char *liggghtsPathChar = new char[256];
int n = 0;
if (me == 0)
{
// read path from dictionary
const fileName liggghtsPath(propsDict_.lookup("liggghtsPath"));
char * liggghtsPathChar = (char*)liggghtsPath.c_str();
strcpy(liggghtsPathChar, liggghtsPath.c_str());
n = strlen(liggghtsPathChar) + 1;
Info<<"Executing input script '"<< liggghtsPath.c_str() <<"'"<<endl;
fp = fopen(liggghtsPathChar,"r");
if (fp == NULL) {
printf("ERROR: Could not open LIGGGHTS input script\n");
MPI_Abort(MPI_COMM_WORLD,1);
}
}
if (liggghts == 1) lmp = new LAMMPS_NS::LAMMPS(0,NULL,comm_liggghts);
int n;
char line[1024];
while (1) {
if (me == 0) {
if (fgets(line,1024,fp) == NULL) n = 0;
else n = strlen(line) + 1;
if (n == 0) fclose(fp);
}
MPI_Bcast(&n,1,MPI_INT,0,MPI_COMM_WORLD);
if (n == 0) break;
MPI_Bcast(line,n,MPI_CHAR,0,MPI_COMM_WORLD);
if (liggghts == 1) lmp->input->one(line);
if (n > 0) {
MPI_Bcast(liggghtsPathChar,n,MPI_CHAR,0,MPI_COMM_WORLD);
if (liggghts == 1) lmp->input->file(liggghtsPathChar);
}
delete [] liggghtsPathChar;
// get DEM time step size
DEMts_ = lmp->update->dt;
checkTSsize();

View File

@ -81,39 +81,28 @@ twoWayMPI::twoWayMPI
MPI_Comm_split(MPI_COMM_WORLD,liggghts,0,&comm_liggghts);
// open LIGGGHTS input script
FILE *fp=NULL;
char *liggghtsPathChar = new char[256];
int n = 0;
if (me == 0)
{
// read path from dictionary
const fileName liggghtsPath(propsDict_.lookup("liggghtsPath"));
char * liggghtsPathChar = (char*)liggghtsPath.c_str();
strcpy(liggghtsPathChar, liggghtsPath.c_str());
n = strlen(liggghtsPathChar) + 1;
Info<<"Executing input script '"<< liggghtsPath.c_str() <<"'"<<endl;
fp = fopen(liggghtsPathChar,"r");
if (fp == NULL) {
printf("ERROR: Could not open LIGGGHTS input script\n");
MPI_Abort(MPI_COMM_WORLD,1);
}
}
if (liggghts == 1) lmp = new LAMMPS_NS::LAMMPS(0,NULL,comm_liggghts);
int n;
char line[1024];
while (1) {
if (me == 0) {
if (fgets(line,1024,fp) == NULL) n = 0;
else n = strlen(line) + 1;
if (n == 0) fclose(fp);
}
MPI_Bcast(&n,1,MPI_INT,0,MPI_COMM_WORLD);
if (n == 0) break;
MPI_Bcast(line,n,MPI_CHAR,0,MPI_COMM_WORLD);
if (liggghts == 1) lmp->input->one(line);
if (n > 0) {
MPI_Bcast(liggghtsPathChar,n,MPI_CHAR,0,MPI_COMM_WORLD);
if (liggghts == 1) lmp->input->file(liggghtsPathChar);
}
delete [] liggghtsPathChar;
// get DEM time step size
DEMts_ = lmp->update->dt;
checkTSsize();

View File

@ -101,7 +101,6 @@ DiFeliceDrag::DiFeliceDrag
if(!interpolation_)
Info << "WARNING: will only consider fluctuating particle velocity in implicit / explicit force split!" << endl;
}
particleCloud_.checkCG(true);
if (propsDict_.found("scale"))
scaleDia_=scalar(readScalar(propsDict_.lookup("scale")));
@ -220,7 +219,6 @@ void DiFeliceDrag::setForce() const
UsFluct = Us - UsField_[cellI];
dragExplicit = dragCoefficient*(UfluidFluct - UsFluct); //explicit part of force
}
}
if(verbose_ && index >-1 && index <102)

View File

@ -209,7 +209,7 @@ void KochHillDrag::setForce() const
// calc model coefficient F3
scalar F3 = 0.0673+0.212*volumefraction+0.0232/pow(voidfraction,5);
//Calculate F in the formulation of van der Hoef et al. (JFM 528:233-254)
//Calculate F
scalar F = voidfraction * (F0 + 0.5*F3*Rep);
// calc drag model coefficient betaP

View File

@ -72,6 +72,9 @@ DiFeliceDragMS::DiFeliceDragMS
voidfractionFieldName_(propsDict_.lookup("voidfractionFieldName")),
voidfraction_(sm.mesh().lookupObject<volScalarField> (voidfractionFieldName_)),
interpolation_(false),
splitImplicitExplicit_(false),
UsFieldName_(propsDict_.lookup("granVelFieldName")),
UsField_(sm.mesh().lookupObject<volVectorField> (UsFieldName_)),
//sphereToClump_(readScalar(propsDict_.lookup("sphereToClump")))
dH_(readScalar(propsDict_.lookup("hydraulicDiameter")))
{
@ -91,6 +94,13 @@ DiFeliceDragMS::DiFeliceDragMS
Info << "using interpolated value of U." << endl;
interpolation_=true;
}
if (propsDict_.found("splitImplicitExplicit"))
{
Info << "will split implicit / explicit force contributions." << endl;
splitImplicitExplicit_ = true;
if(!interpolation_)
Info << "WARNING: will only consider fluctuating particle velocity in implicit / explicit force split!" << endl;
}
particleCloud_.checkCG(false);
}
@ -126,8 +136,13 @@ void DiFeliceDragMS::setForce() const
scalar Rep(0);
scalar Cd(0);
interpolationCellPoint<scalar> voidfractionInterpolator(voidfraction_);
interpolationCellPoint<vector> UInterpolator(U_);
vector UfluidFluct(0,0,0);
vector UsFluct(0,0,0);
vector dragExplicit(0,0,0);
scalar dragCoefficient(0);
interpolationCellPoint<scalar> voidfractionInterpolator_(voidfraction_);
interpolationCellPoint<vector> UInterpolator_(U_);
#include "setupProbeModel.H"
@ -136,6 +151,7 @@ void DiFeliceDragMS::setForce() const
//if(mask[index][0]) // would have to be transformed from body ID to particle ID
//{
cellI = cloudRefMS().cellIDCM(index);
drag = vector(0,0,0);
@ -144,38 +160,31 @@ void DiFeliceDragMS::setForce() const
if(interpolation_)
{
position = cloudRefMS().positionCM(index);
Ufluid = UInterpolator.interpolate(position,cellI);
voidfraction = voidfractionInterpolator.interpolate(position,cellI);
voidfraction = voidfractionInterpolator_.interpolate(position,cellI);
Ufluid = UInterpolator_.interpolate(position,cellI);
}else
{
voidfraction = voidfraction_[cellI];
Ufluid = U_[cellI];
voidfraction = voidfraction_[cellI]; //particleCloud_.voidfraction(index); ???//
}
Us = cloudRefMS().velocityCM(index);
Ur = Ufluid-Us;
//ds = 2*cloudRefMS().radius(index)/sphereToClump_; // scale from particle diameter
//ds = cloudRefMS().dHCM()[index][0]; // use diameter stored in cloud - works as soon as vol is transferred
ds = dH_; // use dict defined diameter
nuf = nufField[cellI];
rho = rho_[cellI];
magUr = mag(Ur);
Rep = 0;
Cd = 0;
scalar phi(0);
scalar phiN(0);
dragCoefficient = 0;
if (magUr > 0)
{
// calc particle Re Nr
Rep = ds*voidfraction*magUr/(nuf+SMALL);
// calc fluid drag Coeff
// phi=1; //AsurfAequi/Asurf;
// phiN=1; //AcrosssecAequi/Acrosssec;
// paper uses different Re definition!?
// Cd=8/(Rep*sqrt(phiN))+16/(Rep*sqrt(phi))+3/(sqrt(Rep)*pow(phi,0.75))+0.42*pow(10,(-0.4*pow(log(phi),0.2)))/phiN;
// calc fluid drag Coeff
Cd = sqr(0.63 + 4.8/sqrt(Rep));
@ -183,29 +192,66 @@ void DiFeliceDragMS::setForce() const
scalar Xi = 3.7 - 0.65 * exp(-sqr(1.5-log10(Rep))/2);
// calc particle's drag
drag = 0.125*Cd*rho*M_PI*ds*ds*pow(voidfraction,(2-Xi))*magUr*Ur;
dragCoefficient = 0.125*Cd*rho
*M_PI
*ds*ds
*pow(voidfraction,(2-Xi))*magUr;
if (modelType_=="B")
drag /= voidfraction;
dragCoefficient /= voidfraction;
drag = dragCoefficient*Ur; //total drag force!
//Split forces
if(splitImplicitExplicit_)
{
UfluidFluct = Ufluid - U_[cellI];
UsFluct = Us - UsField_[cellI];
dragExplicit = dragCoefficient*(UfluidFluct - UsFluct); //explicit part of force
}
}
if(verbose_ && index >=0 && index <10)
{
Info << "index = " << index << endl;
Info << "Us = " << Us << endl;
Info << "Ur = " << Ur << endl;
Info << "ds = " << ds << endl;
Info << "rho = " << rho << endl;
Info << "nuf = " << nuf << endl;
Info << "voidfraction = " << voidfraction << endl;
Info << "Rep = " << Rep << endl;
Info << "Cd = " << Cd << endl;
Info << "drag = " << drag << endl;
Pout << "index = " << index << endl;
Pout << "Us = " << Us << endl;
Pout << "Ur = " << Ur << endl;
Pout << "ds = " << ds << endl;
Pout << "rho = " << rho << endl;
Pout << "nuf = " << nuf << endl;
Pout << "voidfraction = " << voidfraction << endl;
Pout << "Rep = " << Rep << endl;
Pout << "Cd = " << Cd << endl;
Pout << "drag (total) = " << drag << endl;
if(splitImplicitExplicit_)
{
Pout << "UfluidFluct = " << UfluidFluct << endl;
Pout << "UsFluct = " << UsFluct << endl;
Pout << "dragExplicit = " << dragExplicit << endl;
}
}
//Set value fields and write the probe
if(probeIt_)
{
#include "setupProbeModelfields.H"
vValues.append(drag); //first entry must the be the force
vValues.append(Ur);
sValues.append(Rep);
sValues.append(Cd);
sValues.append(voidfraction);
particleCloud_.probeM().writeProbe(index, sValues, vValues);
}
}
// set force on bodies
if(treatExplicit_) for(int j=0;j<3;j++) cloudRefMS().expForcesCM()[index][j] += drag[j];
else for(int j=0;j<3;j++) cloudRefMS().impForcesCM()[index][j] += drag[j];
else //implicit treatment, taking explicit force contribution into account
{
for(int j=0;j<3;j++)
{
cloudRefMS().impForcesCM()[index][j] += drag[j];
cloudRefMS().expForcesCM()[index][j] += dragExplicit[j];
}
}
for(int j=0;j<3;j++) cloudRefMS().DEMForcesCM()[index][j] += drag[j];
//}
}

View File

@ -28,6 +28,8 @@ 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).
Di Felice drag law (Zhou et al. (2010), JFM)
Class
DiFeliceDragMS
@ -75,7 +77,12 @@ private:
bool interpolation_; // use interpolated U field values
//scalar sphereToClump_; // ratio of sphere radius to clump radius
bool splitImplicitExplicit_; // use splitting of implicit and explict force contribution
word UsFieldName_;
const volVectorField& UsField_; // the average particle velocity field (for implicit/expliti force split)
scalar dH_; // hydraulic diameter

View File

@ -78,7 +78,7 @@ void forceModelMS::setForcesOnParticle() const
{
ind=cloudRefMS().body(index);
if (ind <= 0)
if (ind < 0)
{
Warning <<"clump was deleted??? ind = "<< ind << endl;
}

View File

@ -1,229 +0,0 @@
/*---------------------------------------------------------------------------*\
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(R). Note: this code is not part of OpenFOAM(R) (see DISCLAIMER).
\*---------------------------------------------------------------------------*/
#include "error.H"
#include "dividedVoidFractionMS.H"
#include "addToRunTimeSelectionTable.H"
#include "locateModel.H"
#include "dataExchangeModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(dividedVoidFractionMS, 0);
addToRunTimeSelectionTable
(
voidFractionModel,
dividedVoidFractionMS,
dictionary
);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components
dividedVoidFractionMS::dividedVoidFractionMS
(
const dictionary& dict,
cfdemCloud& sm
)
:
voidFractionModel(dict,sm),
propsDict_(dict.subDict(typeName + "Props")),
verbose_(false),
alphaMin_(readScalar(propsDict_.lookup("alphaMin"))),
alphaLimited_(0),
tooMuch_(0.0),
clumpVol_(readScalar(propsDict_.lookup("clumpVol"))),
nrigid_(readScalar(propsDict_.lookup("nrigid")))
{
maxCellsPerParticle_ = 29;
if(alphaMin_ > 1 || alphaMin_ < 0.01){ FatalError<< "alphaMin shloud be > 1 and < 0.01 !!!" << abort(FatalError); }
checkWeightNporosity(propsDict_);
if(porosity()!=1) FatalError << "porosity not used in dividedVoidFractionMS" << abort(FatalError);
if (propsDict_.found("verbose")) verbose_=true;
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
dividedVoidFractionMS::~dividedVoidFractionMS()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void dividedVoidFractionMS::setvoidFraction(double** const& mask,double**& voidfractions,double**& particleWeights,double**& particleVolumes) const
{
reAllocArrays();
scalar pi = M_PI;
vector position(0,0,0);
label cellID=-1;
scalar radius(-1);
scalar volume(0);
scalar cellVol(0);
scalar scaleVol= weight();
for(int index=0; index< particleCloud_.numberOfParticles(); index++)
{
//if(mask[index][0])
//{
// reset
for(int subcell=0;subcell<cellsPerParticle_[index][0];subcell++){
particleWeights[index][subcell]=0;
particleVolumes[index][subcell]=0;
}
cellsPerParticle_[index][0]=1;
position = particleCloud_.position(index);
cellID = particleCloud_.cellIDs()[index][0];
radius = particleCloud_.radii()[index][0];
volume = clumpVol_/nrigid_*scaleVol;
cellVol=0;
//--variables for sub-search
int nPoints = 29;
int nNotFound=0,nUnEqual=0,nTotal=0;
vector offset(0,0,0);
int cellsSet = 0;
if (cellID >= 0) // particel centre is in domain
{
cellVol = particleCloud_.mesh().V()[cellID];
// for 2 different radii
for(scalar r = 0.623926*radius;r < radius;r+=0.293976*radius)
{
// try 8 subpoint derived from spherical coordinates
for (scalar zeta=pi/4.;zeta<(2.*pi);zeta+=(pi/2.))
{
for (scalar theta=(pi/4.);theta<pi;theta+=(pi/2.))
{
offset[0]=double(r)*Foam::sin(theta)*Foam::cos(zeta);
offset[1]=double(r)*Foam::sin(theta)*Foam::sin(zeta);
offset[2]=double(r)*Foam::cos(theta);
#include "../dividedVoidFraction/setWeightedSource.H" // set source terms at position+offset
}
}
// try 2 more subpoints for each coordinate direction (6 total)
for (int j=-1;j<=1;j+=2)
{
offset[0]=double(r)*(double(j));
offset[1]=double(0.);offset[2]=double(0.);
#include "../dividedVoidFraction/setWeightedSource.H" //NP set source terms at position+offset
offset[1]=double(r)*(double(j));
offset[0]=double(0.);offset[2]=double(0.);
#include "../dividedVoidFraction/setWeightedSource.H" //NP set source terms at position+offset
offset[2]=double(r)*(double(j));
offset[0]=double(0.);offset[1]=double(0.);
#include "../dividedVoidFraction/setWeightedSource.H" //NP set source terms at position+offset
}
}// end loop radiivoidfractions
if(cellsSet>29 || cellsSet<0)
{
Info << "ERROR cellsSet =" << cellsSet << endl;
}
// set source for particle center; source 1/nPts+weight of all subpoints that have not been found
scalar centreWeight = 1./nPoints*(nPoints-cellsSet);
// update voidfraction for each particle read
scalar newAlpha = voidfractionNext_[cellID]- volume*centreWeight/cellVol;
if(newAlpha > alphaMin_) voidfractionNext_[cellID] = newAlpha;
else
{
voidfractionNext_[cellID] = alphaMin_;
tooMuch_ += (alphaMin_-newAlpha) * cellVol;
}
// store cellweight for each particle --- this should be done for subpoints as well!!
particleWeights[index][0] += centreWeight;
// store particleVolume for each particle
particleVolumes[index][0] += volume*centreWeight;
/*//OUTPUT
if (index==0 && verbose_)
{
Info << "centre cellID = " << cellID << endl;
Info << "cellsPerParticle_=" << cellsPerParticle_[index][0] << endl;
for(int i=0;i<cellsPerParticle_[index][0];i++)
{
if(i==0)Info << "cellids, voidfractions, particleWeights, : \n";
Info << particleCloud_.cellIDs()[index][i] << " ," << endl;
Info << voidfractions[index][i] << " ," << endl;
Info << particleWeights[index][i] << " ," << endl;
}
}*/
}// end if in cell
//}// end if in mask
}// end loop all particles
// reset counter of lost volume
if (verbose_) Pout << "Total particle volume neglected: " << tooMuch_<< endl;
tooMuch_ = 0.;
// bring voidfraction from Eulerian Field to particle array
for(int index=0; index< particleCloud_.numberOfParticles(); index++)
{
for(int subcell=0;subcell<cellsPerParticle_[index][0];subcell++)
{
label cellID = particleCloud_.cellIDs()[index][subcell];
if(cellID >= 0)
{
voidfractions[index][subcell] = voidfractionNext_[cellID];
}
else
{
voidfractions[index][subcell] = -1.;
}
}
}
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* //

View File

@ -1,106 +0,0 @@
/*---------------------------------------------------------------------------*\
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(R). Note: this code is not part of OpenFOAM(R) (see DISCLAIMER).
Class
dividedVoidFractionMS
SourceFiles
dividedVoidFractionMS.C
\*---------------------------------------------------------------------------*/
#ifndef dividedVoidFractionMS_H
#define dividedVoidFractionMS_H
#include "voidFractionModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
/*---------------------------------------------------------------------------*\
Class noDrag Declaration
\*---------------------------------------------------------------------------*/
class dividedVoidFractionMS
:
public voidFractionModel
{
private:
dictionary propsDict_;
bool verbose_;
const scalar alphaMin_; //NP min value of voidFraction
mutable bool alphaLimited_;
mutable scalar tooMuch_; //NP particle volume which is lost due to voidFraction limitation
const scalar clumpVol_;
const int nrigid_;
public:
//- Runtime type information
TypeName("dividedMS");
// Constructors
//- Construct from components
dividedVoidFractionMS
(
const dictionary& dict,
cfdemCloud& sm
);
// Destructor
~dividedVoidFractionMS();
// Member Functions
void setvoidFraction(double** const& ,double**&, double**&, double**&) const;
};
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
// ************************************************************************* //

View File

View File

View File

@ -19,65 +19,71 @@ solvers
{
p
{
solver PCG;
preconditioner DIC;
solver GAMG;
tolerance 1e-06;
relTol 0.1;
relTol 0.01;
smoother GaussSeidel;
cacheAgglomeration true;
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
mergeLevels 1;
}
pFinal
{
solver GAMG;
tolerance 1e-06;
relTol 0;
smoother GaussSeidel;
cacheAgglomeration true;
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
mergeLevels 1;
}
"(U|k|epsilon)"
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0.1;
}
"(U|k|epsilon)Final"
{
$U;
tolerance 1e-05;
relTol 0;
}
"(voidfraction|Ksl|f|Us)"
{
solver PCG;
preconditioner DIC;
tolerance 1e-06;
relTol 0;
}
U
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0;
}
k
PIMPLE
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0;
nOuterCorrectors 2;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
pRefCell 0;
pRefValue 0;
}
epsilon
relaxationFactors
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0;
}
R
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0;
}
nuTilda
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0;
}
"U.*" 1;
"k.*" 1;
"epsilon.*" 1;
}
PISO
{
nCorrectors 4;
nNonOrthogonalCorrectors 1;
nNonOrthogonalCorrectors 0;
pRefCell 0;
pRefValue 0;
}

View File

@ -1,143 +0,0 @@
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile

View File

@ -18,7 +18,7 @@ casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")"
logpath=$casePath
headerText="run_parallel_cfdemSolverPisoMS_ErgunTestMPI_CFDDEM"
logfileName="log_$headerText"
solverName="cfdemSolverPisoMS"
solverName="cfdemSolverPimpleDyMMS_22x" #"cfdemSolverPisoMS"
nrProcs="2"
machineFileName="none" # yourMachinefileName | none
debugMode="off" # on | off
@ -53,17 +53,13 @@ cp cfdemSolverPisoMS_ErgunTestMPI.eps $testHarnessPath
if [ $cleanUp == "true" ]
then
#- clean up case
cd ..
rm -rf 0.*
rm -rf processor*
rm -rf particles
rm -rf patchAverage_pressureDrop
rm -rf probes
rm -rf postProcessing
rm log.liggghts
rm ../DEM/post/dump.*
echo "deleting data at: $casePath :\n"
source $WM_PROJECT_DIR/bin/tools/CleanFunctions
cd $casePath/CFD
cleanCase
rm -r $casePath/CFD/clockData
rm -r $casePath/DEM/post/*
(cd $casePath/DEM/post && touch dummy)
echo "done"
fi
#- preserve post directory
echo "dummyfile" >> $casePath/DEM/post/dummy