zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG: sixDoF BCs - corrected output to Ostream

Browse Source
This commit is contained in:
andy
2014-01-20 14:10:03 +00:00
parent a9ce01c68f
commit ae73181bc1
30 changed files with 111 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/sixDoFRigidBodyMotion/Make/options
View File

@ -1,4 +1,5 @@
EXE_INC = \ EXE_INC = \
-DFULLDEBUG -g -O0 \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/postProcessing/functionObjects/forces/lnInclude \ -I$(LIB_SRC)/postProcessing/functionObjects/forces/lnInclude \

5
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -116,7 +116,7 @@ bool Foam::sixDoFRigidBodyMotionConstraints::axis::read
} }
void Foam::sixDoFRigidBodyMotionConstraints::axis::write void Foam::sixDoFRigidBodyMotionConstraints::axis::writeData
( (
Ostream& os Ostream& os
) const ) const
@ -125,4 +125,5 @@ void Foam::sixDoFRigidBodyMotionConstraints::axis::write
<< axis_ << token::END_STATEMENT << nl; << axis_ << token::END_STATEMENT << nl;
} }
// ************************************************************************* // // ************************************************************************* //

6
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -101,8 +101,8 @@ public:
//- Update properties from given dictionary //- Update properties from given dictionary
virtual bool read(const dictionary& sDoFRBMCCoeff); virtual bool read(const dictionary& sDoFRBMCCoeff);
//- Write //- Write model data
virtual void write(Ostream&) const; virtual void writeData(Ostream&) const;
}; };

5
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/line/sixDoFRigidBodyMotionLineConstraint.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -116,7 +116,7 @@ bool Foam::sixDoFRigidBodyMotionConstraints::line::read
} }
void Foam::sixDoFRigidBodyMotionConstraints::line::write void Foam::sixDoFRigidBodyMotionConstraints::line::writeData
( (
Ostream& os Ostream& os
) const ) const
@ -125,4 +125,5 @@ void Foam::sixDoFRigidBodyMotionConstraints::line::write
<< dir_ << token::END_STATEMENT << nl; << dir_ << token::END_STATEMENT << nl;
} }
// ************************************************************************* // // ************************************************************************* //

6
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/line/sixDoFRigidBodyMotionLineConstraint.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -100,8 +100,8 @@ public:
//- Update properties from given dictionary //- Update properties from given dictionary
virtual bool read(const dictionary& sDoFRBMCCoeff); virtual bool read(const dictionary& sDoFRBMCCoeff);
//- Write //- Write model data
virtual void write(Ostream&) const; virtual void writeData(Ostream&) const;
}; };

8
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/orientation/sixDoFRigidBodyMotionOrientationConstraint.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -96,11 +96,11 @@ bool Foam::sixDoFRigidBodyMotionConstraints::orientation::read
} }
void Foam::sixDoFRigidBodyMotionConstraints::orientation::write void Foam::sixDoFRigidBodyMotionConstraints::orientation::writeData
( (
Ostream& os Ostream& os
) const ) const
{ {}
}
// ************************************************************************* // // ************************************************************************* //

6
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/orientation/sixDoFRigidBodyMotionOrientationConstraint.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -94,8 +94,8 @@ public:
//- Update properties from given dictionary //- Update properties from given dictionary
virtual bool read(const dictionary& sDoFRBMCCoeff); virtual bool read(const dictionary& sDoFRBMCCoeff);
//- Write //- Write model data
virtual void write(Ostream&) const; virtual void writeData(Ostream&) const;
}; };

5
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/plane/sixDoFRigidBodyMotionPlaneConstraint.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -97,7 +97,7 @@ bool Foam::sixDoFRigidBodyMotionConstraints::plane::read
} }
void Foam::sixDoFRigidBodyMotionConstraints::plane::write void Foam::sixDoFRigidBodyMotionConstraints::plane::writeData
( (
Ostream& os Ostream& os
) const ) const
@ -106,4 +106,5 @@ void Foam::sixDoFRigidBodyMotionConstraints::plane::write
<< normal_ << token::END_STATEMENT << nl; << normal_ << token::END_STATEMENT << nl;
} }
// ************************************************************************* // // ************************************************************************* //

