From 34986849bec2a3ed7e9af9f62ad907c0dcf6fffc Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 18 Apr 2011 12:36:40 +0100 Subject: [PATCH] STYLE: Updated solver code --- .../mdEquilibrationFoam/mdEquilibrationFoam.C | 23 +++++++++++-------- .../molecularDynamics/mdFoam/mdFoam.C | 19 ++++++++------- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C index c8ed4e2cbd..96c07a1756 100644 --- a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C +++ b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,10 +34,11 @@ Description int main(int argc, char *argv[]) { + #include "setRootCase.H" + #include "createTime.H" + #include "createMesh.H" -# include "setRootCase.H" -# include "createTime.H" -# include "createMesh.H" + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nReading field U\n" << endl; volVectorField U @@ -57,9 +58,9 @@ int main(int argc, char *argv[]) moleculeCloud molecules(mesh, pot); -# include "temperatureAndPressureVariables.H" + #include "temperatureAndPressureVariables.H" -# include "readmdEquilibrationDict.H" + #include "readmdEquilibrationDict.H" label nAveragingSteps = 0; @@ -67,18 +68,17 @@ int main(int argc, char *argv[]) while (runTime.loop()) { - nAveragingSteps++; Info<< "Time = " << runTime.timeName() << endl; molecules.evolve(); -# include "meanMomentumEnergyAndNMols.H" + #include "meanMomentumEnergyAndNMols.H" -# include "temperatureAndPressure.H" + #include "temperatureAndPressure.H" -# include "temperatureEquilibration.H" + #include "temperatureEquilibration.H" runTime.write(); @@ -96,3 +96,6 @@ int main(int argc, char *argv[]) return 0; } + + +// ************************************************************************* // diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C b/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C index 6bd90a8128..779172803d 100644 --- a/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C +++ b/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,10 +34,11 @@ Description int main(int argc, char *argv[]) { + #include "setRootCase.H" + #include "createTime.H" + #include "createMesh.H" -# include "setRootCase.H" -# include "createTime.H" -# include "createMesh.H" + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nReading field U\n" << endl; volVectorField U @@ -57,7 +58,7 @@ int main(int argc, char *argv[]) moleculeCloud molecules(mesh, pot); -# include "temperatureAndPressureVariables.H" + #include "temperatureAndPressureVariables.H" label nAveragingSteps = 0; @@ -65,16 +66,15 @@ int main(int argc, char *argv[]) while (runTime.loop()) { - nAveragingSteps++; Info<< "Time = " << runTime.timeName() << endl; molecules.evolve(); -# include "meanMomentumEnergyAndNMols.H" + #include "meanMomentumEnergyAndNMols.H" -# include "temperatureAndPressure.H" + #include "temperatureAndPressure.H" runTime.write(); @@ -92,3 +92,6 @@ int main(int argc, char *argv[]) return 0; } + + +// ************************************************************************* //