diff --git a/README b/README deleted file mode 100755 index fd2ca756..00000000 --- a/README +++ /dev/null @@ -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. -\*---------------------------------------------------------------------------*/ diff --git a/applications/solvers/cfdemSolverPimple/Make/files b/applications/solvers/cfdemSolverPimple/Make/files deleted file mode 100644 index 05f55102..00000000 --- a/applications/solvers/cfdemSolverPimple/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -cfdemSolverPimple.C - -EXE = $(CFDEM_APP_DIR)/cfdemSolverPimple diff --git a/applications/solvers/cfdemSolverPimple/Make/options b/applications/solvers/cfdemSolverPimple/Make/options deleted file mode 100644 index cad91954..00000000 --- a/applications/solvers/cfdemSolverPimple/Make/options +++ /dev/null @@ -1,21 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/fvOptions/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ - -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude \ - -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/cfdTools \ - -EXE_LIBS = \ - -L$(FOAM_USER_LIBBIN)\ - -lincompressibleRASModels \ - -lincompressibleLESModels \ - -lincompressibleTransportModels \ - -lfiniteVolume \ - -lmeshTools \ - -lfvOptions \ - -lsampling \ - -l$(CFDEM_LIB_NAME) diff --git a/applications/solvers/cfdemSolverPimple/UEqn.H b/applications/solvers/cfdemSolverPimple/UEqn.H deleted file mode 100644 index 931745d9..00000000 --- a/applications/solvers/cfdemSolverPimple/UEqn.H +++ /dev/null @@ -1,32 +0,0 @@ -// Solve the Momentum equation - -tmp UEqn -( - fvm::ddt(voidfraction,U) - + fvm::div(phi, U) - + particleCloud.divVoidfractionTau(U, voidfraction) - == - - fvm::Sp(Ksl/rho,U) - #if defined(version22) - + fvOptions(U) // test phase - #endif -); - -UEqn().relax(); -#if defined(version22) -fvOptions.constrain(UEqn()); -#endif -//sources.constrain(UEqn()); - -if (pimple.momentumPredictor()) -{ - //solve(UEqn() == -fvc::grad(p) + sources(U)); - if (modelType=="B") - solve(UEqn() == - fvc::grad(p) + Ksl/rho*Us); - else - solve(UEqn() == - voidfraction*fvc::grad(p) + Ksl/rho*Us); - - #if defined(version22) - fvOptions.correct(U); // test phase - #endif -} diff --git a/applications/solvers/cfdemSolverPimple/cfdemSolverPimple.C b/applications/solvers/cfdemSolverPimple/cfdemSolverPimple.C deleted file mode 100644 index ac401f5b..00000000 --- a/applications/solvers/cfdemSolverPimple/cfdemSolverPimple.C +++ /dev/null @@ -1,126 +0,0 @@ -/*---------------------------------------------------------------------------*\ - CFDEMcoupling - Open Source CFD-DEM coupling - - CFDEMcoupling is part of the CFDEMproject - www.cfdem.com - Christoph Goniva, christoph.goniva@cfdem.com - Copyright (C) 2011 OpenFOAM Foundation - Copyright (C) 2009-2012 JKU, Linz - Copyright (C) 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, see . - -Application - cfdemSolverPimple - -Description - Large time-step transient solver for incompressible, flow using the PIMPLE - (merged PISO-SIMPLE) algorithm. Turbulence modelling is generic, - i.e. laminar, RAS or LES may be selected. - The code is an evolution of the solver pimpleFoam in OpenFOAM(R) 2.1.x., - where additional functionality for CFD-DEM coupling is added. -\*---------------------------------------------------------------------------*/ - -#include "fvCFD.H" -#include "singlePhaseTransportModel.H" -#include "turbulenceModel.H" -#include "pimpleControl.H" -//#include "IObasicSourceList.H" - -#include "cfdemCloud.H" -#include "implicitCouple.H" -#include "smoothingModel.H" - -#if defined(version22) -#include "fvIOoptionList.H" -#endif -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -int main(int argc, char *argv[]) -{ - #include "setRootCase.H" - #include "createTime.H" - #include "createMesh.H" - #include "createFields.H" - #include "initContinuityErrs.H" - - #if defined(version22) - #include "createFvOptions.H" - #endif - - pimpleControl pimple(mesh); - - // create cfdemCloud - #include "readGravitationalAcceleration.H" - cfdemCloud particleCloud(mesh); - #include "checkModelType.H" - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - Info<< "\nStarting time loop\n" << endl; - - while (runTime.run()) - { - #include "readTimeControls.H" - #include "CourantNo.H" - #include "setDeltaT.H" - - runTime++; - - Info<< "Time = " << runTime.timeName() << nl << endl; - - // do particle stuff - Info << "- evolve()" << endl; - particleCloud.evolve(voidfraction,Us,U); - voidfraction.oldTime().internalField() = voidfraction; - - Info << "update Ksl.internalField()" << endl; - Ksl.oldTime().internalField() = particleCloud.momCoupleM(0).impMomSource(); - particleCloud.smoothingM().smoothen(Ksl); - Ksl.correctBoundaryConditions(); - - // --- Pressure-velocity PIMPLE corrector loop - while (pimple.loop()) - { - #include "UEqn.H" - - // --- Pressure corrector loop - while (pimple.correct()) - { - #include "pEqn.H" - } - - if (pimple.turbCorr()) - { - turbulence->correct(); - } - } - - runTime.write(); - - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; - } - - Info<< "End\n" << endl; - - return 0; -} - - -// ************************************************************************* // diff --git a/applications/solvers/cfdemSolverPimple/createFields.H b/applications/solvers/cfdemSolverPimple/createFields.H deleted file mode 100644 index 79484431..00000000 --- a/applications/solvers/cfdemSolverPimple/createFields.H +++ /dev/null @@ -1,109 +0,0 @@ -Info<< "Reading field p\n" << endl; -volScalarField p -( - IOobject - ( - "p", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh -); - -Info<< "Reading field U\n" << endl; -volVectorField U -( - IOobject - ( - "U", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh -); - -//=============================== -// particle interaction modelling -//=============================== - - Info<< "\nReading momentum exchange field Ksl\n" << endl; - volScalarField Ksl - ( - IOobject - ( - "Ksl", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - //dimensionedScalar("0", dimensionSet(1, -3, -1, 0, 0), 1.0) - ); - - Info<< "\nReading voidfraction field voidfraction = (Vgas/Vparticle)\n" << endl; - volScalarField voidfraction - ( - IOobject - ( - "voidfraction", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ); - - Info<< "\nCreating dummy density field rho\n" << endl; - volScalarField rho - ( - IOobject - ( - "rho", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh//, - //dimensionedScalar("0", dimensionSet(1, -3, 0, 0, 0), 1.0) - ); - - Info<< "Reading particle velocity field Us\n" << endl; - volVectorField Us - ( - IOobject - ( - "Us", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ); - -//=============================== - -#include "createPhi.H" - - -label pRefCell = 0; -scalar pRefValue = 0.0; -setRefCell(p, mesh.solutionDict().subDict("PIMPLE"), pRefCell, pRefValue); - - -singlePhaseTransportModel laminarTransport(U, phi); - -autoPtr turbulence -( - incompressible::turbulenceModel::New(U, phi, laminarTransport) -); - - -//IObasicSourceList sources(mesh); diff --git a/applications/solvers/cfdemSolverPimple/pEqn.H b/applications/solvers/cfdemSolverPimple/pEqn.H deleted file mode 100644 index 74cf42e4..00000000 --- a/applications/solvers/cfdemSolverPimple/pEqn.H +++ /dev/null @@ -1,57 +0,0 @@ -volScalarField rAU(1.0/UEqn().A()); -surfaceScalarField rUAf("(1|A(U))", fvc::interpolate(rAU)); - -//U = rAU*(UEqn() == sources(U))().H(); // new formulation -U = rAU*UEqn().H(); // old - -if (pimple.nCorrPISO() <= 1) -{ - UEqn.clear(); -} - -phi = (fvc::interpolate(U*voidfraction) & mesh.Sf()) - + fvc::ddtPhiCorr(rAU, U, phi); - -//adjustPhi(phi, U, p);//?? - -surfaceScalarField phiS(fvc::interpolate(Us*voidfraction) & mesh.Sf()); -surfaceScalarField phiGes = phi + rUAf*(fvc::interpolate(Ksl/rho) * phiS); - -volScalarField rUAvoidfraction("(voidfraction2|A(U))",rAU*voidfraction); -if (modelType=="A") - rUAvoidfraction = volScalarField("(voidfraction2|A(U))",rAU*voidfraction*voidfraction); - -// Non-orthogonal pressure corrector loop -while (pimple.correctNonOrthogonal()) -{ - // Pressure corrector - fvScalarMatrix pEqn - ( - fvm::laplacian(rUAvoidfraction, p) == fvc::div(phiGes) //+ particleCloud.ddtVoidfraction() - ); - - pEqn.setReference(pRefCell, pRefValue); - - pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter()))); - - if (pimple.finalNonOrthogonalIter()) - { - phiGes -= pEqn.flux(); - } -} - -#include "continuityErrs.H" - -// Explicitly relax pressure for momentum corrector -p.relax(); - -if (modelType=="B") - U -= rAU*fvc::grad(p) - Ksl/rho*Us*rAU; -else - U -= voidfraction*rAU*fvc::grad(p) - Ksl/rho*Us*rAU; - -U.correctBoundaryConditions(); -#if defined(version22) -fvOptions.correct(U); // test phase -#endif -//sources.correct(U); diff --git a/doc/CFDEMcoupling_Manual.pdf b/doc/CFDEMcoupling_Manual.pdf index 3e18714a..2c69e8e2 100644 Binary files a/doc/CFDEMcoupling_Manual.pdf and b/doc/CFDEMcoupling_Manual.pdf differ diff --git a/doc/githubAccess_public.pdf b/doc/githubAccess_public.pdf index dd5e1fbf..8de2281b 100644 Binary files a/doc/githubAccess_public.pdf and b/doc/githubAccess_public.pdf differ diff --git a/src/lagrangian/cfdemParticle/Make/files b/src/lagrangian/cfdemParticle/Make/files index 92a7d09f..c761a20d 100644 --- a/src/lagrangian/cfdemParticle/Make/files +++ b/src/lagrangian/cfdemParticle/Make/files @@ -6,7 +6,6 @@ voidFractionModels = subModels/voidFractionModel locateModels = subModels/locateModel meshMotionModels = subModels/meshMotionModel momCoupleModels = subModels/momCoupleModel -regionModels = subModels/regionModel dataExchangeModels = subModels/dataExchangeModel averagingModels = subModels/averagingModel clockModels = subModels/clockModel @@ -15,6 +14,7 @@ smoothingModels = subModels/smoothingModel probeModels = subModels/probeModel $(cfdemCloud)/cfdemCloud.C +derived/cfdemCloudBiDisperse/cfdemCloudBiDisperse.C derived/cfdemCloudIB/cfdemCloudIB.C derived/cfdemCloudMS/cfdemCloudMS.C @@ -23,31 +23,50 @@ $(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)/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)/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 @@ -60,34 +79,36 @@ $(voidFractionModels)/voidFractionModel/voidFractionModel.C $(voidFractionModels)/voidFractionModel/newVoidFractionModel.C $(voidFractionModels)/centreVoidFraction/centreVoidFraction.C $(voidFractionModels)/dividedVoidFraction/dividedVoidFraction.C +$(voidFractionModels)/dividedVoidFractionBiDi/dividedVoidFractionBiDi.C $(voidFractionModels)/dividedVoidFractionMS/dividedVoidFractionMS.C $(voidFractionModels)/bigParticleVoidFraction/bigParticleVoidFraction.C $(voidFractionModels)/GaussVoidFraction/GaussVoidFraction.C $(voidFractionModels)/IBVoidFraction/IBVoidFraction.C +$(voidFractionModels)/weightedNeigbhorsVoidFraction/weightedNeigbhorsVoidFraction.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 +116,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 @@ -117,5 +140,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) diff --git a/src/lagrangian/cfdemParticle/Make/options b/src/lagrangian/cfdemParticle/Make/options index 29b3e02c..9edf0895 100644 --- a/src/lagrangian/cfdemParticle/Make/options +++ b/src/lagrangian/cfdemParticle/Make/options @@ -28,4 +28,8 @@ LIB_LIBS = \ -L$(CFDEM_LIGGGHTS_SRC_DIR) \ -l$(CFDEM_LIGGGHTS_LIB_NAME) \ -L$(CFDEM_M2MLIB_PATH) \ - -lcouple + -lcouple \ + +/* add -I$(CFDEM_POEMSLIB_PATH) \ to EXE_INC */ +/* -L$(CFDEM_POEMSLIB_PATH) \ */ +/* -lpoems */ diff --git a/src/lagrangian/cfdemParticle/etc/compileM2Mlib.sh b/src/lagrangian/cfdemParticle/etc/compileM2Mlib.sh deleted file mode 100755 index c5875e30..00000000 --- a/src/lagrangian/cfdemParticle/etc/compileM2Mlib.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -#===================================================================# -# compile routine for LAMMPS m2m library -# Christoph Goniva - Oct. 2012, DCS Computing GmbH -#=================================================================== - -#- include functions -source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh - -NOW="$(date +"%Y-%m-%d-%H:%M")" -logDir="log" - -cd $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc -mkdir -p $logDir - -#--------------------------------------------------------------------------------# -#- define variables -logpath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")/$logDir" -logfileName="log_compileM2Mlib" -headerText="$logfileName""-$NOW" -makeFileName="Makefile.$CFDEM_LIGGGHTS_MAKEFILE_NAME" -libraryPath="$CFDEM_M2MLIB_PATH" -#--------------------------------------------------------------------------------# - -compileLMPlib $logpath $logfileName $headerText $makeFileName $libraryPath diff --git a/src/lagrangian/cfdemParticle/etc/library-liggghts-list.txt b/src/lagrangian/cfdemParticle/etc/library-liggghts-list.txt deleted file mode 100644 index 90e6eb87..00000000 --- a/src/lagrangian/cfdemParticle/etc/library-liggghts-list.txt +++ /dev/null @@ -1,4 +0,0 @@ -#syntax: makefileName/dir -#note: dir is not a path, just a keyword here -############################################### -M2M/dir diff --git a/src/lagrangian/cfdemParticle/etc/library-list.txt b/src/lagrangian/cfdemParticle/etc/library-list.txt index 27e798d4..e34c2541 100644 --- a/src/lagrangian/cfdemParticle/etc/library-list.txt +++ b/src/lagrangian/cfdemParticle/etc/library-list.txt @@ -1 +1,11 @@ lagrangian/cfdemParticle/dir + +#=====================================================' +#- RADL +fvOptions/dir +cylPorousMedia/dir + +#=====================================================' +#- other +finiteVolume/dir + diff --git a/src/lagrangian/cfdemParticle/etc/solver-list.txt b/src/lagrangian/cfdemParticle/etc/solver-list.txt index 803579e7..747bae25 100644 --- a/src/lagrangian/cfdemParticle/etc/solver-list.txt +++ b/src/lagrangian/cfdemParticle/etc/solver-list.txt @@ -1,5 +1,14 @@ -cfdemSolverPimple/dir -cfdemSolverPisoMS/dir cfdemSolverPiso/dir cfdemSolverIB/dir cfdemSolverPisoScalar/dir +cfdemSolverPimpleImEx/dir +cfdemSolverIBInterLubrication/dir +cfdemSolverIBScalar/dir +cfdemSolverInterDyM/dir +cfdemSolverInterDyMPC/dir +cfdemSolverBubble/dir +cfdemSolverPisoMS/dir +cfdemSolverPimpleDyM/dir +cfdemSolverPimpleDyM_22x/dir +cfdemSolverPimpleDyMMS_22x/dir +cfdemSolverPimpleDyMScalar_22x/dir diff --git a/src/lagrangian/cfdemParticle/etc/tutorial-list.txt b/src/lagrangian/cfdemParticle/etc/tutorial-list.txt index c8f69535..08ee103d 100644 --- a/src/lagrangian/cfdemParticle/etc/tutorial-list.txt +++ b/src/lagrangian/cfdemParticle/etc/tutorial-list.txt @@ -7,23 +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 -cfdemSolverPiso/ErgunTestCG/dir - -cfdemSolverPimple/ErgunTestMPI/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 diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/Allrun.sh b/tutorials/cfdemSolverPimple/ErgunTestMPI/Allrun.sh deleted file mode 100755 index c89f6818..00000000 --- a/tutorials/cfdemSolverPimple/ErgunTestMPI/Allrun.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/bash - -#===================================================================# -# allrun script for testcase as part of test routine -# run settlingTest -# Christoph Goniva - March 2012 -#===================================================================# - -#- define variables -casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" -pizzaPath="$CFDEM_PIZZA_DIR" -postproc="false" -nrPostProcProcessors=2 - -# check if mesh was built -if [ -d "$casePath/CFD/constant/polyMesh/boundary" ]; then - echo "mesh was built before - using old mesh" -else - echo "mesh needs to be built" - cd $casePath/CFD - blockMesh -fi - -#- run parallel CFD-DEM in new terminal -gnome-terminal --title='cfdemSolverPimple ErgunTestMPI CFD' -e "bash $casePath/parCFDDEMrun.sh" - -if [ $postproc == "true" ] - then - - #- keep terminal open (if started in new terminal) - echo "simulation finisehd? ...press enter to proceed" - read - - #- get VTK data from liggghts dump file - cd $casePath/DEM - python $pizzaPath/pizza.py -f pizzaScriptRestart - - #- get VTK data from CFD sim - cd $casePath/CFD - #foamToVTK #- serial run of foamToVTK - source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh #- include functions - pseudoParallelRun "foamToVTK" $nrPostProcProcessors #- pseudo parallel run of foamToVTK - - #- start paraview - paraview - - #- keep terminal open (if started in new terminal) - echo "...press enter to clean up case" - echo "press Ctr+C to keep data" - read - - #- clean up case - echo "deleting data at: $casePath" - rm -r $casePath/CFD/0.* - rm -r $casePath/CFD/VTK - rm -r $casePath/CFD/couplingFiles/* - rm -r $casePath/CFD/particles/* - rm -r $casePath/DEM/post/* - rm -r $casePath/DEM/log.* - rm -r $casePath/log_* - echo "done" - -fi diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/0/Ksl b/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/0/Ksl deleted file mode 100644 index f44ecabe..00000000 --- a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/0/Ksl +++ /dev/null @@ -1,41 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object Ksl; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -3 -1 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - wall - { - type zeroGradient; - //type fixedValue; - //value uniform 0; - } - inlet - { - type zeroGradient; - } - outlet - { - type zeroGradient; - } -} - - -// ************************************************************************* // diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/0/U b/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/0/U deleted file mode 100644 index d996a904..00000000 --- a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/0/U +++ /dev/null @@ -1,81 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: http://www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volVectorField; - object U; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0 0); - -boundaryField -{ - - wall - { - //type fixedValue; - //value uniform (0 0 0); - type slip; - } - - inlet - { - /*type flowRateInletVelocity; - flowRate 0.001; - value uniform (0 0 0);*/ - - /*type fixedValue; - value uniform (0 0 0.0001);*/ - - //type zeroGradient; - -/* type groovyBC; - variables "Uend=vector(0,0,0.02);tEnd=0.1;"; - valueExpression "((time() < tEnd) ? Uend/tEnd*time():Uend)"; - value uniform (0 0 0);*/ - - type uniformFixedValue; - uniformValue table - ( - (0.000 (0 0 0.002)) - (0.010 (0 0 0.002)) - (0.011 (0 0 0.004)) - (0.020 (0 0 0.004)) - (0.021 (0 0 0.006)) - (0.030 (0 0 0.006)) - (0.031 (0 0 0.008)) - (0.040 (0 0 0.008)) - (0.041 (0 0 0.010)) - (0.050 (0 0 0.010)) - (0.051 (0 0 0.012)) - (0.060 (0 0 0.012)) - (0.061 (0 0 0.014)) - (0.070 (0 0 0.014)) - (0.071 (0 0 0.016)) - (0.080 (0 0 0.016)) - (0.081 (0 0 0.018)) - (0.090 (0 0 0.018)) - (0.091 (0 0 0.020)) - (0.100 (0 0 0.020)) - ); - } - outlet - { - /*type fluxCorrectedVelocity; //inletOutlet; - value uniform (0 0 0); - inletValue uniform (0 0 0);*/ - type zeroGradient; - } -} - -// ************************************************************************* // diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/0/Us b/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/0/Us deleted file mode 100644 index 1af9a050..00000000 --- a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/0/Us +++ /dev/null @@ -1,45 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volVectorField; - location "0"; - object Us; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0 0); - -boundaryField -{ - wall - { - type zeroGradient; - //type fixedValue; - //value uniform (1 0 0); - } - inlet - { - type zeroGradient; - //type fixedValue; - //value uniform (1 0 0);; - } - outlet - { - type zeroGradient; - //type fixedValue; - //value uniform (1 0 0); - } -} - - -// ************************************************************************* // diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/0/epsilon b/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/0/epsilon deleted file mode 100644 index 37ffab5e..00000000 --- a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/0/epsilon +++ /dev/null @@ -1,48 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object epsilon; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 2 -3 0 0 0 0]; - -internalField uniform 0.003; - -boundaryField -{ - wall - { - type epsilonWallFunction; - Cmu 0.09; - kappa 0.41; - E 9.8; - value uniform 0.003; - } - outlet - { - type inletOutlet; - inletValue uniform 0.003; - value uniform 0.003; - } - inlet - { - /*type turbulentMixingLengthDissipationRateInlet; - mixingLength 0.005; - value uniform 0.003;*/ - type zeroGradient; - } -} - - -// ************************************************************************* // diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/0/k b/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/0/k deleted file mode 100644 index bbf04afb..00000000 --- a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/0/k +++ /dev/null @@ -1,45 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object k; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 2 -2 0 0 0 0]; - -internalField uniform 0.001; - -boundaryField -{ - wall - { - type kqRWallFunction; - value uniform 0.001; - } - outlet - { - type inletOutlet; - inletValue uniform 0.001; - value uniform 0.001; - } - inlet - { - /*type turbulentIntensityKineticEnergyInlet; - intensity 0.05; - value uniform 0.001;*/ - type zeroGradient; - } -} - - -// ************************************************************************* // diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/0/nut b/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/0/nut deleted file mode 100644 index dcd36c89..00000000 --- a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/0/nut +++ /dev/null @@ -1,45 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object nut; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 2 -1 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - wall - { - type nutWallFunction; - Cmu 0.09; - kappa 0.41; - E 9.8; - value uniform 0; - } - outlet - { - type calculated; - value uniform 0; - } - inlet - { - type calculated; - value uniform 0; - } -} - - -// ************************************************************************* // diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/0/p b/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/0/p deleted file mode 100644 index d111e6be..00000000 --- a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/0/p +++ /dev/null @@ -1,43 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: http://www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - object p; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 2 -2 0 0 0 0]; - -internalField uniform 1.0e5; - -boundaryField -{ - - wall - { - type zeroGradient; - } - - inlet - { - type zeroGradient; - //type fixedValue; - //value uniform 100000; - } - outlet - { - //type zeroGradient; - type fixedValue; - value uniform 100000; - } -} - -// ************************************************************************* // diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/0/rho b/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/0/rho deleted file mode 100644 index 3dc9d41a..00000000 --- a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/0/rho +++ /dev/null @@ -1,39 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: http://www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - object rho; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -3 0 0 0 0 0]; - -internalField uniform 10; - -boundaryField -{ - - wall - { - type zeroGradient; - } - - inlet - { - type zeroGradient; - } - outlet - { - type zeroGradient; - } -} - -// ************************************************************************* // diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/0/voidfraction b/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/0/voidfraction deleted file mode 100644 index 3fdf6da6..00000000 --- a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/0/voidfraction +++ /dev/null @@ -1,41 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object voidfraction; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 1; - -boundaryField -{ - wall - { - type zeroGradient; - } - outlet - { - type fixedValue; - value uniform 1; - } - inlet - { - type fixedValue; - value uniform 1; - } -} - - -// ************************************************************************* // diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/constant/RASProperties b/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/constant/RASProperties deleted file mode 100644 index daec1829..00000000 --- a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/constant/RASProperties +++ /dev/null @@ -1,25 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object RASProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -RASModel laminar; - -turbulence off; - -printCoeffs on; - - -// ************************************************************************* // diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/constant/couplingProperties b/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/constant/couplingProperties deleted file mode 100644 index 74809ffa..00000000 --- a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/constant/couplingProperties +++ /dev/null @@ -1,200 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object couplingProperties; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -//===========================================================================// -// sub-models & settings - -modelType B; // A or B - -couplingInterval 100; - -voidFractionModel divided; // might crash with centre; - -locateModel engine; - -meshMotionModel noMeshMotion; - -regionModel allRegion; - -IOModel off; - -probeModel off; - -dataExchangeModel twoWayMPI;//twoWayFiles;//oneWayVTK;// - -averagingModel dense;//dilute;// - -clockModel off; - -smoothingModel constDiffSmoothing; - -forceModels -( - //GidaspowDrag - DiFeliceDrag - //KochHillDrag - //gradPForce - //viscForce - Archimedes - //volWeightedAverage - //totalMomentumExchange -); - -momCoupleModels -( - implicitCouple -); - -turbulenceModelType RASProperties;//LESProperties;// - -//===========================================================================// -// sub-model properties - -constDiffSmoothingProps -{ - lowerLimit 0.1; - upperLimit 1e10; - smoothingLength 0.1; -} - -implicitCoupleProps -{ - velFieldName "U"; - granVelFieldName "Us"; - voidfractionFieldName "voidfraction"; -} - -ArchimedesProps -{ - densityFieldName "rho"; - gravityFieldName "g"; -} -gradPForceProps -{ - pFieldName "p"; - densityFieldName "rho"; - voidfractionFieldName "voidfraction"; - velocityFieldName "U"; - interpolation; -} - -viscForceProps -{ - velocityFieldName "U"; - densityFieldName "rho"; - interpolation; -} -volWeightedAverageProps -{ - scalarFieldNames - ( - voidfraction - ); - vectorFieldNames - ( - ); - upperThreshold 0.999; - lowerThreshold 0; - verbose; -} -totalMomentumExchangeProps -{ - implicitMomExFieldName "Ksl"; - explicitMomExFieldName "none"; - fluidVelFieldName "U"; - granVelFieldName "Us"; - densityFieldName "rho"; -} -GidaspowDragProps -{ - velFieldName "U"; - densityFieldName "rho"; -} -DiFeliceDragProps -{ - velFieldName "U"; - densityFieldName "rho"; - voidfractionFieldName "voidfraction"; -} - -KochHillDragProps -{ - velFieldName "U"; - densityFieldName "rho"; -} - -virtualMassForceProps -{ - velFieldName "U"; - densityFieldName "rho"; -} - -oneWayVTKProps -{ - couplingFilename "vtk_out%4.4d.vtk"; - maxNumberOfParticles 30000; -} - -twoWayFilesProps -{ - maxNumberOfParticles 10100; -} - -centreProps -{ - alphaMin 0.10; -} - -dividedProps -{ - alphaMin 0.1; - scaleUpVol 1.0; -} - -bigParticleProps -{ - alphaMin 0.05; - scaleUpVol 10.0; - maxCellsPerParticle 1000; -} - -GaussProps -{ - maxCellsPerParticle 5000; - alphaMin 0.05; - scaleUpVol 10.0; -} - -engineProps -{ - treeSearch true; -} - -twoWayMPIProps -{ - maxNumberOfParticles 10100; - liggghtsPath "../DEM/in.liggghts_resume"; -} -// ************************************************************************* // diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/constant/g b/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/constant/g deleted file mode 100644 index 317bdd50..00000000 --- a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/constant/g +++ /dev/null @@ -1,22 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class uniformDimensionedVectorField; - location "constant"; - object g; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -2 0 0 0 0]; -value ( 0 0 -9.81 ); - - -// ************************************************************************* // diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/constant/liggghtsCommands b/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/constant/liggghtsCommands deleted file mode 100644 index 7431b210..00000000 --- a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/constant/liggghtsCommands +++ /dev/null @@ -1,31 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object liggghtsCommands; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -liggghtsCommandModels -( - runLiggghts -); - -// ************************************************************************* // diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/constant/polyMesh/blockMeshDict b/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/constant/polyMesh/blockMeshDict deleted file mode 100644 index 5e0fe81c..00000000 --- a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/constant/polyMesh/blockMeshDict +++ /dev/null @@ -1,154 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.0 | -| \\ / A nd | Web: http://www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ -version 2.0; -format ascii; -class dictionary; -object blockMeshDict; -} -// ************************************ - - - - - - - meshGenApp blockMesh; - convertToMeters 1; - - //64 mm column diameter - //15 cm length - - - - //Width of middle square section - - - - - //how many cells in the square section - //how many cells from square section to perimeter - // how many cells from top to bottom - - vertices - ( - ( 0.0069 0.0069 0.0 ) // Vertex fiveoclocksqb = 0 - (-0.0069 0.0069 0.0 ) // Vertex sevenoclocksqb = 1 - (-0.0069 -0.0069 0.0 ) // Vertex elevenoclocksqb = 2 - ( 0.0069 -0.0069 0.0 ) // Vertex oneoclocksqb = 3 - - ( 0.00975807358913172 0.00975807357161699 0.0 ) // Vertex fiveoclockcb = 4 - (-0.00975807358913172 0.00975807357161699 0.0) // Vertex sevenoclockcb = 5 - (-0.00975807358913172 -0.00975807357161699 0.0) // Vertex elevenoclockcb = 6 - ( 0.00975807358913172 -0.00975807357161699 0.0) // Vertex oneoclockcb = 7 - - ( 0.0069 0.0069 0.0553) // Vertex fiveoclocksqt = 8 - (-0.0069 0.0069 0.0553) // Vertex sevenoclocksqt = 9 - (-0.0069 -0.0069 0.0553) // Vertex elevenoclocksqt = 10 - ( 0.0069 -0.0069 0.0553) // Vertex oneoclocksqt = 11 - - ( 0.00975807358913172 0.00975807357161699 0.0553) // Vertex fiveoclockct = 12 - (-0.00975807358913172 0.00975807357161699 0.0553) // Vertex sevenoclockct = 13 - (-0.00975807358913172 -0.00975807357161699 0.0553) // Vertex elevenoclockct = 14 - ( 0.00975807358913172 -0.00975807357161699 0.0553) // Vertex oneoclockct = 15 - ); - - blocks - ( - //square block - hex ( - 2 3 0 1 - 10 11 8 9 - ) - (8 8 24) - simpleGrading (1 1 1) - - //slice1 - hex ( - 1 0 4 5 - 9 8 12 13 - ) - (8 4 24) - simpleGrading (1 1 1) - - //slice2 - hex ( - 6 2 1 5 - 14 10 9 13 - ) - ( 4 8 24) -simpleGrading (1 1 1) - - //slice3 - hex ( - 6 7 3 2 - 14 15 11 10 - ) - (8 4 24) -simpleGrading (1 1 1) - - //slice4 - hex ( - 3 7 4 0 - 11 15 12 8 - ) - (4 8 24) -simpleGrading (1 1 1) - - ); - - - //create the quarter circles - edges - ( - arc 4 5 (0.0 0.0138 0.0 ) - arc 5 6 (-0.0138 0.0 0.0) - arc 6 7 (0.0 -0.0138 0.0 ) - arc 7 4 (0.0138 0.0 0.0) - - arc 12 13 (0.0 0.0138 0.0553 ) - arc 13 14 (-0.0138 0.0 0.0553 ) - arc 14 15 (0.0 -0.0138 0.0553 ) - arc 15 12 (0.0138 0.0 0.0553 ) - - ); - - patches - ( - patch inlet - ( - (0 3 2 1) - (0 4 7 3) - (4 0 1 5) - (1 2 6 5) - (3 7 6 2) - ) - - patch outlet - ( - (8 11 10 9) - (8 12 15 11) - (12 8 9 13) - (9 10 14 13) - (11 15 14 10) - ) - - wall wall - ( - (5 4 12 13) - (5 13 14 6) - (6 14 15 7) - (7 15 12 4) - ) - -); - -mergePatchPairs -( -); diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/constant/transportProperties b/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/constant/transportProperties deleted file mode 100644 index 1e803628..00000000 --- a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/constant/transportProperties +++ /dev/null @@ -1,37 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object transportProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -transportModel Newtonian; - -nu nu [ 0 2 -1 0 0 0 0 ] 1.5e-04; - -CrossPowerLawCoeffs -{ - nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06; - nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06; - m m [ 0 0 1 0 0 0 0 ] 1; - n n [ 0 0 0 0 0 0 0 ] 1; -} - -BirdCarreauCoeffs -{ - nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06; - nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06; - k k [ 0 0 1 0 0 0 0 ] 0; - n n [ 0 0 0 0 0 0 0 ] 1; -} -// ************************************************************************* // diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/constant/turbulenceProperties b/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/constant/turbulenceProperties deleted file mode 100644 index f6753662..00000000 --- a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RASModel; - - -// ************************************************************************* // diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/octave/loaddata.m b/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/octave/loaddata.m deleted file mode 100644 index 9897140c..00000000 --- a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/octave/loaddata.m +++ /dev/null @@ -1,69 +0,0 @@ -function [data,colname]=loaddata(filename,columns,headerlines) - -% data = loaddata(filename,columns,headerlines) -% data = loaddata(filename,0,headerlines): automatc detection of -% columns by word count in first headerline or first data line -% (if headerline==0), separated by blanks or tabs -% columns=-1: write colum assignment code lines -% works only if headerline>0 and colnames separated by -% not more than 1 blank! -% columns=-2: columns separated by 2 blanks (fluent/scheme auswertung-instat.scm) -% [data, colname] = loaddata(filename,0,headerlines) -% colname = cell string array of column names from headerline - -fprintf(1,'loading %s ... ', filename); -f=fopen(filename,'r'); -if f==-1 - fprintf(1,'\n*** error: could not open "%s" ...\n', filename); - data=[]; -else - for i=1:headerlines - if i==1 s=fgets(f); else fgets(f); end - end - if headerlines==0 - s=fgets(f); frewind(f); - end - if columns<=0 % & headerlines>=1 - fprintf(1,'\n'); - fprintf(1,' %s',s); - pos = findstr(sprintf('\t'),s); % trennzeichenpositionen in zeile suchen - if length(pos)>0 - endpos=length(s); - %if isspace(s(endpos-1)) endpos=endpos-1; end - pos = [0 pos(1,:) endpos]; % anfangs- und endposition hinzufügen - elseif columns==-2 % spalteneinträge durch 2 blanks getrennt (fluent/scheme) - pos=[0]; - for i=1:length(s)-1 - if isspace(s(i)) & isspace(s(i+1)) - pos(end+1)=i+1; - end - end - pos(end+1)=length(s); - else % spalteneinträge durch blanks getrennt - %pos = findstr(' ',s); % trennzeichenpositionen in zeile suchen - pos=[]; - word=0; - for i=1:length(s) - if isspace(s(i)) - word=0; - elseif ~word - word=1; - pos(end+1)=i-1; - end - end - pos(end+1)=length(s); - end - if headerlines>=1 - for i=1:length(pos)-1 % alle spalten - colname{i}=s(pos(i)+1:pos(i+1)-1); - if columns==-1 fprintf(' = data(strmatch(''%s'',colname),:); %% column %d\n', colname{i},i); end - if columns==-2 fprintf('%% column %d: %s\n', i, colname{i}); end - end - end - columns = length(pos)-1; - fprintf(1,' total: %d columns ',columns); - end - data=fscanf(f,'%f',[columns,inf]); - fclose(f); - fprintf(1,'done.\n'); -end diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/octave/totalPressureDrop.m b/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/octave/totalPressureDrop.m deleted file mode 100644 index 0284a400..00000000 --- a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/octave/totalPressureDrop.m +++ /dev/null @@ -1,107 +0,0 @@ -close all; -clear; -clc; - -%====================================% -% simulation data 1 -%====================================% -%path = '../probes/0/p'; -path = '../postProcessing/0/p'; -columns=22; -headerlines=4; -data = loaddata(path,columns,headerlines); -data=transpose(data); -[x,y]=size(data) -dp_sim = (data(:,2)-data(:,y))/10000; -t_sim = data(:,1); -%fprintf('final pressureDrop of sim = %f Pa\n',dp_sim(length(dp_sim)) ) - -%====================================% -% analytical calculation -%====================================% - -%=================== -% Ergun Equation -%=================== -fprintf('\ncalc Ergun eqn:\n') -dp = 0.001 % particle diameter -phip = 1 % sphericity -epsilon = 0.451335 % void fraction -Ustart = 0.002 -Uend = 0.02 -timeStepSize = 0.001; % time interval of pressure data -Tstart = 0; -Tend = t_sim(length(t_sim)); -deltaU=(Uend-Ustart)/((Tend-Tstart)/timeStepSize); -U = Ustart+deltaU:deltaU:Uend; % velocity over time -Ua = U / epsilon; % physical velocity -L = 0.0156 % length of bed -rhoG = 10 % density in kg/m3 -nuG = 1.5*10^-4 % kinemat Visk in m2/s -muG = nuG*rhoG % dynam visc in Pa s - -dpErgun= L * ( - 150*((1-epsilon)^2/epsilon^3)*((muG.*U)/(phip*dp)^2) - +1.75*((1-epsilon)/epsilon^3)*((rhoG.*U.^2)/(phip*dp)) - )/10000/rhoG; - -fprintf('NOTE: this pressure is divided by density (according to CFD solver)\n') -fprintf('so the result does not depend on density\n') - -%fprintf('final pressure drop (Ergun eqn)= %f Pa\n',dpErgun) - -%================================== -% min fluidization velocity in m/s -%================================== -rhoP = 2000 % particle density in kg/m3 -g = 9.81 % gravity m/s2 - -Umf = dp^2*(rhoP-rhoG)*g/(150*muG)*(epsilon^3*phip^2)/(1-epsilon); -ReMF = Umf*dp*rhoG/muG; -if(ReMF<20) - fprintf('applying eqn1 for Umf.\n') -elseif(ReMF>20 && ReMF<1000) - fprintf('applying eqn1 for Umf.\n') -elseif (ReMF>=1000) - fprintf('applying eqn2 for Umf.\n') - Umf = sqrt(dp*(rhoP-rhoG)*g/(1.75*rhoG)*epsilon^3*phip); - ReMF = Umf*dp*rhoG/muG; -end -Umf -ReMF - -dpUmf= L * ( - 150*((1-epsilon)^2/epsilon^3)*((muG.*Umf)/(phip*dp)^2) - +1.75*((1-epsilon)/epsilon^3)*((rhoG.*Umf.^2)/(phip*dp)) - )/10000/rhoG; - -%====================================% -% plot data -%====================================% -length(U) -length(dp_sim) -figure(2) -plot(U,dp_sim) -title("Ergun pressure drop vs. simulation") -a=strcat("analytical (Ergun), Umf=",num2str(Umf),", dpUmf=",num2str(dpUmf)); -legend(a,"simulation") -xlabel("velocity in [m/s]") -ylabel("pressure drop [bar]") -axis([0,Uend,0,dpErgun(length(dpErgun))]) - -figure(1) -plot(U,dpErgun,U,dp_sim,[Umf,Uend],dpUmf*ones(1,2)) -title("Ergun pressure drop vs. simulation") -a=strcat("analytical (Ergun), Umf=",num2str(Umf),", dpUmf=",num2str(dpUmf)); -legend(a,"simulation") -xlabel("velocity in [m/s]") -ylabel("pressure drop [bar]") -axis([0,Uend,0,dpErgun(length(dpErgun))]) - -%print('cfdemSolverPiso_settlingTest.eps','-deps2') -print -color "cfdemSolverPimple_ErgunTestMPI.eps" -replot; - - - - diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/steps_0p1s b/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/steps_0p1s deleted file mode 100644 index a1748c35..00000000 --- a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/steps_0p1s +++ /dev/null @@ -1,22 +0,0 @@ -( - (0.000 (0 0 0.002)) - (0.010 (0 0 0.002)) - (0.011 (0 0 0.004)) - (0.020 (0 0 0.004)) - (0.021 (0 0 0.006)) - (0.030 (0 0 0.006)) - (0.031 (0 0 0.008)) - (0.040 (0 0 0.008)) - (0.041 (0 0 0.010)) - (0.050 (0 0 0.010)) - (0.051 (0 0 0.012)) - (0.060 (0 0 0.012)) - (0.061 (0 0 0.014)) - (0.070 (0 0 0.014)) - (0.071 (0 0 0.016)) - (0.080 (0 0 0.016)) - (0.081 (0 0 0.018)) - (0.090 (0 0 0.018)) - (0.091 (0 0 0.020)) - (0.100 (0 0 0.020)) -) diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/system/controlDict b/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/system/controlDict deleted file mode 100644 index 7493598b..00000000 --- a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/system/controlDict +++ /dev/null @@ -1,117 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object controlDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -application pisoFoam; - -startFrom startTime; - -startTime 0; - -stopAt endTime; - -endTime 0.1;//0.01; - -deltaT 0.001; - -writeControl adjustableRunTime; - -writeInterval 0.001;//0.01; - -purgeWrite 0; - -writeFormat ascii; - -writePrecision 6; - -writeCompression uncompressed; - -timeFormat general; - -timePrecision 6; - -runTimeModifiable yes; - -adjustTimeStep no; - -maxCo 0.1; - -libs ("libOpenFOAM.so" "libgroovyBC.so"); - -functions -( - - probes - { - type probes; - // Where to load it from - functionObjectLibs ( "libsampling.so" ); - // Name of the directory for probe data - name probes; - probeLocations - ( - (0 0 0.0001) - (0 0 0.0026) - (0 0 0.0051) - (0 0 0.0076) - (0 0 0.0101) - (0 0 0.0126) - (0 0 0.0151) - (0 0 0.0176) - (0 0 0.0201) - (0 0 0.0226) - (0 0 0.0251) - (0 0 0.0276) - (0 0 0.0301) - (0 0 0.0326) - (0 0 0.0351) - (0 0 0.0375) - (0 0 0.0401) - (0 0 0.0426) - (0 0 0.0451) - (0 0 0.0476) - (0 0 0.0529) - ); - - // Fields to be probed - fields ( p U voidfraction volAverage_voidfraction); - - // Write at same frequency as fields - outputControl timeStep;//outputTime; - outputInterval 1; - } - - /*pressureDrop - { - type patchAverage; - functionObjectLibs - ( - "libsimpleFunctionObjects.so" - ); - verbose true; - patches - ( - inlet - outlet - ); - fields - ( - p - ); - factor 1; - }*/ -); -// ************************************************************************* // diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/system/controlDict.foam b/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/system/controlDict.foam deleted file mode 100644 index 7493598b..00000000 --- a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/system/controlDict.foam +++ /dev/null @@ -1,117 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object controlDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -application pisoFoam; - -startFrom startTime; - -startTime 0; - -stopAt endTime; - -endTime 0.1;//0.01; - -deltaT 0.001; - -writeControl adjustableRunTime; - -writeInterval 0.001;//0.01; - -purgeWrite 0; - -writeFormat ascii; - -writePrecision 6; - -writeCompression uncompressed; - -timeFormat general; - -timePrecision 6; - -runTimeModifiable yes; - -adjustTimeStep no; - -maxCo 0.1; - -libs ("libOpenFOAM.so" "libgroovyBC.so"); - -functions -( - - probes - { - type probes; - // Where to load it from - functionObjectLibs ( "libsampling.so" ); - // Name of the directory for probe data - name probes; - probeLocations - ( - (0 0 0.0001) - (0 0 0.0026) - (0 0 0.0051) - (0 0 0.0076) - (0 0 0.0101) - (0 0 0.0126) - (0 0 0.0151) - (0 0 0.0176) - (0 0 0.0201) - (0 0 0.0226) - (0 0 0.0251) - (0 0 0.0276) - (0 0 0.0301) - (0 0 0.0326) - (0 0 0.0351) - (0 0 0.0375) - (0 0 0.0401) - (0 0 0.0426) - (0 0 0.0451) - (0 0 0.0476) - (0 0 0.0529) - ); - - // Fields to be probed - fields ( p U voidfraction volAverage_voidfraction); - - // Write at same frequency as fields - outputControl timeStep;//outputTime; - outputInterval 1; - } - - /*pressureDrop - { - type patchAverage; - functionObjectLibs - ( - "libsimpleFunctionObjects.so" - ); - verbose true; - patches - ( - inlet - outlet - ); - fields - ( - p - ); - factor 1; - }*/ -); -// ************************************************************************* // diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/system/decomposeParDict b/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/system/decomposeParDict deleted file mode 100644 index 21bbeef3..00000000 --- a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/system/decomposeParDict +++ /dev/null @@ -1,86 +0,0 @@ -/*-------------------------------*- C++ -*---------------------------------*\ -| ========= | -| \\ / OpenFOAM | -| \\ / | -| \\ / The Open Source CFD Toolbox | -| \\/ http://www.OpenFOAM.org | -\*-------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - note "mesh decomposition control dictionary"; - location "system"; - object decomposeParDict; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -numberOfSubdomains 2; - -//- Keep owner and neighbour on same processor for faces in zones: -// preserveFaceZones (heater solid1 solid3); - -//method scotch; -// method hierarchical; - method simple; -// method metis; -// method manual; - -simpleCoeffs -{ - n (1 1 2); - delta 0.001; -} - -hierarchicalCoeffs -{ - n (2 2 1); - delta 0.001; - order xyz; -} - -metisCoeffs -{ - /* - processorWeights - ( - 1 - 1 - 1 - 1 - ); - */ -} - -scotchCoeffs -{ - //processorWeights - //( - // 1 - // 1 - // 1 - // 1 - //); - //writeGraph true; - //strategy "b"; -} - -manualCoeffs -{ - dataFile "decompositionData"; -} - - -//// Is the case distributed -//distributed yes; -//// Per slave (so nProcs-1 entries) the directory above the case. -//roots -//( -// "/tmp" -// "/tmp" -//); - - -// ************************************************************************* // diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/system/funkySetFieldsDict b/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/system/funkySetFieldsDict deleted file mode 100755 index 39414dd5..00000000 --- a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/system/funkySetFieldsDict +++ /dev/null @@ -1,33 +0,0 @@ -FoamFile -{ - version 2.0; - format ascii; - - root "/.automount/werner/Werner/bgschaid/bgschaid-foamStuff/DepositionTests"; - case "neutralTest"; - instance "system"; - local ""; - - class dictionary; - object funkySetFieldsDict; -} - -expressions -( - init - { - field voidfraction; - expression "1"; - valuePatches 2(inlet outlet); // set value 1 at those patches - } - setGamma - { - field voidfraction; - expression "0.43"; - //condition "pow(pow(pos().x-0.2,2) + pow(pos().y-0,2)+ pow(pos().z-0,2),0.5) < 0.04"; - condition "pos().z < 0.01467 && pos().z > 0.0"; - keepPatches true; - //valuePatches 1(inlet); // set value 1 at those patches - } - -); diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/system/fvSchemes b/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/system/fvSchemes deleted file mode 100644 index fac85f68..00000000 --- a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/system/fvSchemes +++ /dev/null @@ -1,76 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object fvSchemes; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -gradSchemes -{ - default Gauss linear; - grad(p) Gauss linear; - grad(U) Gauss linear; -} - -divSchemes -{ - default Gauss linear; - div(phi,U) Gauss limitedLinearV 1; - div(phi,k) Gauss limitedLinear 1; - div(phi,epsilon) Gauss limitedLinear 1; - div(phi,R) Gauss limitedLinear 1; - div(R) Gauss linear; - div(phi,nuTilda) Gauss limitedLinear 1; - div((viscousTerm*dev(grad(U).T()))) Gauss linear; - div((nu*dev(grad(U).T()))) Gauss linear; - div((nuEff*dev(grad(U).T()))) Gauss linear; -} - -laplacianSchemes -{ - default Gauss linear corrected; - laplacian(viscousTerm,U) Gauss linear corrected; - laplacian(nu,U) Gauss linear corrected; - laplacian(nuEff,U) Gauss linear corrected; - laplacian((1|A(U)),p) Gauss linear corrected; - laplacian((voidfraction2|A(U)),p) Gauss linear corrected; - laplacian(DkEff,k) Gauss linear corrected; - laplacian(DepsilonEff,epsilon) Gauss linear corrected; - laplacian(DREff,R) Gauss linear corrected; - laplacian(DnuTildaEff,nuTilda) Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; - interpolate(U) linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - p ; -} - - -// ************************************************************************* // diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/system/fvSolution b/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/system/fvSolution deleted file mode 100644 index b8a949c0..00000000 --- a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/system/fvSolution +++ /dev/null @@ -1,91 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object fvSolution; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -solvers -{ - p - { - solver GAMG; - tolerance 1e-06; - 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)" - { - solver PCG; - preconditioner DIC; - tolerance 1e-06; - relTol 0; - } -} - -PIMPLE -{ - nOuterCorrectors 2; - nCorrectors 2; - nNonOrthogonalCorrectors 0; - pRefCell 0; - pRefValue 0; -} - -relaxationFactors -{ - "U.*" 1; - "k.*" 1; - "epsilon.*" 1; -} - -PISO -{ - nCorrectors 4; - nNonOrthogonalCorrectors 1; - pRefCell 0; - pRefValue 0; -} - - -// ************************************************************************* // diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/DEM/in.liggghts_init b/tutorials/cfdemSolverPimple/ErgunTestMPI/DEM/in.liggghts_init deleted file mode 100644 index 35b91f5f..00000000 --- a/tutorials/cfdemSolverPimple/ErgunTestMPI/DEM/in.liggghts_init +++ /dev/null @@ -1,64 +0,0 @@ -# Pour granular particles into chute container, then induce flow -echo both -atom_style granular -atom_modify map array -communicate single vel yes - -boundary m m m -newton off - -units si - -region reg block -0.015 0.015 -0.015 0.015 -0.001 0.0554 units box -create_box 1 reg - -neighbor 0.001 bin -neigh_modify delay 0 - - -#Material properties required for new pair styles - -fix m1 all property/global youngsModulus peratomtype 5.e6 -fix m2 all property/global poissonsRatio peratomtype 0.45 -fix m3 all property/global coefficientRestitution peratomtypepair 1 0.3 -fix m4 all property/global coefficientFriction peratomtypepair 1 0.5 - -#pair style -pair_style gran model hertz tangential history #Hertzian without cohesion -pair_coeff * * - -#timestep, gravity -timestep 0.00001 -fix gravi all gravity 9.81 vector 0.0 0.0 -1.0 - -#walls -fix zwalls1 all wall/gran model hertz tangential history primitive type 1 zplane 0.0 -fix zwalls2 all wall/gran model hertz tangential history primitive type 1 zplane 0.0553 -fix cylwalls all wall/gran model hertz tangential history primitive type 1 zcylinder 0.01385 0. 0. - -#particle distributions and insertion -region bc cylinder z 0.0 0.0 0.012 0. 0.055 units box -fix pts1 all particletemplate/sphere 1 atom_type 1 density constant 200 radius constant 0.0005 -fix pdd1 all particledistribution/discrete 1. 1 pts1 1.0 - -fix ins all insert/pack seed 100001 distributiontemplate pdd1 vel constant 0. 0. -1. insert_every once overlapcheck yes all_in yes particles_in_region 10000 region bc - -#apply nve integration to all particles that are inserted as single particles -fix integr all nve/sphere - -#screen output -compute 1 all erotate/sphere -thermo_style custom step atoms ke c_1 vol -thermo 1000 -thermo_modify lost ignore norm no -compute_modify thermo_temp dynamic yes - -#insert the first particles so that dump is not empty -run 1 -dump dmp all custom 5000 post/dump.liggghts_init id type type x y z ix iy iz vx vy vz fx fy fz omegax omegay omegaz radius -#force : f_couple_cfd[0] f_couple_cfd[1] f_couple_cfd[2] -#node : f_couple_cfd[6] -#cell id : f_couple_cfd[7] - -run 10000 upto -write_restart liggghts.restart diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/DEM/in.liggghts_resume b/tutorials/cfdemSolverPimple/ErgunTestMPI/DEM/in.liggghts_resume deleted file mode 100644 index 38089bb5..00000000 --- a/tutorials/cfdemSolverPimple/ErgunTestMPI/DEM/in.liggghts_resume +++ /dev/null @@ -1,71 +0,0 @@ -# Pour granular particles into chute container, then induce flow - -atom_style granular -atom_modify map array -communicate single vel yes - -boundary m m m -newton off - -units si -processors 2 1 1 - -#read the restart file -read_restart ../DEM/liggghts.restart - -#do not do this here, the simulation box is in the restart file! -#region reg block -0.015 0.015 -0.015 0.015 -0.001 0.0554 units box -#create_box 1 reg - -neighbor 0.0005 bin -neigh_modify delay 0 - -#Material properties required for new pair styles - -fix m1 all property/global youngsModulus peratomtype 5.e6 -fix m2 all property/global poissonsRatio peratomtype 0.45 -fix m3 all property/global coefficientRestitution peratomtypepair 1 0.3 -fix m4 all property/global coefficientFriction peratomtypepair 1 0.5 - -#pair style -pair_style gran model hertz tangential history #Hertzian without cohesion -pair_coeff * * - -#timestep, gravity -timestep 0.00001 -fix gravi all gravity 9.81 vector 0.0 0.0 -1.0 - -fix zwalls1 all wall/gran model hertz tangential history primitive type 1 zplane 0.0 -fix zwalls2 all wall/gran model hertz tangential history primitive type 1 zplane 0.0553 -fix cylwalls all wall/gran model hertz tangential history primitive type 1 zcylinder 0.01385 0. 0. - -# change the particles density -set group all density 2000 - -#cfd coupling -fix cfd all couple/cfd couple_every 100 mpi -fix cfd2 all couple/cfd/force - -#apply nve integration to all particles that are inserted as single particles -fix integr all nve/sphere - -#center of mass -compute centerOfMass all com - -#compute total dragforce -compute dragtotal all reduce sum f_dragforce[1] f_dragforce[2] f_dragforce[3] - -#screen output -compute 1 all erotate/sphere -thermo_style custom step atoms ke c_1 vol c_centerOfMass[3] c_dragtotal[1] c_dragtotal[2] c_dragtotal[3] -thermo 10 -thermo_modify lost ignore norm no -compute_modify thermo_temp dynamic yes - -#insert the first particles so that dump is not empty -dump myDump all stl 1 post/dump_*.stl -#run 1 -dump dmp all custom 5000 ../DEM/post/dump*.liggghts_restart id type type x y z vx vy vz fx fy fz f_dragforce[1] f_dragforce[2] f_dragforce[3] radius -undump myDump - -run 1 diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/DEM/liggghts.restart b/tutorials/cfdemSolverPimple/ErgunTestMPI/DEM/liggghts.restart deleted file mode 100644 index 99605584..00000000 Binary files a/tutorials/cfdemSolverPimple/ErgunTestMPI/DEM/liggghts.restart and /dev/null differ diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/DEM/post/dummy b/tutorials/cfdemSolverPimple/ErgunTestMPI/DEM/post/dummy deleted file mode 100644 index 410948ce..00000000 --- a/tutorials/cfdemSolverPimple/ErgunTestMPI/DEM/post/dummy +++ /dev/null @@ -1,78 +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 diff --git a/tutorials/cfdemSolverPimple/ErgunTestMPI/parCFDDEMrun.sh b/tutorials/cfdemSolverPimple/ErgunTestMPI/parCFDDEMrun.sh deleted file mode 100644 index 9cc09ae2..00000000 --- a/tutorials/cfdemSolverPimple/ErgunTestMPI/parCFDDEMrun.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash - -#===================================================================# -# allrun script for testcase as part of test routine -# run settlingTest CFD part -# Christoph Goniva - March 2012 -#===================================================================# - -#- source CFDEM env vars -. ~/.bashrc - -#- include functions -source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh - -#--------------------------------------------------------------------------------# -#- define variables -casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" -logpath=$casePath -headerText="run_parallel_cfdemSolverPimple_ErgunTestMPI_CFDDEM" -logfileName="log_$headerText" -solverName="cfdemSolverPimple" #"cfdemSolverPimpleDyM_22x"# -nrProcs="2" -machineFileName="none" # yourMachinefileName | none -debugMode="off" # on | off -testHarnessPath="$CFDEM_TEST_HARNESS_PATH" -#--------------------------------------------------------------------------------# - -#- call function to run a parallel CFD-DEM case -parCFDDEMrun $logpath $logfileName $casePath $headerText $solverName $nrProcs $machineFileName $debugMode - -#------------------------------# -# octave - -#- change path -cd octave - -#- rmove old graph -rm cfdemSolverPiso_ErgunTestMPI.eps - -#- run octave -octave totalPressureDrop.m - -#- show plot -evince cfdemSolverPimple_ErgunTestMPI.eps -#------------------------------# - -#- copy log file to test harness -cp ../../$logfileName $testHarnessPath -cp cfdemSolverPimple_ErgunTestMPI.eps $testHarnessPath - -#- clean up case -cd .. -rm -rf 0.* -rm -rf processor* -rm -rf patchAverage_pressureDrop -rm -rf probes -rm -rf postProcessing -rm log.liggghts -rm ../DEM/post/dump* -rm -rf particles - -#- preserve post directory -echo "dummyfile" >> $casePath/DEM/post/dummy - - diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/system/funkySetFieldsDict b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/system/funkySetFieldsDict old mode 100755 new mode 100644 diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/CFD/system/funkySetFieldsDict b/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/CFD/system/funkySetFieldsDict old mode 100755 new mode 100644