6
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/plane/sixDoFRigidBodyMotionPlaneConstraint.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -100,8 +100,8 @@ public:
//- Update properties from given dictionary //- Update properties from given dictionary
virtual bool read(const dictionary& sDoFRBMCCoeff); virtual bool read(const dictionary& sDoFRBMCCoeff);
//- Write //- Write model data
virtual void write(Ostream&) const; virtual void writeData(Ostream&) const;
}; };

5
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/point/sixDoFRigidBodyMotionPointConstraint.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -97,7 +97,7 @@ bool Foam::sixDoFRigidBodyMotionConstraints::point::read
} }
void Foam::sixDoFRigidBodyMotionConstraints::point::write void Foam::sixDoFRigidBodyMotionConstraints::point::writeData
( (
Ostream& os Ostream& os
) const ) const
@ -106,4 +106,5 @@ void Foam::sixDoFRigidBodyMotionConstraints::point::write
<< point_ << token::END_STATEMENT << nl; << point_ << token::END_STATEMENT << nl;
} }
// ************************************************************************* // // ************************************************************************* //

6
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/point/sixDoFRigidBodyMotionPointConstraint.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -103,8 +103,8 @@ public:
//- Update properties from given dictionary //- Update properties from given dictionary
virtual bool read(const dictionary& sDoFRBMCCoeff); virtual bool read(const dictionary& sDoFRBMCCoeff);
//- Write //- Write model data
virtual void write(Ostream&) const; virtual void writeData(Ostream&) const;
}; };

13
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -60,14 +60,21 @@ bool Foam::sixDoFRigidBodyMotionConstraint::read
const dictionary& sDoFRBMCDict const dictionary& sDoFRBMCDict
) )
{ {
sDoFRBMCCoeffs_ = sDoFRBMCDict; sDoFRBMCCoeffs_ = sDoFRBMCDict.subDict(type() + "Coeffs");
return true; return true;
} }
void Foam::sixDoFRigidBodyMotionConstraint::write(Ostream& os) const void Foam::sixDoFRigidBodyMotionConstraint::write(Ostream& os) const
{} {
os << indent << word(type() + "Coeffs") << nl
<< indent << token::BEGIN_BLOCK << nl << incrIndent;
writeData(os);
os << decrIndent << indent << token::END_BLOCK << endl;
}
// ************************************************************************* // // ************************************************************************* //

6
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -146,8 +146,12 @@ public:
return sDoFRBMCCoeffs_; return sDoFRBMCCoeffs_;
} }
//- Write //- Write
virtual void write(Ostream&) const; virtual void write(Ostream&) const;
//- Write model data
virtual void writeData(Ostream&) const = 0;
}; };

14
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraintNew.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -34,10 +34,7 @@ Foam::sixDoFRigidBodyMotionConstraint::New
const dictionary& sDoFRBMCDict const dictionary& sDoFRBMCDict
) )
{ {
const word constraintType const word constraintType(sDoFRBMCDict.lookup(typeName));
(
sDoFRBMCDict.lookup("sixDoFRigidBodyMotionConstraint")
);
dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTable::iterator cstrIter =
dictionaryConstructorTablePtr_->find(constraintType); dictionaryConstructorTablePtr_->find(constraintType);
@ -48,11 +45,12 @@ Foam::sixDoFRigidBodyMotionConstraint::New
( (
"sixDoFRigidBodyMotionConstraint::New" "sixDoFRigidBodyMotionConstraint::New"
"(" "("
"const dictionary& sDoFRBMCDict" "const word&, "
"const dictionary&"
")" ")"
) << "Unknown sixDoFRigidBodyMotionConstraint type " ) << "Unknown " << typeName << " type "
<< constraintType << nl << nl << constraintType << nl << nl
<< "Valid sixDoFRigidBodyMotionConstraints are : " << endl << "Valid " << typeName << "s are : " << endl
<< dictionaryConstructorTablePtr_->sortedToc() << dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError); << exit(FatalError);
} }

5
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -195,7 +195,7 @@ bool Foam::sixDoFRigidBodyMotionRestraints::linearAxialAngularSpring::read
} }
void Foam::sixDoFRigidBodyMotionRestraints::linearAxialAngularSpring::write void Foam::sixDoFRigidBodyMotionRestraints::linearAxialAngularSpring::writeData
( (
Ostream& os Ostream& os
) const ) const
@ -213,4 +213,5 @@ void Foam::sixDoFRigidBodyMotionRestraints::linearAxialAngularSpring::write
<< damping_ << token::END_STATEMENT << nl; << damping_ << token::END_STATEMENT << nl;
} }
// ************************************************************************* // // ************************************************************************* //

