diff --git a/applications/solvers/cfdemSolverMultiphase/alphaCourantNo.H b/applications/solvers/cfdemSolverMultiphase/alphaCourantNo.H index 9d0eb4cb..61dafb14 100644 --- a/applications/solvers/cfdemSolverMultiphase/alphaCourantNo.H +++ b/applications/solvers/cfdemSolverMultiphase/alphaCourantNo.H @@ -1,34 +1,3 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM 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. - - OpenFOAM 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 OpenFOAM. If not, see . - -Global - alphaCourantNo - -Description - Calculates and outputs the mean and maximum Courant Numbers. - -\*---------------------------------------------------------------------------*/ - scalar alphaCoNum = 0.0; scalar meanAlphaCoNum = 0.0; diff --git a/applications/solvers/cfdemSolverMultiphase/cfdemSolverMultiphase.C b/applications/solvers/cfdemSolverMultiphase/cfdemSolverMultiphase.C index 3e27ad21..f25092bb 100644 --- a/applications/solvers/cfdemSolverMultiphase/cfdemSolverMultiphase.C +++ b/applications/solvers/cfdemSolverMultiphase/cfdemSolverMultiphase.C @@ -1,35 +1,31 @@ /*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- License - This file is part of OpenFOAM. - OpenFOAM is free software: you can redistribute it and/or modify it + This 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. - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + This code 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 OpenFOAM. If not, see . + along with this code. If not, see . + + Copyright (C) 2018- Mathias Vångö, JKU Linz, Austria Application cfdemSolverMultiphase Description - Solver for n incompressible fluids which captures the interfaces and - includes surface-tension and contact-angle effects for each phase. + CFD-DEM solver for n incompressible fluids which captures the interfaces and + includes surface-tension and contact-angle effects for each phase. It is based + on the OpenFOAM(R)-4.x solver multiphaseInterFoam but extended to incorporate + DEM functionalities from the open-source DEM code LIGGGHTS. Turbulence modelling is generic, i.e. laminar, RAS or LES may be selected. - \*---------------------------------------------------------------------------*/ #include "fvCFD.H" diff --git a/applications/solvers/cfdemSolverMultiphase/multiphaseMixture/multiphaseMixture.C b/applications/solvers/cfdemSolverMultiphase/multiphaseMixture/multiphaseMixture.C index 89416800..e27f2b44 100644 --- a/applications/solvers/cfdemSolverMultiphase/multiphaseMixture/multiphaseMixture.C +++ b/applications/solvers/cfdemSolverMultiphase/multiphaseMixture/multiphaseMixture.C @@ -1,25 +1,20 @@ /*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- License - This file is part of OpenFOAM. - OpenFOAM is free software: you can redistribute it and/or modify it + This 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. - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + This code 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 OpenFOAM. If not, see . + along with this code. If not, see . + + Copyright (C) 2018- Mathias Vångö, JKU Linz, Austria \*---------------------------------------------------------------------------*/ @@ -264,8 +259,8 @@ Foam::multiphaseMixture::rho(const label patchi) const Foam::tmp Foam::multiphaseMixture::mu() const { - - return nu()*rho(); + Info << "In multiphasemixture mu()" << endl; + return rho()*nu(); // PtrDictionary::const_iterator iter = phases_.begin(); // tmp tmu = iter()*iter().rho()*iter().nu(); @@ -327,6 +322,7 @@ Foam::multiphaseMixture::muf() const Foam::tmp Foam::multiphaseMixture::nu() const { + Info << "Something called nu(), returning nu_ from multiphaseMixture" << endl; return nu_; } @@ -679,7 +675,7 @@ void Foam::multiphaseMixture::solveAlphas MULES::limit ( 1.0/mesh_.time().deltaT().value(), - geometricOneField(), //voidfraction_ + voidfraction_ alpha, phi_, alphaPhiCorr, diff --git a/applications/solvers/cfdemSolverMultiphase/multiphaseMixture/multiphaseMixture.H b/applications/solvers/cfdemSolverMultiphase/multiphaseMixture/multiphaseMixture.H index b70e6507..2ae6d903 100644 --- a/applications/solvers/cfdemSolverMultiphase/multiphaseMixture/multiphaseMixture.H +++ b/applications/solvers/cfdemSolverMultiphase/multiphaseMixture/multiphaseMixture.H @@ -1,32 +1,30 @@ /*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- License - This file is part of OpenFOAM. - OpenFOAM is free software: you can redistribute it and/or modify it + This 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. - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + This code 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 OpenFOAM. If not, see . + along with this code. If not, see . + + Copyright (C) 2018- Mathias Vångö, JKU Linz, Austria Class - Foam::multiphaseMixture + multiphaseMixture Description - Incompressible multi-phase mixture with built in solution for the - phase fractions with interface compression for interface-capturing. + This class is based on the OpenFOAM(R) Foam::multiphaseMixture class, + which is an incompressible multi-phase mixture with built in solution + for the phase fractions with interface compression for interface-capturing. + It has been extended to include the void fraction in the volume fraction + transport equations. Derived from transportModel so that it can be unsed in conjunction with the incompressible turbulence models. @@ -36,7 +34,6 @@ Description SourceFiles multiphaseMixture.C - \*---------------------------------------------------------------------------*/ #ifndef multiphaseMixture_H diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/gradPForceSmooth/gradPForceSmooth.C b/src/lagrangian/cfdemParticle/subModels/forceModel/gradPForceSmooth/gradPForceSmooth.C index c8ca261a..65f72b1a 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/gradPForceSmooth/gradPForceSmooth.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/gradPForceSmooth/gradPForceSmooth.C @@ -1,32 +1,21 @@ /*---------------------------------------------------------------------------*\ - 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. + This 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 + This code 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 + along with this code. If not, see . + + Copyright (C) 2018- Mathias Vångö, JKU Linz, Austria -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" diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/gradPForceSmooth/gradPForceSmooth.H b/src/lagrangian/cfdemParticle/subModels/forceModel/gradPForceSmooth/gradPForceSmooth.H index 0cfa508b..dca59f0d 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/gradPForceSmooth/gradPForceSmooth.H +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/gradPForceSmooth/gradPForceSmooth.H @@ -1,41 +1,29 @@ /*---------------------------------------------------------------------------*\ - 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. + This 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 + This code 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 + along with this code. If not, see . -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). - - -grad(p)*Vp * rho ... if p is normalized with pressure - -grad(p)*Vp ... if p is real pressure - pressure gradient force - including interpolation of the velocity to the exact position + Copyright (C) 2018- Mathias Vångö, JKU Linz, Austria Class gradPForceSmooth +Description + This code is an extention of the gradPForce class by allowing the pressure- + field to be smoothened prior to the force calculation (without altering the + original field). + SourceFiles gradPForceSmooth.C diff --git a/src/lagrangian/cfdemParticle/subModels/smoothingModel/temporalSmoothing/temporalSmoothing.C b/src/lagrangian/cfdemParticle/subModels/smoothingModel/temporalSmoothing/temporalSmoothing.C index 2c01de80..802c027f 100644 --- a/src/lagrangian/cfdemParticle/subModels/smoothingModel/temporalSmoothing/temporalSmoothing.C +++ b/src/lagrangian/cfdemParticle/subModels/smoothingModel/temporalSmoothing/temporalSmoothing.C @@ -1,34 +1,21 @@ /*---------------------------------------------------------------------------*\ - 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 - Copyright (C) 2013- Graz University of - Technology, IPPT -------------------------------------------------------------------------------- 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. + This 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 + This code 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 + along with this code. If not, see . + + Copyright (C) 2018- Mathias Vångö, JKU Linz, Austria -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" @@ -81,7 +68,7 @@ temporalSmoothing::temporalSmoothing temporalSmoothing::~temporalSmoothing() {} - +r // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // bool temporalSmoothing::doSmoothing() const diff --git a/src/lagrangian/cfdemParticle/subModels/smoothingModel/temporalSmoothing/temporalSmoothing.H b/src/lagrangian/cfdemParticle/subModels/smoothingModel/temporalSmoothing/temporalSmoothing.H index d89705db..5b134c26 100644 --- a/src/lagrangian/cfdemParticle/subModels/smoothingModel/temporalSmoothing/temporalSmoothing.H +++ b/src/lagrangian/cfdemParticle/subModels/smoothingModel/temporalSmoothing/temporalSmoothing.H @@ -1,41 +1,30 @@ /*---------------------------------------------------------------------------*\ - 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 - Copyright (C) 2013- Graz University of - Technology, IPPT -------------------------------------------------------------------------------- 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. + This 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 + This code 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 + along with this code. If not, see . -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). + Copyright (C) 2018- Mathias Vångö, JKU Linz, Austria Class temporalSmoothing +Description + Smoothens a field using a temporal relaxation approach with a specified + reference field. + SourceFiles temporalSmoothing.C - \*---------------------------------------------------------------------------*/ #ifndef temporalSmoothing_H