diff --git a/src/lagrangian/intermediate/particleForces/particleForces.C b/src/lagrangian/intermediate/particleForces/particleForces.C index 4f8fe1cfc7fb95196e11c22e496149b78302d42b..32dea7935826ef81acf2dfc575d66a2cabd60973 100644 --- a/src/lagrangian/intermediate/particleForces/particleForces.C +++ b/src/lagrangian/intermediate/particleForces/particleForces.C @@ -49,7 +49,7 @@ Foam::particleForces::particleForces Cvm_(0.0), pressureGradient_(dict_.lookup("pressureGradient")), paramagnetic_(dict_.lookup("paramagnetic")), - chi_(0.0), + magneticSusceptibility_(0.0), UName_(dict_.lookupOrDefault<word>("U", "U")), HName_(dict_.lookupOrDefault<word>("H", "H")) { @@ -60,7 +60,7 @@ Foam::particleForces::particleForces if (paramagnetic_) { - dict_.lookup("chi") >> chi_; + dict_.lookup("magneticSusceptibility") >> magneticSusceptibility_; } } @@ -77,7 +77,7 @@ Foam::particleForces::particleForces(const particleForces& f) Cvm_(f.Cvm_), pressureGradient_(f.pressureGradient_), paramagnetic_(f.paramagnetic_), - chi_(f.chi_), + magneticSusceptibility_(f.magneticSusceptibility_), UName_(f.UName_), HName_(f.HName_) {} @@ -135,9 +135,9 @@ Foam::Switch Foam::particleForces::paramagnetic() const } -Foam::scalar Foam::particleForces::chi() const +Foam::scalar Foam::particleForces::magneticSusceptibility() const { - return chi_; + return magneticSusceptibility_; } @@ -248,7 +248,7 @@ Foam::vector Foam::particleForces::calcNonCoupled Ftot += 3.0*constant::electromagnetic::mu0.value()/rho - *chi_/(chi_ + 3) + *magneticSusceptibility_/(magneticSusceptibility_ + 3) *(H[cellI] & gradH[cellI]); // force is: @@ -257,7 +257,7 @@ Foam::vector Foam::particleForces::calcNonCoupled // *constant::mathematical::pi // *constant::electromagnetic::mu0.value() // *pow3(d/2) - // *chi/(chi + 3) + // *magneticSusceptibility/(magneticSusceptibility + 3) // *(H[cellI] & gradH[cellI]); // which is divided by mass ((4/3)*pi*r^3*rho) to produce diff --git a/src/lagrangian/intermediate/particleForces/particleForces.H b/src/lagrangian/intermediate/particleForces/particleForces.H index 22299e34bd928f177bf60787c0e53384358f3cbd..a28ea06fdc9d9e375ad0e2217f183266814a77d8 100644 --- a/src/lagrangian/intermediate/particleForces/particleForces.H +++ b/src/lagrangian/intermediate/particleForces/particleForces.H @@ -91,7 +91,7 @@ class particleForces Switch paramagnetic_; //- Magnetic susceptibility of particle - scalar chi_; + scalar magneticSusceptibility_; // Additional info @@ -152,7 +152,7 @@ public: Switch paramagnetic() const; //- Return magnetic susceptibility - scalar chi() const; + scalar magneticSusceptibility() const; //- Return name of velocity field const word& HName() const;