6
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -114,8 +114,8 @@ public:
//- Update properties from given dictionary //- Update properties from given dictionary
virtual bool read(const dictionary& sDoFRBMRCoeff); virtual bool read(const dictionary& sDoFRBMRCoeff);
//- Write //- Write model data
virtual void write(Ostream&) const; virtual void writeData(Ostream&) const;
}; };

4
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearDamper/linearDamper.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -100,7 +100,7 @@ bool Foam::sixDoFRigidBodyMotionRestraints::linearDamper::read
} }
void Foam::sixDoFRigidBodyMotionRestraints::linearDamper::write void Foam::sixDoFRigidBodyMotionRestraints::linearDamper::writeData
( (
Ostream& os Ostream& os
) const ) const

6
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearDamper/linearDamper.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -104,8 +104,8 @@ public:
//- Update properties from given dictionary //- Update properties from given dictionary
virtual bool read(const dictionary& sDoFRBMRCoeff); virtual bool read(const dictionary& sDoFRBMRCoeff);
//- Write //- Write model data
virtual void write(Ostream&) const; virtual void writeData(Ostream&) const;
}; };

5
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpring/linearSpring.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -120,7 +120,7 @@ bool Foam::sixDoFRigidBodyMotionRestraints::linearSpring::read
} }
void Foam::sixDoFRigidBodyMotionRestraints::linearSpring::write void Foam::sixDoFRigidBodyMotionRestraints::linearSpring::writeData
( (
Ostream& os Ostream& os
) const ) const
@ -141,4 +141,5 @@ void Foam::sixDoFRigidBodyMotionRestraints::linearSpring::write
<< restLength_ << token::END_STATEMENT << nl; << restLength_ << token::END_STATEMENT << nl;
} }
// ************************************************************************* // // ************************************************************************* //

6
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpring/linearSpring.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -117,8 +117,8 @@ public:
//- Update properties from given dictionary //- Update properties from given dictionary
virtual bool read(const dictionary& sDoFRBMRCoeff); virtual bool read(const dictionary& sDoFRBMRCoeff);
//- Write //- Write model data
virtual void write(Ostream&) const; virtual void writeData(Ostream&) const;
}; };

13
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -66,4 +66,15 @@ bool Foam::sixDoFRigidBodyMotionRestraint::read
} }
void Foam::sixDoFRigidBodyMotionRestraint::write(Ostream& os) const
{
os << indent << word(type() + "Coeffs") << nl
<< indent << token::BEGIN_BLOCK << nl << incrIndent;
writeData(os);
os << decrIndent << indent << token::END_BLOCK << endl;
}
// ************************************************************************* // // ************************************************************************* //

8
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -150,8 +150,12 @@ public:
return sDoFRBMRCoeffs_; return sDoFRBMRCoeffs_;
} }
//- Write //- Write
virtual void write(Ostream&) const = 0; virtual void write(Ostream&) const;
//- Write model data
virtual void writeData(Ostream&) const = 0;
}; };

14
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraintNew.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -34,10 +34,7 @@ Foam::sixDoFRigidBodyMotionRestraint::New
const dictionary& sDoFRBMRDict const dictionary& sDoFRBMRDict
) )
{ {
const word restraintType const word restraintType(sDoFRBMRDict.lookup(typeName));
(
sDoFRBMRDict.lookup("sixDoFRigidBodyMotionRestraint")
);
dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTable::iterator cstrIter =
dictionaryConstructorTablePtr_->find(restraintType); dictionaryConstructorTablePtr_->find(restraintType);
@ -48,11 +45,12 @@ Foam::sixDoFRigidBodyMotionRestraint::New
( (
"sixDoFRigidBodyMotionRestraint::New" "sixDoFRigidBodyMotionRestraint::New"
"(" "("
"const dictionary& sDoFRBMRDict" "const word&, "
"const dictionary&"
")" ")"
) << "Unknown sixDoFRigidBodyMotionRestraint type " ) << "Unknown " << typeName << " type "
<< restraintType << nl << nl << restraintType << nl << nl
<< "Valid sixDoFRigidBodyMotionRestraint types are : " << endl << "Valid " << typeName << " s types are : " << endl
<< dictionaryConstructorTablePtr_->sortedToc() << dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError); << exit(FatalError);
} }

