From ca47917abef473752cb7e4247cb36dc81972495e Mon Sep 17 00:00:00 2001 From: BehradEsg Date: Fri, 7 Apr 2023 13:54:48 +0200 Subject: [PATCH] rename variables and readme files --- applications/solvers/cfdemSolverPimple/UEqn.H | 10 +++++----- applications/solvers/cfdemSolverPimple/pEqn.H | 18 +++++++++--------- .../{ReadMe.txt => README.md} | 0 .../{ReadMe.txt => README.md} | 0 4 files changed, 14 insertions(+), 14 deletions(-) rename tutorials/cfdemSolverPimple/bubblingFluidizedBed_NoSmoothing/{ReadMe.txt => README.md} (100%) rename tutorials/cfdemSolverPimple/bubblingFluidizedBed_Smoothing/{ReadMe.txt => README.md} (100%) diff --git a/applications/solvers/cfdemSolverPimple/UEqn.H b/applications/solvers/cfdemSolverPimple/UEqn.H index ee28494a..022516ac 100644 --- a/applications/solvers/cfdemSolverPimple/UEqn.H +++ b/applications/solvers/cfdemSolverPimple/UEqn.H @@ -16,25 +16,25 @@ UEqn.relax(); fvOptions.constrain(UEqn); -volScalarField rUA = 1.0/UEqn.A(); +volScalarField rAU = 1.0/UEqn.A(); -surfaceScalarField rUAf("(1|A(U))", fvc::interpolate(rUA)); +surfaceScalarField rAUf("(1|A(U))", fvc::interpolate(rAU)); surfaceScalarField voidfractionf = fvc::interpolate(voidfraction); surfaceScalarField phicForces ( - fvc::interpolate(rUA*(Ksl*Us)/rho) & mesh.Sf() + fvc::interpolate(rAU*(Ksl*Us)/rho) & mesh.Sf() ); if (pimple.momentumPredictor() && (modelType=="B" || modelType=="Bfull")) { - solve(UEqn == fvc::reconstruct(phicForces/rUAf - fvc::snGrad(p)*mesh.magSf())); + solve(UEqn == fvc::reconstruct(phicForces/rAUf - fvc::snGrad(p)*mesh.magSf())); fvOptions.correct(U); } else if (pimple.momentumPredictor()) { - solve(UEqn == fvc::reconstruct(phicForces/rUAf - fvc::snGrad(p)*voidfractionf*mesh.magSf())); + solve(UEqn == fvc::reconstruct(phicForces/rAUf - fvc::snGrad(p)*voidfractionf*mesh.magSf())); fvOptions.correct(U); } diff --git a/applications/solvers/cfdemSolverPimple/pEqn.H b/applications/solvers/cfdemSolverPimple/pEqn.H index 3206f449..0e77ebdb 100644 --- a/applications/solvers/cfdemSolverPimple/pEqn.H +++ b/applications/solvers/cfdemSolverPimple/pEqn.H @@ -1,10 +1,10 @@ -volScalarField rUAvoidfraction("(voidfraction2|A(U))",rUA*voidfraction); +volScalarField rAUvoidfraction("(voidfraction2|A(U))",rAU*voidfraction); -surfaceScalarField rUAfvoidfraction("(voidfraction2|A(U)F)", fvc::interpolate(rUAvoidfraction)); +surfaceScalarField rAUfvoidfraction("(voidfraction2|A(U)F)", fvc::interpolate(rAUvoidfraction)); volVectorField HbyA("HbyA", U); -HbyA = rUA*UEqn.H(); +HbyA = rAU*UEqn.H(); phi = voidfractionf*phiByVoidfraction; @@ -14,27 +14,27 @@ surfaceScalarField phiHbyA ( (fvc::interpolate(HbyA) & mesh.Sf() ) + phicForces //explicit contribution - + rUAfvoidfraction*fvc::ddtCorr(U, phiByVoidfraction) //correction + + rAUfvoidfraction*fvc::ddtCorr(U, phiByVoidfraction) //correction ) ); if (modelType=="A") - rUAvoidfraction = volScalarField("(voidfraction2|A(U))",rUA*voidfraction*voidfraction); + rAUvoidfraction = volScalarField("(voidfraction2|A(U))",rAU*voidfraction*voidfraction); // Update the fixedFluxPressure BCs to ensure flux consistency if (modelType=="A") { - volScalarField rUsed = rUA*voidfraction; + volScalarField rUsed = rAU*voidfraction; constrainPressure(p, U, phiHbyA, rUsed,MRF); } -else constrainPressure(p, U, phiHbyA, rUA,MRF); +else constrainPressure(p, U, phiHbyA, rAU,MRF); while (pimple.correctNonOrthogonal()) { // Pressure corrector fvScalarMatrix pEqn ( - fvm::laplacian(rUAvoidfraction, p) == fvc::div(voidfractionf*phiHbyA) + particleCloud.ddtVoidfraction() + fvm::laplacian(rAUvoidfraction, p) == fvc::div(voidfractionf*phiHbyA) + particleCloud.ddtVoidfraction() ); pEqn.setReference(pRefCell, pRefValue); @@ -51,7 +51,7 @@ while (pimple.correctNonOrthogonal()) p.relax(); U = fvc::reconstruct(phiHbyA) - - rUA*fvc::reconstruct(pEqn.flux()/voidfractionf/rUAf); + - rAU*fvc::reconstruct(pEqn.flux()/voidfractionf/rAUf); U.correctBoundaryConditions(); fvOptions.correct(U); diff --git a/tutorials/cfdemSolverPimple/bubblingFluidizedBed_NoSmoothing/ReadMe.txt b/tutorials/cfdemSolverPimple/bubblingFluidizedBed_NoSmoothing/README.md similarity index 100% rename from tutorials/cfdemSolverPimple/bubblingFluidizedBed_NoSmoothing/ReadMe.txt rename to tutorials/cfdemSolverPimple/bubblingFluidizedBed_NoSmoothing/README.md diff --git a/tutorials/cfdemSolverPimple/bubblingFluidizedBed_Smoothing/ReadMe.txt b/tutorials/cfdemSolverPimple/bubblingFluidizedBed_Smoothing/README.md similarity index 100% rename from tutorials/cfdemSolverPimple/bubblingFluidizedBed_Smoothing/ReadMe.txt rename to tutorials/cfdemSolverPimple/bubblingFluidizedBed_Smoothing/README.md