-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #146 from ParticulateFlow/release
Release 23.02
- Loading branch information
Showing
316 changed files
with
12,807 additions
and
22,418 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,7 @@ log.* | |
| *.swp | ||
| *.swo | ||
|
|
||
| **/linux*Gcc*/ | ||
| **/linux*cc*/ | ||
| **/.vscode | ||
|
|
||
| lnInclude | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
applications/solvers/cfdemSolverIBContinuousForcing/Make/files
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| cfdemSolverIBContinuousForcing.C | ||
|
|
||
| EXE=$(CFDEM_APP_DIR)/cfdemSolverIBContinuousForcing |
34 changes: 34 additions & 0 deletions
34
applications/solvers/cfdemSolverIBContinuousForcing/Make/options
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| include $(CFDEM_ADD_LIBS_DIR)/additionalLibs | ||
|
|
||
| EXE_INC = \ | ||
| -I$(CFDEM_OFVERSION_DIR) \ | ||
| -I$(LIB_SRC)/finiteVolume/lnInclude \ | ||
| -I$(LIB_SRC)/meshTools/lnInclude \ | ||
| -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ | ||
| -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ | ||
| -I$(LIB_SRC)/transportModels \ | ||
| -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ | ||
| -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude \ | ||
| -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ | ||
| -I$(LIB_SRC)/dynamicMesh/lnInclude \ | ||
| -I$(LIB_SRC)/dynamicMesh/dynamicFvMesh/lnInclude \ | ||
| -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \ | ||
| -I$(LIB_SRC)/fvOptions/lnInclude \ | ||
| -I$(LIB_SRC)/sampling/lnInclude \ | ||
| -Wno-deprecated-copy | ||
|
|
||
| EXE_LIBS = \ | ||
| -L$(CFDEM_LIB_DIR)\ | ||
| -lturbulenceModels \ | ||
| -lincompressibleTurbulenceModels \ | ||
| -lincompressibleTransportModels \ | ||
| -lfiniteVolume \ | ||
| -lmeshTools \ | ||
| -ldynamicFvMesh \ | ||
| -ldynamicMesh \ | ||
| -lfvOptions \ | ||
| -lsampling \ | ||
| -l$(CFDEM_LIB_NAME) \ | ||
| $(CFDEM_ADD_LIB_PATHS) \ | ||
| $(CFDEM_ADD_LIBS) | ||
|
|
19 changes: 19 additions & 0 deletions
19
applications/solvers/cfdemSolverIBContinuousForcing/UEqn.H
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| fvVectorMatrix UEqn | ||
| ( | ||
| fvm::ddt(voidfractionNext,U) + MRF.DDt(U) | ||
| + fvm::div(phi, U) | ||
| + turbulence->divDevReff(U) | ||
| == | ||
| fvOptions(U) | ||
| + (lambda*(1-voidfractionNext)/U.mesh().time().deltaT())*(fvc::Sp(1,Us)-fvm::Sp(1,U)) | ||
| ); | ||
|
|
||
| UEqn.relax(); | ||
|
|
||
| fvOptions.constrain(UEqn); | ||
|
|
||
| if (piso.momentumPredictor()) | ||
| { | ||
| solve(UEqn == -fvc::grad(p)); | ||
| fvOptions.correct(U); | ||
| } |
129 changes: 129 additions & 0 deletions
129
applications/solvers/cfdemSolverIBContinuousForcing/cfdemSolverIBContinuousForcing.C
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| /*---------------------------------------------------------------------------*\ | ||
| CFDEMcoupling - Open Source CFD-DEM coupling | ||
| CFDEMcoupling is part of the CFDEMproject | ||
| www.cfdem.com | ||
| Copyright (C) 1991-2009 OpenCFD Ltd. | ||
| Copyright (C) 2009-2012 JKU, Linz | ||
| Copyright (C) 2012-2015 DCS Computing GmbH,Linz | ||
| Copyright (C) 2015- JKU, 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 <http://www.gnu.org/licenses/>. | ||
| Application | ||
| cfdemSolverIBContinuousForcing | ||
| Description | ||
| Transient solver for incompressible flow. | ||
| The code is an evolution of the solver pisoFoam in OpenFOAM(R) 1.6, | ||
| where additional functionality for CFD-DEM coupling using immersed body | ||
| (fictitious domain) method and a continuous forcing approach is added. | ||
| Contributions | ||
| Alice Hager | ||
| Achuth N. Balachandran Nair | ||
| \*---------------------------------------------------------------------------*/ | ||
|
|
||
|
|
||
| #include "fvCFD.H" | ||
| #include "singlePhaseTransportModel.H" | ||
| #include "turbulentTransportModel.H" | ||
| #include "pisoControl.H" | ||
|
|
||
| #include "cfdemCloudIB.H" | ||
| #include "implicitCouple.H" | ||
|
|
||
| #include "averagingModel.H" | ||
| #include "regionModel.H" | ||
| #include "voidFractionModel.H" | ||
|
|
||
| #include "dynamicFvMesh.H" | ||
|
|
||
| #include "cellSet.H" | ||
|
|
||
| #include "fvOptions.H" | ||
|
|
||
| // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // | ||
|
|
||
| int main(int argc, char *argv[]) | ||
| { | ||
|
|
||
| #include "setRootCase.H" | ||
| #include "createTime.H" | ||
| #include "createDynamicFvMesh.H" | ||
| #include "createControl.H" | ||
| #include "createTimeControls.H" | ||
| #include "createFields.H" | ||
| #include "initContinuityErrs.H" | ||
| #include "createFvOptions.H" | ||
|
|
||
| // create cfdemCloud | ||
| #include "readGravitationalAcceleration.H" | ||
| cfdemCloudIB particleCloud(mesh); | ||
|
|
||
| // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // | ||
|
|
||
| Info<< "\nStarting time loop\n" << endl; | ||
|
|
||
| while (runTime.loop()) | ||
| { | ||
| Info<< "Time = " << runTime.timeName() << nl << endl; | ||
|
|
||
| //=== dyM =================== | ||
| interFace = mag(mesh.lookupObject<volScalarField>("voidfractionNext")); | ||
| mesh.update(); //dyM | ||
|
|
||
| #include "readTimeControls.H" | ||
| #include "CourantNo.H" | ||
| #include "setDeltaT.H" | ||
|
|
||
| // do particle stuff | ||
| Info << "- evolve()" << endl; | ||
| particleCloud.evolve(Us); | ||
|
|
||
| volScalarField voidfractionNext=mesh.lookupObject<volScalarField>("voidfractionNext"); | ||
|
|
||
| // Pressure-velocity PISO corrector | ||
| { | ||
| MRF.correctBoundaryVelocity(U); | ||
|
|
||
| // Momentum predictor | ||
| #include "UEqn.H" | ||
|
|
||
| // --- PISO loop | ||
| while (piso.correct()) | ||
| { | ||
| #include "pEqn.H" | ||
| } | ||
| } | ||
|
|
||
| laminarTransport.correct(); | ||
| turbulence->correct(); | ||
|
|
||
| runTime.write(); | ||
|
|
||
| Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" | ||
| << " ClockTime = " << runTime.elapsedClockTime() << " s" | ||
| << nl << endl; | ||
| } | ||
|
|
||
| Info<< "End\n" << endl; | ||
|
|
||
| return 0; | ||
| } | ||
|
|
||
|
|
||
| // ************************************************************************* // |
Oops, something went wrong.