4
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularDamper/sphericalAngularDamper.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -102,7 +102,7 @@ bool Foam::sixDoFRigidBodyMotionRestraints::sphericalAngularDamper::read
} }
void Foam::sixDoFRigidBodyMotionRestraints::sphericalAngularDamper::write void Foam::sixDoFRigidBodyMotionRestraints::sphericalAngularDamper::writeData
( (
Ostream& os Ostream& os
) const ) const

6
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularDamper/sphericalAngularDamper.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -103,8 +103,8 @@ public:
//- Update properties from given dictionary //- Update properties from given dictionary
virtual bool read(const dictionary& sDoFRBMRCoeff); virtual bool read(const dictionary& sDoFRBMRCoeff);
//- Write //- Write model data
virtual void write(Ostream&) const; virtual void writeData(Ostream&) const;
}; };

4
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularSpring/sphericalAngularSpring.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -147,7 +147,7 @@ bool Foam::sixDoFRigidBodyMotionRestraints::sphericalAngularSpring::read
} }
void Foam::sixDoFRigidBodyMotionRestraints::sphericalAngularSpring::write void Foam::sixDoFRigidBodyMotionRestraints::sphericalAngularSpring::writeData
( (
Ostream& os Ostream& os
) const ) const

6
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularSpring/sphericalAngularSpring.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -111,8 +111,8 @@ public:
//- Update properties from given dictionary //- Update properties from given dictionary
virtual bool read(const dictionary& sDoFRBMRCoeff); virtual bool read(const dictionary& sDoFRBMRCoeff);
//- Write //- Write model data
virtual void write(Ostream&) const; virtual void writeData(Ostream&) const;
}; };

5
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -221,7 +221,8 @@ bool Foam::sixDoFRigidBodyMotionRestraints::tabulatedAxialAngularSpring::read
} }
void Foam::sixDoFRigidBodyMotionRestraints::tabulatedAxialAngularSpring::write void Foam::sixDoFRigidBodyMotionRestraints::tabulatedAxialAngularSpring::
writeData
( (
Ostream& os Ostream& os
) const ) const

6
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -121,8 +121,8 @@ public:
//- Update properties from given dictionary //- Update properties from given dictionary
virtual bool read(const dictionary& sDoFRBMRCoeff); virtual bool read(const dictionary& sDoFRBMRCoeff);
//- Write //- Write model data
virtual void write(Ostream&) const; virtual void writeData(Ostream&) const;
}; };

16
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -60,14 +60,8 @@ void Foam::sixDoFRigidBodyMotion::write(Ostream& os) const
os.writeKeyword("sixDoFRigidBodyMotionRestraint") os.writeKeyword("sixDoFRigidBodyMotionRestraint")
<< restraintType << token::END_STATEMENT << nl; << restraintType << token::END_STATEMENT << nl;
os.writeKeyword(word(restraintType + "Coeffs")) << nl;
os << indent << token::BEGIN_BLOCK << nl << incrIndent;
restraints_[rI].write(os); restraints_[rI].write(os);
os << decrIndent << indent << token::END_BLOCK << nl;
os << decrIndent << indent << token::END_BLOCK << endl; os << decrIndent << indent << token::END_BLOCK << endl;
} }
@ -89,16 +83,8 @@ void Foam::sixDoFRigidBodyMotion::write(Ostream& os) const
os.writeKeyword("sixDoFRigidBodyMotionConstraint") os.writeKeyword("sixDoFRigidBodyMotionConstraint")
<< constraintType << token::END_STATEMENT << nl; << constraintType << token::END_STATEMENT << nl;
constraints_[rI].sixDoFRigidBodyMotionConstraint::write(os);
os.writeKeyword(word(constraintType + "Coeffs")) << nl;
os << indent << token::BEGIN_BLOCK << nl << incrIndent;
constraints_[rI].write(os); constraints_[rI].write(os);
os << decrIndent << indent << token::END_BLOCK << nl;
os << decrIndent << indent << token::END_BLOCK << endl; os << decrIndent << indent << token::END_BLOCK << endl;
} }