From 67cf9ca6606476c5990396dcaabd9931a991a0f6 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 1 Jun 2010 15:26:04 +0100 Subject: [PATCH 01/37] STYLE: use of notImplemented() --- .../parcels/Templates/KinematicParcel/KinematicParcel.C | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C index 4d89dedde1..d5e202a188 100644 --- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C @@ -315,18 +315,15 @@ bool Foam::KinematicParcel::move(TrackData& td) case TrackData::tpRotationalTrack: { - Info<< "No rotational tracking implementation" << endl; + notImplemented("TrackData::tpRotationalTrack"); break; } default: { - FatalErrorIn - ( - "KinematicParcel::move(TrackData& td)" - ) << td.part() - << " is an invalid part of the tracking method." + FatalErrorIn("KinematicParcel::move(TrackData& td)") + << td.part() << " is an invalid part of the tracking method." << abort(FatalError); } } From 81189ebd4c092f886e51a5628d845452a7612434 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 1 Jun 2010 15:26:56 +0100 Subject: [PATCH 02/37] ENH: wallHeatFlux utility - using basicPsiThermo instead of hCombustionThermo --- .../utilities/postProcessing/wall/wallHeatFlux/createFields.H | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/utilities/postProcessing/wall/wallHeatFlux/createFields.H b/applications/utilities/postProcessing/wall/wallHeatFlux/createFields.H index 64eac51eaa..609d4c3776 100644 --- a/applications/utilities/postProcessing/wall/wallHeatFlux/createFields.H +++ b/applications/utilities/postProcessing/wall/wallHeatFlux/createFields.H @@ -1,6 +1,6 @@ -autoPtr thermo +autoPtr thermo ( - hCombustionThermo::New(mesh) + basicPsiThermo::New(mesh) ); const volScalarField& h = thermo->h(); From ad18857c8b5315b7b68529caf20460bcb48984d7 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 1 Jun 2010 15:27:40 +0100 Subject: [PATCH 03/37] STYLE: minor code formatting --- .../KinematicParcel/CollisionRecordList/CollisionRecordList.C | 1 + src/mesh/blockMesh/curvedEdges/polyLine.H | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.C index f0b4804cf5..f5d321a023 100644 --- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.C +++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.C @@ -108,4 +108,5 @@ void Foam::CollisionRecordList::update() DynamicList >::operator=(updatedRecords); } + // ************************************************************************* // diff --git a/src/mesh/blockMesh/curvedEdges/polyLine.H b/src/mesh/blockMesh/curvedEdges/polyLine.H index 07b55b231b..c27556b066 100644 --- a/src/mesh/blockMesh/curvedEdges/polyLine.H +++ b/src/mesh/blockMesh/curvedEdges/polyLine.H @@ -62,6 +62,7 @@ class polyLine //- Disallow default bitwise assignment void operator=(const polyLine&); + protected: // Protected data @@ -75,17 +76,18 @@ protected: //- The rational (0-1) cumulative parameter value for each point scalarList param_; + // Protected Member Functions //- Precalculate the rational cumulative parameter value // and the line-length void calcParam(); - //- Return the line segment and the local parameter [0..1] // corresponding to the global lambda [0..1] label localParameter(scalar& lambda) const; + public: // Constructors From 42e97e38e73ab8e8fc9064a2c964d904e39b277b Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 8 Jun 2010 09:38:04 +0200 Subject: [PATCH 04/37] STYLE: fix (verbatim) documentation formatting ENH: log10/bound optional in uniformInterpolationTable (consistent w/ example) --- .../uniformInterpolationTable.C | 28 ++++++----- .../uniformInterpolationTable.H | 46 ++++++++----------- 2 files changed, 35 insertions(+), 39 deletions(-) diff --git a/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.C b/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.C index 05c96b608f..dd05ffc675 100644 --- a/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.C +++ b/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2009-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -65,8 +65,8 @@ Foam::uniformInterpolationTable::uniformInterpolationTable dict.lookup("data") >> *this; dict.lookup("x0") >> x0_; dict.lookup("dx") >> dx_; - dict.lookup("log10") >> log10_; - dict.lookup("bound") >> bound_; + dict.readIfPresent("log10", log10_); + dict.readIfPresent("bound", bound_); } checkTable(); @@ -94,13 +94,13 @@ Foam::uniformInterpolationTable::uniformInterpolationTable List(2, 0.0), x0_(readScalar(dict.lookup("x0"))), dx_(readScalar(dict.lookup("dx"))), - log10_(dict.lookup("log10")), - bound_(dict.lookup("bound")) + log10_(dict.lookupOrDefault("log10", false)), + bound_(dict.lookupOrDefault("bound", false)) { if (initialiseOnly) { - scalar xMax = readScalar(dict.lookup("xMax")); - label nIntervals = static_cast