diff --git a/applications/solvers/DNSandLES/dnsFoam/FoamX/defaults/constant/turbulenceProperties b/applications/solvers/DNS/dnsFoam/FoamX/defaults/constant/turbulenceProperties similarity index 100% rename from applications/solvers/DNSandLES/dnsFoam/FoamX/defaults/constant/turbulenceProperties rename to applications/solvers/DNS/dnsFoam/FoamX/defaults/constant/turbulenceProperties diff --git a/applications/solvers/DNSandLES/dnsFoam/FoamX/defaults/system/fvSchemes b/applications/solvers/DNS/dnsFoam/FoamX/defaults/system/fvSchemes similarity index 100% rename from applications/solvers/DNSandLES/dnsFoam/FoamX/defaults/system/fvSchemes rename to applications/solvers/DNS/dnsFoam/FoamX/defaults/system/fvSchemes diff --git a/applications/solvers/DNSandLES/dnsFoam/FoamX/defaults/system/fvSolution b/applications/solvers/DNS/dnsFoam/FoamX/defaults/system/fvSolution similarity index 100% rename from applications/solvers/DNSandLES/dnsFoam/FoamX/defaults/system/fvSolution rename to applications/solvers/DNS/dnsFoam/FoamX/defaults/system/fvSolution diff --git a/applications/solvers/DNSandLES/dnsFoam/FoamX/dnsFoam.cfg b/applications/solvers/DNS/dnsFoam/FoamX/dnsFoam.cfg similarity index 100% rename from applications/solvers/DNSandLES/dnsFoam/FoamX/dnsFoam.cfg rename to applications/solvers/DNS/dnsFoam/FoamX/dnsFoam.cfg diff --git a/applications/solvers/DNSandLES/dnsFoam/FoamX/fvSchemes.cfg b/applications/solvers/DNS/dnsFoam/FoamX/fvSchemes.cfg similarity index 100% rename from applications/solvers/DNSandLES/dnsFoam/FoamX/fvSchemes.cfg rename to applications/solvers/DNS/dnsFoam/FoamX/fvSchemes.cfg diff --git a/applications/solvers/DNSandLES/dnsFoam/FoamX/fvSolution.cfg b/applications/solvers/DNS/dnsFoam/FoamX/fvSolution.cfg similarity index 100% rename from applications/solvers/DNSandLES/dnsFoam/FoamX/fvSolution.cfg rename to applications/solvers/DNS/dnsFoam/FoamX/fvSolution.cfg diff --git a/applications/solvers/DNSandLES/dnsFoam/FoamX/turbulenceProperties.cfg b/applications/solvers/DNS/dnsFoam/FoamX/turbulenceProperties.cfg similarity index 100% rename from applications/solvers/DNSandLES/dnsFoam/FoamX/turbulenceProperties.cfg rename to applications/solvers/DNS/dnsFoam/FoamX/turbulenceProperties.cfg diff --git a/applications/solvers/DNSandLES/dnsFoam/Make/files b/applications/solvers/DNS/dnsFoam/Make/files similarity index 100% rename from applications/solvers/DNSandLES/dnsFoam/Make/files rename to applications/solvers/DNS/dnsFoam/Make/files diff --git a/applications/solvers/DNSandLES/dnsFoam/Make/options b/applications/solvers/DNS/dnsFoam/Make/options similarity index 100% rename from applications/solvers/DNSandLES/dnsFoam/Make/options rename to applications/solvers/DNS/dnsFoam/Make/options diff --git a/applications/solvers/DNSandLES/dnsFoam/createFields.H b/applications/solvers/DNS/dnsFoam/createFields.H similarity index 100% rename from applications/solvers/DNSandLES/dnsFoam/createFields.H rename to applications/solvers/DNS/dnsFoam/createFields.H diff --git a/applications/solvers/DNSandLES/dnsFoam/dnsFoam.C b/applications/solvers/DNS/dnsFoam/dnsFoam.C similarity index 100% rename from applications/solvers/DNSandLES/dnsFoam/dnsFoam.C rename to applications/solvers/DNS/dnsFoam/dnsFoam.C diff --git a/applications/solvers/DNSandLES/dnsFoam/globalProperties.H b/applications/solvers/DNS/dnsFoam/globalProperties.H similarity index 100% rename from applications/solvers/DNSandLES/dnsFoam/globalProperties.H rename to applications/solvers/DNS/dnsFoam/globalProperties.H diff --git a/applications/solvers/DNSandLES/dnsFoam/readTransportProperties.H b/applications/solvers/DNS/dnsFoam/readTransportProperties.H similarity index 100% rename from applications/solvers/DNSandLES/dnsFoam/readTransportProperties.H rename to applications/solvers/DNS/dnsFoam/readTransportProperties.H diff --git a/applications/solvers/DNSandLES/dnsFoam/readTurbulenceProperties.H b/applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H similarity index 100% rename from applications/solvers/DNSandLES/dnsFoam/readTurbulenceProperties.H rename to applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H diff --git a/applications/solvers/DNSandLES/coodles/FoamX/coodles.cfg b/applications/solvers/compressible/coodles/FoamX/coodles.cfg similarity index 100% rename from applications/solvers/DNSandLES/coodles/FoamX/coodles.cfg rename to applications/solvers/compressible/coodles/FoamX/coodles.cfg diff --git a/applications/solvers/DNSandLES/coodles/FoamX/defaults/system/fvSchemes b/applications/solvers/compressible/coodles/FoamX/defaults/system/fvSchemes similarity index 100% rename from applications/solvers/DNSandLES/coodles/FoamX/defaults/system/fvSchemes rename to applications/solvers/compressible/coodles/FoamX/defaults/system/fvSchemes diff --git a/applications/solvers/DNSandLES/coodles/FoamX/defaults/system/fvSolution b/applications/solvers/compressible/coodles/FoamX/defaults/system/fvSolution similarity index 100% rename from applications/solvers/DNSandLES/coodles/FoamX/defaults/system/fvSolution rename to applications/solvers/compressible/coodles/FoamX/defaults/system/fvSolution diff --git a/applications/solvers/DNSandLES/coodles/FoamX/fvSchemes.cfg b/applications/solvers/compressible/coodles/FoamX/fvSchemes.cfg similarity index 100% rename from applications/solvers/DNSandLES/coodles/FoamX/fvSchemes.cfg rename to applications/solvers/compressible/coodles/FoamX/fvSchemes.cfg diff --git a/applications/solvers/DNSandLES/coodles/FoamX/fvSchemes/divSchemes.cfg b/applications/solvers/compressible/coodles/FoamX/fvSchemes/divSchemes.cfg similarity index 100% rename from applications/solvers/DNSandLES/coodles/FoamX/fvSchemes/divSchemes.cfg rename to applications/solvers/compressible/coodles/FoamX/fvSchemes/divSchemes.cfg diff --git a/applications/solvers/DNSandLES/coodles/FoamX/fvSchemes/gradSchemes.cfg b/applications/solvers/compressible/coodles/FoamX/fvSchemes/gradSchemes.cfg similarity index 100% rename from applications/solvers/DNSandLES/coodles/FoamX/fvSchemes/gradSchemes.cfg rename to applications/solvers/compressible/coodles/FoamX/fvSchemes/gradSchemes.cfg diff --git a/applications/solvers/DNSandLES/coodles/FoamX/fvSchemes/interpolationSchemes.cfg b/applications/solvers/compressible/coodles/FoamX/fvSchemes/interpolationSchemes.cfg similarity index 100% rename from applications/solvers/DNSandLES/coodles/FoamX/fvSchemes/interpolationSchemes.cfg rename to applications/solvers/compressible/coodles/FoamX/fvSchemes/interpolationSchemes.cfg diff --git a/applications/solvers/DNSandLES/coodles/FoamX/fvSchemes/laplacianSchemes.cfg b/applications/solvers/compressible/coodles/FoamX/fvSchemes/laplacianSchemes.cfg similarity index 100% rename from applications/solvers/DNSandLES/coodles/FoamX/fvSchemes/laplacianSchemes.cfg rename to applications/solvers/compressible/coodles/FoamX/fvSchemes/laplacianSchemes.cfg diff --git a/applications/solvers/DNSandLES/coodles/FoamX/fvSolution.cfg b/applications/solvers/compressible/coodles/FoamX/fvSolution.cfg similarity index 100% rename from applications/solvers/DNSandLES/coodles/FoamX/fvSolution.cfg rename to applications/solvers/compressible/coodles/FoamX/fvSolution.cfg diff --git a/applications/solvers/DNSandLES/coodles/Make/files b/applications/solvers/compressible/coodles/Make/files similarity index 100% rename from applications/solvers/DNSandLES/coodles/Make/files rename to applications/solvers/compressible/coodles/Make/files diff --git a/applications/solvers/DNSandLES/coodles/Make/options b/applications/solvers/compressible/coodles/Make/options similarity index 100% rename from applications/solvers/DNSandLES/coodles/Make/options rename to applications/solvers/compressible/coodles/Make/options diff --git a/applications/solvers/DNSandLES/coodles/UEqn.H b/applications/solvers/compressible/coodles/UEqn.H similarity index 100% rename from applications/solvers/DNSandLES/coodles/UEqn.H rename to applications/solvers/compressible/coodles/UEqn.H diff --git a/applications/solvers/DNSandLES/coodles/coodles.C b/applications/solvers/compressible/coodles/coodles.C similarity index 100% rename from applications/solvers/DNSandLES/coodles/coodles.C rename to applications/solvers/compressible/coodles/coodles.C diff --git a/applications/solvers/DNSandLES/coodles/createFields.H b/applications/solvers/compressible/coodles/createFields.H similarity index 100% rename from applications/solvers/DNSandLES/coodles/createFields.H rename to applications/solvers/compressible/coodles/createFields.H diff --git a/applications/solvers/DNSandLES/coodles/hEqn.H b/applications/solvers/compressible/coodles/hEqn.H similarity index 100% rename from applications/solvers/DNSandLES/coodles/hEqn.H rename to applications/solvers/compressible/coodles/hEqn.H diff --git a/applications/solvers/DNSandLES/coodles/pEqn.H b/applications/solvers/compressible/coodles/pEqn.H similarity index 100% rename from applications/solvers/DNSandLES/coodles/pEqn.H rename to applications/solvers/compressible/coodles/pEqn.H diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C index f0c0409fb9..0be52e772f 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C @@ -43,23 +43,20 @@ Description int main(int argc, char *argv[]) { - -# include "setRootCase.H" -# include "createTime.H" -# include "createMesh.H" -# include "createFields.H" -# include "initContinuityErrs.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + #include "setRootCase.H" + #include "createTime.H" + #include "createMesh.H" + #include "createFields.H" + #include "initContinuityErrs.H" Info<< "\nStarting time loop\n" << endl; while (runTime.run()) { -# include "readTimeControls.H" -# include "readPIMPLEControls.H" -# include "compressibleCourantNo.H" -# include "setDeltaT.H" + #include "readTimeControls.H" + #include "readPIMPLEControls.H" + #include "compressibleCourantNo.H" + #include "setDeltaT.H" runTime++; @@ -75,13 +72,13 @@ int main(int argc, char *argv[]) int oCorr=0; do { -# include "UEqn.H" -# include "hEqn.H" + #include "UEqn.H" + #include "hEqn.H" // --- PISO loop for (int corr=0; corrcorrect(); diff --git a/applications/solvers/compressible/sonicLiquidFoam/createFields.H b/applications/solvers/compressible/sonicLiquidFoam/createFields.H index 57eec4cb92..f419234c7d 100644 --- a/applications/solvers/compressible/sonicLiquidFoam/createFields.H +++ b/applications/solvers/compressible/sonicLiquidFoam/createFields.H @@ -37,8 +37,7 @@ IOobject::NO_READ, IOobject::AUTO_WRITE ), - rho0 + psi*(p - p0), - p.boundaryField().types() + rhoO + psi*p ); diff --git a/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C b/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C index 8f2363a5ad..2fc6eee627 100644 --- a/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C +++ b/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C @@ -26,7 +26,7 @@ Application sonicLiquidFoam Description - Transient solver for trans-sonic/supersonic, laminar flow of a + Transient solver for trans-sonic/supersonic, laminar flow of a compressible liquid. \*---------------------------------------------------------------------------*/ diff --git a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/files b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/files index 5dccac44bc..79ebcd90aa 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/files +++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/files @@ -1,4 +1,4 @@ buoyantSimpleRadiationFoam.C -EXE = $(FOAM_USER_APPBIN)/buoyantSimpleRadiationFoam +EXE = $(FOAM_APPBIN)/buoyantSimpleRadiationFoam diff --git a/applications/solvers/DNSandLES/channelOodles/FoamX/channelOodles.cfg b/applications/solvers/incompressible/channelOodles/FoamX/channelOodles.cfg similarity index 100% rename from applications/solvers/DNSandLES/channelOodles/FoamX/channelOodles.cfg rename to applications/solvers/incompressible/channelOodles/FoamX/channelOodles.cfg diff --git a/applications/solvers/DNSandLES/channelOodles/FoamX/defaults/system/fvSchemes b/applications/solvers/incompressible/channelOodles/FoamX/defaults/system/fvSchemes similarity index 100% rename from applications/solvers/DNSandLES/channelOodles/FoamX/defaults/system/fvSchemes rename to applications/solvers/incompressible/channelOodles/FoamX/defaults/system/fvSchemes diff --git a/applications/solvers/DNSandLES/channelOodles/FoamX/defaults/system/fvSolution b/applications/solvers/incompressible/channelOodles/FoamX/defaults/system/fvSolution similarity index 100% rename from applications/solvers/DNSandLES/channelOodles/FoamX/defaults/system/fvSolution rename to applications/solvers/incompressible/channelOodles/FoamX/defaults/system/fvSolution diff --git a/applications/solvers/DNSandLES/channelOodles/FoamX/fvSchemes.cfg b/applications/solvers/incompressible/channelOodles/FoamX/fvSchemes.cfg similarity index 100% rename from applications/solvers/DNSandLES/channelOodles/FoamX/fvSchemes.cfg rename to applications/solvers/incompressible/channelOodles/FoamX/fvSchemes.cfg diff --git a/applications/solvers/DNSandLES/channelOodles/FoamX/fvSolution.cfg b/applications/solvers/incompressible/channelOodles/FoamX/fvSolution.cfg similarity index 100% rename from applications/solvers/DNSandLES/channelOodles/FoamX/fvSolution.cfg rename to applications/solvers/incompressible/channelOodles/FoamX/fvSolution.cfg diff --git a/applications/solvers/DNSandLES/channelOodles/FoamX/transportProperties.cfg b/applications/solvers/incompressible/channelOodles/FoamX/transportProperties.cfg similarity index 100% rename from applications/solvers/DNSandLES/channelOodles/FoamX/transportProperties.cfg rename to applications/solvers/incompressible/channelOodles/FoamX/transportProperties.cfg diff --git a/applications/solvers/DNSandLES/channelOodles/Make/files b/applications/solvers/incompressible/channelOodles/Make/files similarity index 100% rename from applications/solvers/DNSandLES/channelOodles/Make/files rename to applications/solvers/incompressible/channelOodles/Make/files diff --git a/applications/solvers/DNSandLES/channelOodles/Make/options b/applications/solvers/incompressible/channelOodles/Make/options similarity index 100% rename from applications/solvers/DNSandLES/channelOodles/Make/options rename to applications/solvers/incompressible/channelOodles/Make/options diff --git a/applications/solvers/DNSandLES/channelOodles/channelOodles.C b/applications/solvers/incompressible/channelOodles/channelOodles.C similarity index 100% rename from applications/solvers/DNSandLES/channelOodles/channelOodles.C rename to applications/solvers/incompressible/channelOodles/channelOodles.C diff --git a/applications/solvers/DNSandLES/channelOodles/createFields.H b/applications/solvers/incompressible/channelOodles/createFields.H similarity index 100% rename from applications/solvers/DNSandLES/channelOodles/createFields.H rename to applications/solvers/incompressible/channelOodles/createFields.H diff --git a/applications/solvers/DNSandLES/channelOodles/createGradP.H b/applications/solvers/incompressible/channelOodles/createGradP.H similarity index 100% rename from applications/solvers/DNSandLES/channelOodles/createGradP.H rename to applications/solvers/incompressible/channelOodles/createGradP.H diff --git a/applications/solvers/DNSandLES/channelOodles/readTransportProperties.H b/applications/solvers/incompressible/channelOodles/readTransportProperties.H similarity index 100% rename from applications/solvers/DNSandLES/channelOodles/readTransportProperties.H rename to applications/solvers/incompressible/channelOodles/readTransportProperties.H diff --git a/applications/solvers/DNSandLES/channelOodles/writeGradP.H b/applications/solvers/incompressible/channelOodles/writeGradP.H similarity index 100% rename from applications/solvers/DNSandLES/channelOodles/writeGradP.H rename to applications/solvers/incompressible/channelOodles/writeGradP.H diff --git a/applications/solvers/DNSandLES/oodles/FoamX/defaults/system/fvSchemes b/applications/solvers/incompressible/oodles/FoamX/defaults/system/fvSchemes similarity index 100% rename from applications/solvers/DNSandLES/oodles/FoamX/defaults/system/fvSchemes rename to applications/solvers/incompressible/oodles/FoamX/defaults/system/fvSchemes diff --git a/applications/solvers/DNSandLES/oodles/FoamX/defaults/system/fvSolution b/applications/solvers/incompressible/oodles/FoamX/defaults/system/fvSolution similarity index 100% rename from applications/solvers/DNSandLES/oodles/FoamX/defaults/system/fvSolution rename to applications/solvers/incompressible/oodles/FoamX/defaults/system/fvSolution diff --git a/applications/solvers/DNSandLES/oodles/FoamX/fvSchemes.cfg b/applications/solvers/incompressible/oodles/FoamX/fvSchemes.cfg similarity index 100% rename from applications/solvers/DNSandLES/oodles/FoamX/fvSchemes.cfg rename to applications/solvers/incompressible/oodles/FoamX/fvSchemes.cfg diff --git a/applications/solvers/DNSandLES/oodles/FoamX/fvSchemes/divSchemes.cfg b/applications/solvers/incompressible/oodles/FoamX/fvSchemes/divSchemes.cfg similarity index 100% rename from applications/solvers/DNSandLES/oodles/FoamX/fvSchemes/divSchemes.cfg rename to applications/solvers/incompressible/oodles/FoamX/fvSchemes/divSchemes.cfg diff --git a/applications/solvers/DNSandLES/oodles/FoamX/fvSchemes/laplacianSchemes.cfg b/applications/solvers/incompressible/oodles/FoamX/fvSchemes/laplacianSchemes.cfg similarity index 100% rename from applications/solvers/DNSandLES/oodles/FoamX/fvSchemes/laplacianSchemes.cfg rename to applications/solvers/incompressible/oodles/FoamX/fvSchemes/laplacianSchemes.cfg diff --git a/applications/solvers/DNSandLES/oodles/FoamX/fvSolution.cfg b/applications/solvers/incompressible/oodles/FoamX/fvSolution.cfg similarity index 100% rename from applications/solvers/DNSandLES/oodles/FoamX/fvSolution.cfg rename to applications/solvers/incompressible/oodles/FoamX/fvSolution.cfg diff --git a/applications/solvers/DNSandLES/oodles/FoamX/oodles.cfg b/applications/solvers/incompressible/oodles/FoamX/oodles.cfg similarity index 100% rename from applications/solvers/DNSandLES/oodles/FoamX/oodles.cfg rename to applications/solvers/incompressible/oodles/FoamX/oodles.cfg diff --git a/applications/solvers/DNSandLES/oodles/Make/files b/applications/solvers/incompressible/oodles/Make/files similarity index 100% rename from applications/solvers/DNSandLES/oodles/Make/files rename to applications/solvers/incompressible/oodles/Make/files diff --git a/applications/solvers/DNSandLES/oodles/Make/options b/applications/solvers/incompressible/oodles/Make/options similarity index 100% rename from applications/solvers/DNSandLES/oodles/Make/options rename to applications/solvers/incompressible/oodles/Make/options diff --git a/applications/solvers/DNSandLES/oodles/createFields.H b/applications/solvers/incompressible/oodles/createFields.H similarity index 100% rename from applications/solvers/DNSandLES/oodles/createFields.H rename to applications/solvers/incompressible/oodles/createFields.H diff --git a/applications/solvers/DNSandLES/oodles/oodles.C b/applications/solvers/incompressible/oodles/oodles.C similarity index 100% rename from applications/solvers/DNSandLES/oodles/oodles.C rename to applications/solvers/incompressible/oodles/oodles.C diff --git a/applications/solvers/molecularDynamics/gnemdFoam/Make/files b/applications/solvers/molecularDynamics/gnemdFoam/Make/files new file mode 100755 index 0000000000..b59e704979 --- /dev/null +++ b/applications/solvers/molecularDynamics/gnemdFoam/Make/files @@ -0,0 +1,3 @@ +gnemdFoam.C + +EXE = $(FOAM_APPBIN)/gnemdFoam diff --git a/applications/solvers/molecularDynamics/gnemdFoam/Make/options b/applications/solvers/molecularDynamics/gnemdFoam/Make/options new file mode 100755 index 0000000000..80f9773456 --- /dev/null +++ b/applications/solvers/molecularDynamics/gnemdFoam/Make/options @@ -0,0 +1,11 @@ +EXE_INC = \ + -I$(LIB_SRC)/lagrangian/molecule/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/lagrangian/basic/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude + +EXE_LIBS = \ + -lmeshTools \ + -lfiniteVolume \ + -llagrangian \ + -lmolecule diff --git a/applications/solvers/molecularDynamics/gnemdFoam/gnemdFoam.C b/applications/solvers/molecularDynamics/gnemdFoam/gnemdFoam.C new file mode 100755 index 0000000000..0356c42fd2 --- /dev/null +++ b/applications/solvers/molecularDynamics/gnemdFoam/gnemdFoam.C @@ -0,0 +1,90 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 1991-2005 OpenCFD Ltd. + \\/ 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 2 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, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +Application + gnemdFOAM + +Description + MD for Fluid Mechanics and hybridising with a continuum solver. + +\*---------------------------------------------------------------------------*/ + +#include "fvCFD.H" +#include "md.H" + +int main(int argc, char *argv[]) +{ + +# include "setRootCase.H" +# include "createTime.H" +# include "createMesh.H" + + moleculeCloud molecules(mesh); + +# include "createMDFields.H" + + molecules.removeHighEnergyOverlaps(); + +# include "temperatureAndPressureVariables.H" + + label nAveragingSteps = 0; + + Info << "\nStarting time loop\n" << endl; + + while (runTime.run()) + { + runTime++; + + nAveragingSteps++; + + Info << "Time = " << runTime.timeName() << endl; + + molecules.integrateEquationsOfMotion(); + +# include "meanMomentumEnergyAndNMols.H" + +# include "temperatureAndPressure.H" + +# include "calculateMDFields.H" + +# include "averageMDFields.H" + + runTime.write(); + +# include "resetMDFields.H" + + if (runTime.outputTime()) + { + nAveragingSteps = 0; + } + + Info << "ExecutionTime = " << runTime.elapsedCpuTime() << " s" + << " ClockTime = " << runTime.elapsedClockTime() << " s" + << nl << endl; + } + + Info << "End\n" << endl; + + return(0); +} diff --git a/applications/solvers/molecularDynamics/mdEquilibrationFoam/Make/files b/applications/solvers/molecularDynamics/mdEquilibrationFoam/Make/files new file mode 100755 index 0000000000..c3a050bb68 --- /dev/null +++ b/applications/solvers/molecularDynamics/mdEquilibrationFoam/Make/files @@ -0,0 +1,3 @@ +mdEquilibrationFoam.C + +EXE = $(FOAM_APPBIN)/mdEquilibrationFoam diff --git a/applications/solvers/molecularDynamics/mdEquilibrationFoam/Make/options b/applications/solvers/molecularDynamics/mdEquilibrationFoam/Make/options new file mode 100755 index 0000000000..80f9773456 --- /dev/null +++ b/applications/solvers/molecularDynamics/mdEquilibrationFoam/Make/options @@ -0,0 +1,11 @@ +EXE_INC = \ + -I$(LIB_SRC)/lagrangian/molecule/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/lagrangian/basic/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude + +EXE_LIBS = \ + -lmeshTools \ + -lfiniteVolume \ + -llagrangian \ + -lmolecule diff --git a/applications/solvers/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C b/applications/solvers/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C new file mode 100755 index 0000000000..f98371327b --- /dev/null +++ b/applications/solvers/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C @@ -0,0 +1,86 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 1991-2005 OpenCFD Ltd. + \\/ 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 2 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, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +Application + mdEquilibrationFOAM + +Description + Equilibrates and/or preconditions MD systems + +\*---------------------------------------------------------------------------*/ + +#include "fvCFD.H" +#include "md.H" + +int main(int argc, char *argv[]) +{ + +# include "setRootCase.H" +# include "createTime.H" +# include "createMesh.H" + + moleculeCloud molecules(mesh); + + molecules.removeHighEnergyOverlaps(); + +# include "temperatureAndPressureVariables.H" + +# include "readmdEquilibrationDict.H" + + label nAveragingSteps = 0; + + Info << "\nStarting time loop\n" << endl; + + while (runTime.run()) + { + runTime++; + + nAveragingSteps++; + + Info << "Time = " << runTime.timeName() << endl; + + molecules.integrateEquationsOfMotion(); + +# include "meanMomentumEnergyAndNMols.H" + +# include "temperatureAndPressure.H" + +# include "temperatureEquilibration.H" + + runTime.write(); + + if (runTime.outputTime()) + { + nAveragingSteps = 0; + } + + Info << "ExecutionTime = " << runTime.elapsedCpuTime() << " s" + << " ClockTime = " << runTime.elapsedClockTime() << " s" + << nl << endl; + } + + Info << "End\n" << endl; + + return(0); +} diff --git a/applications/solvers/molecularDynamics/mdEquilibrationFoam/readmdEquilibrationDict.H b/applications/solvers/molecularDynamics/mdEquilibrationFoam/readmdEquilibrationDict.H new file mode 100755 index 0000000000..b205b5ae31 --- /dev/null +++ b/applications/solvers/molecularDynamics/mdEquilibrationFoam/readmdEquilibrationDict.H @@ -0,0 +1,18 @@ +Info<< "Reading MD Equilibration Dictionary" << nl << endl; + +IOdictionary mdEquilibrationDict +( + IOobject + ( + "mdEquilibrationDict", + runTime.system(), + mesh, + IOobject::MUST_READ, + IOobject::NO_WRITE + ) +); + +scalar targetTemperature = readScalar +( + mdEquilibrationDict.lookup("equilibrationTargetTemperature") +); diff --git a/applications/solvers/multiphase/compressibleLesInterFoam/Make/files b/applications/solvers/multiphase/compressibleLesInterFoam/Make/files index 0ec38b8d7a..05dafae8b1 100644 --- a/applications/solvers/multiphase/compressibleLesInterFoam/Make/files +++ b/applications/solvers/multiphase/compressibleLesInterFoam/Make/files @@ -1,3 +1,3 @@ compressibleLesInterFoam.C -EXE = $(FOAM_USER_APPBIN)/compressibleLesInterFoam +EXE = $(FOAM_APPBIN)/compressibleLesInterFoam diff --git a/applications/solvers/multiphase/lesCavitatingFoam/lesCavitatingFoam.C b/applications/solvers/multiphase/lesCavitatingFoam/lesCavitatingFoam.C index b66186d43c..31f5b90e13 100644 --- a/applications/solvers/multiphase/lesCavitatingFoam/lesCavitatingFoam.C +++ b/applications/solvers/multiphase/lesCavitatingFoam/lesCavitatingFoam.C @@ -23,9 +23,10 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Application - rasCavitatingFoam + lesCavitatingFoam Description + Transient cavitation code with LES turbulence. \*---------------------------------------------------------------------------*/ diff --git a/applications/solvers/multiphase/rasCavitatingFoam/rasCavitatingFoam.C b/applications/solvers/multiphase/rasCavitatingFoam/rasCavitatingFoam.C index 9ed182be37..bcc0b5441c 100644 --- a/applications/solvers/multiphase/rasCavitatingFoam/rasCavitatingFoam.C +++ b/applications/solvers/multiphase/rasCavitatingFoam/rasCavitatingFoam.C @@ -26,6 +26,7 @@ Application rasCavitatingFoam Description + Transient cavitation code with RAS turbulence. \*---------------------------------------------------------------------------*/ diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C index 5f6dcd8735..b3ddd44ff2 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C @@ -71,8 +71,8 @@ frictionalPressure const dimensionedScalar& eta, const dimensionedScalar& p ) const -{ - return +{ + return dimensionedScalar("1e24", dimensionSet(1, -1, -2, 0, 0), 1e24) *pow(Foam::max(alpha - alphaMinFriction, scalar(0)), 10.0); } @@ -89,7 +89,7 @@ frictionalPressurePrime const dimensionedScalar& p ) const { - return + return dimensionedScalar("1e25", dimensionSet(1, -1, -2, 0, 0), 1e25) *pow(Foam::max(alpha - alphaMinFriction, scalar(0)), 9.0); } @@ -129,8 +129,8 @@ Foam::tmp Foam::SchaefferFrictionalStress::muf { if (alpha[celli] > alphaMax.value()-5e-2) { - muf_[celli] = - 0.5*alpha[celli]*pf[celli]*sin(phi.value()) + muf_[celli] = + 0.5*pf[celli]*sin(phi.value()) /( sqrt(1.0/6.0*(sqr(D[celli].xx() - D[celli].yy()) + sqr(D[celli].yy() - D[celli].zz()) diff --git a/applications/test/dataEntry/Make/files b/applications/test/dataEntry/Make/files new file mode 100644 index 0000000000..abbd55d349 --- /dev/null +++ b/applications/test/dataEntry/Make/files @@ -0,0 +1,3 @@ +testDataEntry.C + +EXE = $(FOAM_APPBIN)/testDataEntry diff --git a/applications/test/dataEntry/Make/options b/applications/test/dataEntry/Make/options new file mode 100644 index 0000000000..cde1970d78 --- /dev/null +++ b/applications/test/dataEntry/Make/options @@ -0,0 +1,11 @@ +EXE_INC = \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude + +EXE_LIBS = \ + -lfiniteVolume \ + -llagrangianIntermediate \ + -lradiation \ + -lthermophysicalFunctions \ No newline at end of file diff --git a/applications/test/dataEntry/files b/applications/test/dataEntry/files new file mode 100644 index 0000000000..c7e4dc9043 --- /dev/null +++ b/applications/test/dataEntry/files @@ -0,0 +1,4 @@ +testTable.C + +EXE=$(FOAM_USER_APPBIN)/testTable + diff --git a/applications/utilities/postProcessing/turbulence/Rcomponents/Rcomponents.C b/applications/test/dataEntry/testDataEntry.C similarity index 51% rename from applications/utilities/postProcessing/turbulence/Rcomponents/Rcomponents.C rename to applications/test/dataEntry/testDataEntry.C index 37309756aa..0c7d9ba353 100644 --- a/applications/utilities/postProcessing/turbulence/Rcomponents/Rcomponents.C +++ b/applications/test/dataEntry/testDataEntry.C @@ -23,83 +23,64 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Application - Rcomponents + testDataEntry Description - Calculates and writes the scalar fields of the six components of the - Reynolds stress R for each time. + Tests lagrangian/intermediate/submodels/IO/DataEntry \*---------------------------------------------------------------------------*/ #include "fvCFD.H" +#include "DataEntry.H" +#include "IOdictionary.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // int main(int argc, char *argv[]) { - -# include "addTimeOptions.H" # include "setRootCase.H" - # include "createTime.H" - - // Get times list - instantList Times = runTime.times(); - - // set startTime and endTime depending on -time and -latestTime options -# include "checkTimeOptions.H" - - runTime.setTime(Times[startTime], startTime); - # include "createMesh.H" - for (label i=startTime; i > dataEntry + ( + DataEntry::New + ( + "dataEntry", + dataEntryProperties + ) + ); - Info<< " Reading R" << endl; - volSymmTensorField R(Rheader, mesh); + scalar x0 = readScalar(dataEntryProperties.lookup("x0")); + scalar x1 = readScalar(dataEntryProperties.lookup("x1")); - for (direction i=0; ix1) = " << dataEntry().integrate(x0, x1) << nl + << endl; return(0); } diff --git a/applications/utilities/mesh/advanced/refineHexMesh/Make/files b/applications/utilities/mesh/advanced/refineHexMesh/Make/files new file mode 100644 index 0000000000..824d6b0cd0 --- /dev/null +++ b/applications/utilities/mesh/advanced/refineHexMesh/Make/files @@ -0,0 +1,3 @@ +refineHexMesh.C +EXE = $(FOAM_APPBIN)/refineHexMesh + diff --git a/applications/utilities/mesh/advanced/refineHexMesh/Make/options b/applications/utilities/mesh/advanced/refineHexMesh/Make/options new file mode 100644 index 0000000000..376f4dff51 --- /dev/null +++ b/applications/utilities/mesh/advanced/refineHexMesh/Make/options @@ -0,0 +1,10 @@ +EXE_INC = \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/dynamicMesh/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude + + +EXE_LIBS = \ + -ldynamicMesh \ + -lmeshTools \ + -lfiniteVolume diff --git a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C new file mode 100644 index 0000000000..4bed4c059c --- /dev/null +++ b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C @@ -0,0 +1,185 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 1991-2007 OpenCFD Ltd. + \\/ 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 2 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, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +Description + Hex 2x2x2 refiner + +\*---------------------------------------------------------------------------*/ + +#include "fvMesh.H" +#include "pointMesh.H" +#include "argList.H" +#include "Time.H" +#include "hexRef8.H" +#include "cellSet.H" +#include "OFstream.H" +#include "meshTools.H" +#include "IFstream.H" +#include "polyTopoChange.H" +#include "mapPolyMesh.H" +#include "volMesh.H" +#include "surfaceMesh.H" +#include "volFields.H" +#include "surfaceFields.H" +#include "pointFields.H" +#include "ReadFields.H" + +using namespace Foam; + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// Main program: +int main(int argc, char *argv[]) +{ + argList::validArgs.append("cellSet"); +# include "setRootCase.H" +# include "createTime.H" +# include "createMesh.H" + pointMesh pMesh(mesh); + + word cellSetName(args.args()[1]); + + Info<< "Reading cells to refine from cellSet " << cellSetName + << nl << endl; + + cellSet cellsToRefine(mesh, cellSetName); + + Info<< "Read " << returnReduce(cellsToRefine.size(), sumOp