Revert "ENH: Updated forces and forceCoeffs bin writing"

This reverts commit 1e711927a7.
This commit is contained in:
andy
2013-09-25 16:12:06 +01:00
parent 7e98a2c00c
commit 4a37b52dca
2 changed files with 49 additions and 36 deletions

View File

@ -63,14 +63,16 @@ void Foam::forceCoeffs::writeFileHeader(const label i)
<< "# bins : " << nBin_ << nl
<< "# start : " << binMin_ << nl
<< "# delta : " << binDx_ << nl
<< "# direction : " << binDir_ << nl;
<< "# direction : " << binDir_ << nl
<< "# Time";
for (label j = 0; j < nBin_; j++)
{
const word jn = Foam::name(j);
file(i)
<< "# Time"
<< tab << "bin"
<< tab << "Cm"
<< tab << "Cd"
<< tab << "Cl";
<< tab << "Cm" << jn << tab << "Cd" << jn << tab << "Cl" << jn;
}
}
else
{
@ -214,16 +216,17 @@ void Foam::forceCoeffs::write()
}
}
file(1)<< obr_.time().value();
forAll(coeffs[0], i)
{
file(1)
<< obr_.time().value()
<< tab << i
<< tab << coeffs[2][i]
<< tab << coeffs[1][i]
<< tab << coeffs[0][i]
<< endl;
<< tab << coeffs[0][i];
}
file(1) << endl;
}
if (log_)

View File

@ -94,19 +94,29 @@ void Foam::forces::writeFileHeader(const label i)
<< "# bins : " << nBin_ << nl
<< "# start : " << binMin_ << nl
<< "# delta : " << binDx_ << nl
<< "# direction : " << binDir_ << nl;
<< "# direction : " << binDir_ << nl
<< "# Time";
for (label j = 0; j < nBin_; j++)
{
const word jn = Foam::name(j);
file(i)
<< "# Time"
<< tab << "bin"
<< tab << "forces(pressure,viscous,porous)"
<< tab << "moment(pressure,viscous,porous)";
<< tab
<< "forces" << jn << "(pressure,viscous,porous) "
<< "moment" << jn << "(pressure,viscous,porous)";
}
if (localSystem_)
{
for (label j = 0; j < nBin_; j++)
{
const word jn = Foam::name(j);
file(i)
<< tab << "localForces(pressure,viscous,porous)"
<< tab << "localMoment(pressure,viscous,porous)";
<< tab
<< "localForces" << jn << "(pressure,viscous,porous) "
<< "localMoments" << jn << "(pressure,viscous,porous)";
}
}
}
else
@ -425,17 +435,27 @@ void Foam::forces::writeBins()
f[0][i] += f[0][i-1];
f[1][i] += f[1][i-1];
f[2][i] += f[2][i-1];
m[0][i] += m[0][i-1];
m[1][i] += m[1][i-1];
m[2][i] += m[2][i-1];
}
}
List<Field<vector> > lf(3);
List<Field<vector> > lm(3);
file(1) << obr_.time().value();
forAll(f[0], i)
{
file(1)
<< tab
<< "(" << f[0][i] << "," << f[1][i] << "," << f[2][i] << ") "
<< "(" << m[0][i] << "," << m[1][i] << "," << m[2][i] << ")";
}
if (localSystem_)
{
List<Field<vector> > lf(3);
List<Field<vector> > lm(3);
lf[0] = coordSys_.localVector(force_[0]);
lf[1] = coordSys_.localVector(force_[1]);
lf[2] = coordSys_.localVector(force_[2]);
@ -455,27 +475,17 @@ void Foam::forces::writeBins()
lm[2][i] += lm[2][i-1];
}
}
}
forAll(f[0], i)
{
file(1)
<< obr_.time().value()
<< tab << i
<< tab << "(" << f[0][i] << "," << f[1][i] << "," << f[2][i] << ")"
<< tab << "(" << m[0][i] << "," << m[1][i] << "," << m[2][i] << ")";
if (localSystem_)
forAll(lf[0], i)
{
file(1)
<< tab
<< "(" << lf[0][i] << "," << lf[1][i] << "," << lf[2][i] << ")"
<< tab
<< "(" << lf[0][i] << "," << lf[1][i] << "," << lf[2][i] << ") "
<< "(" << lm[0][i] << "," << lm[1][i] << "," << lm[2][i] << ")";
}
}
file(1) << endl;
}
}