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

Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
henry
2009-07-14 21:16:38 +01:00
parent 6f48a922d0 a463585a7f
commit 773c6e9cd2
136 changed files with 699 additions and 674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C
View File

@ -359,4 +359,5 @@ vtkUnstructuredGrid* Foam::vtkPV3Foam::volumeVTKMesh
return vtkmesh;
}
// ************************************************************************* //

3
applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C
View File

@ -38,7 +38,6 @@ Description
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
vtkPolyData* Foam::vtkPV3Foam::faceZoneVTKMesh
(
const fvMesh& mesh,
@ -111,7 +110,6 @@ vtkPolyData* Foam::vtkPV3Foam::faceZoneVTKMesh
}
vtkPolyData* Foam::vtkPV3Foam::pointZoneVTKMesh
(
const fvMesh& mesh,
@ -148,4 +146,5 @@ vtkPolyData* Foam::vtkPV3Foam::pointZoneVTKMesh
return vtkmesh;
}
// ************************************************************************* //

1
applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C
View File

@ -519,6 +519,5 @@ void Foam::vtkPV3Foam::updateInfoLagrangianFields()
}
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
// ************************************************************************* //

1
applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtilities.C
View File

@ -338,4 +338,5 @@ void Foam::vtkPV3Foam::printMemory()
}
}
// ************************************************************************* //

25
applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties Normal file
View File

@ -0,0 +1,25 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "constant";
object particleTrackProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
cloudName reactingCloud1;
sampleFrequency 1;
maxPositions 1000000;
// ************************************************************************* //

14
bin/foamTemplates/source/foamTemplate.C
View File

@ -31,7 +31,13 @@ License
const dataType Foam::className::staticData();
// * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -71,12 +77,6 @@ Foam::className::~className()
{}
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //

0
bin/foamTemplates/source/newSource Normal file → Executable file
View File

2
src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
View File

@ -97,7 +97,7 @@ public:
//- Construct given SphericalTensor
inline SymmTensor(const SphericalTensor<Cmpt>&);
//- Construct given the nine components
//- Construct given the six components
inline SymmTensor
(
const Cmpt txx, const Cmpt txy, const Cmpt txz,

6
src/conversion/meshTables/remappingDict
View File

@ -1,9 +1,9 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | |
| \\/ M anipulation | www.OpenFOAM.org |
| \\ / O peration | Version: 1.5.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{

12
src/conversion/polyDualMesh/polyDualMesh.C
View File

@ -1640,16 +1640,4 @@ Foam::polyDualMesh::~polyDualMesh()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
// ************************************************************************* //

4
src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
View File

@ -249,10 +249,10 @@ template<class ParcelType>
void Foam::KinematicCloud<ParcelType>::info() const
{
Info<< "Cloud: " << this->name() << nl
<< " Parcels added during this run = "
<< " Total number of parcels added = "
<< returnReduce(this->injection().parcelsAddedTotal(), sumOp<label>())
<< nl
<< " Mass introduced during this run = "
<< " Total mass introduced = "
<< returnReduce(this->injection().massInjected(), sumOp<scalar>())
<< nl
<< " Current number of parcels = "

2
src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
View File

@ -298,7 +298,7 @@ void Foam::ReactingParcel<ParcelType>::calcPhaseChange
dt,
cellI,
d,
T,
min(T, td.constProps().Tbp()), // Limit to boiling temperature
pc_,
this->Tc_,
this->muc_/(this->rhoc_ + ROOTVSMALL),

8
src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
View File

@ -91,6 +91,9 @@ public:
//- Vaporisation temperature [K]
const scalar Tvap_;
//- Boiling point [K]
const scalar Tbp_;
public:
@ -107,7 +110,10 @@ public:
//- Return const access to the vaporisation temperature
inline scalar Tvap() const;
};
//- Return const access to the boiling point
inline scalar Tbp() const;
};
//- Class used to pass reacting tracking data to the trackToFace function

11
src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
View File

@ -35,7 +35,8 @@ inline Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties
ThermoParcel<ParcelType>::constantProperties(parentDict),
pMin_(dimensionedScalar(this->dict().lookup("pMin")).value()),
constantVolume_(this->dict().lookup("constantVolume")),
Tvap_(dimensionedScalar(this->dict().lookup("Tvap")).value())
Tvap_(dimensionedScalar(this->dict().lookup("Tvap")).value()),
Tbp_(dimensionedScalar(this->dict().lookup("Tbp")).value())
{}
@ -145,6 +146,14 @@ Foam::ReactingParcel<ParcelType>::constantProperties::Tvap() const
}
template<class ParcelType>
inline Foam::scalar
Foam::ReactingParcel<ParcelType>::constantProperties::Tbp() const
{
return Tbp_;
}
// * * * * * * * * * * * trackData Member Functions * * * * * * * * * * * * //
template<class ParcelType>

12
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
View File

@ -186,7 +186,6 @@ Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles
(
const label parcels,
const scalar volume,
const scalar volumeFraction,
const scalar diameter,
const scalar rho
)
@ -196,13 +195,14 @@ Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles
{
case pbMass:
{
nP = volumeFraction*massTotal_/parcels
/(rho*mathematicalConstant::pi/6.0*pow3(diameter));
nP = volume/volumeTotal_
*massTotal_/rho
/(parcels*mathematicalConstant::pi/6.0*pow3(diameter));
break;
}
case pbNumber:
{
nP = volumeFraction*massTotal_/(rho*volume);
nP = massTotal_/(rho*volumeTotal_*parcels);
break;
}
default:
@ -363,9 +363,6 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
return;
}
// Volume fraction to introduce during this timestep
const scalar volFraction = volumeFraction(newVolume);
// Duration of injection period during this timestep
const scalar deltaT =
max(0.0, min(carrierDt, min(time - SOI_, timeEnd() - time0_)));
@ -418,7 +415,6 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
(
newParcels,
newVolume,
volFraction,
pPtr->d(),
pPtr->rho()
);

8
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
View File

@ -113,8 +113,8 @@ protected:
//- Start of injection [s]
const scalar SOI_;
//- Total volume of parcels to introduce [m^3]
// Initialised in the individual injection models
//- Total volume of particles introduced by this injector [m^3]
// - scaled to ensure massTotal is achieved
scalar volumeTotal_;
//- Total mass to inject [kg]
@ -183,7 +183,6 @@ protected:
(
const label parcels,
const scalar volume,
const scalar volumeFraction,
const scalar diameter,
const scalar rho
);
@ -290,9 +289,6 @@ public:
template<class TrackData>
void inject(TrackData& td);
//- Return the volume fraction to introduce
inline scalar volumeFraction(const scalar volume) const;
// Injection geometry

10
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelI.H
View File

@ -96,14 +96,4 @@ Foam::label Foam::InjectionModel<CloudType>::parcelsAddedTotal() const
}
template<class CloudType>
Foam::scalar Foam::InjectionModel<CloudType>::volumeFraction
(
const scalar volume
) const
{
return volume/volumeTotal_;
}
// ************************************************************************* //

4
src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.C
View File

@ -26,13 +26,9 @@ License
#include "MeshedSurfaceIOAllocator.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::MeshedSurfaceIOAllocator::MeshedSurfaceIOAllocator
(
const IOobject& ioPoints,

3
src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H
View File

@ -63,6 +63,7 @@ class MeshedSurfaceIOAllocator
//- Surface zones
surfZoneIOList zones_;
// Private Member Functions
//- Disallow default bitwise copy construct
@ -71,6 +72,7 @@ class MeshedSurfaceIOAllocator
//- Disallow default bitwise assignment
void operator=(const MeshedSurfaceIOAllocator&);
public:
// Constructors
@ -179,7 +181,6 @@ public:
const Xfer< faceList >& faces,
const Xfer< surfZoneList >& zones
);
};

17
src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C
View File

@ -216,7 +216,6 @@ void Foam::MeshedSurfaceProxy<Face>::write
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Face>
@ -242,20 +241,4 @@ Foam::MeshedSurfaceProxy<Face>::~MeshedSurfaceProxy()
{}
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// ************************************************************************* //

81
src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H
View File

@ -76,13 +76,14 @@ class MeshedSurfaceProxy
const List<label>& faceMap_;
public:
// Static
//- Runtime type information
ClassName("MeshedSurfaceProxy");
// Static
//- The file format types that can be written via MeshedSurfaceProxy
static wordHashSet writeTypes();
@ -101,6 +102,7 @@ public:
const List<label>& faceMap = List<label>()
);
// Destructor
virtual ~MeshedSurfaceProxy();
@ -127,53 +129,50 @@ public:
// Member Functions
// Access
// Access
//- Return const access to the points
inline const pointField& points() const
{
return points_;
}
//- Return const access to the points
inline const pointField& points() const
{
return points_;
}
//- Return const access to the faces
inline const List<Face>& faces() const
{
return faces_;
}
//- Return const access to the faces
inline const List<Face>& faces() const
{
return faces_;
}
//- Const access to the surface zones.
// If zones are defined, they must be contiguous and cover the entire
// surface.
inline const List<surfZone>& surfZones() const
{
return zones_;
}
//- Const access to the surface zones.
// If zones are defined, they must be contiguous and cover the
// entire surface
inline const List<surfZone>& surfZones() const
{
return zones_;
}
//- Const access to the faceMap, zero-sized when unused
inline const List<label>& faceMap() const
{
return faceMap_;
}
//- Const access to the faceMap, zero-sized when unused
inline const List<label>& faceMap() const
{
return faceMap_;
}
//- Use faceMap?
inline bool useFaceMap() const
{
return faceMap_.size() == faces_.size();
}
//- Use faceMap?
inline bool useFaceMap() const
{
return faceMap_.size() == faces_.size();
}
// Write
// Write
//- Generic write routine. Chooses writer based on extension.
virtual void write(const fileName& name) const
{
write(name, *this);
}
//- Write to database
virtual void write(const Time&, const word& surfName = "") const;
//?? void writeStats(Ostream& os) const;
//- Generic write routine. Chooses writer based on extension.
virtual void write(const fileName& name) const
{
write(name, *this);
}
//- Write to database
virtual void write(const Time&, const word& surfName = "") const;
};

12
src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
View File

@ -33,8 +33,6 @@ License
#include "polyBoundaryMesh.H"
#include "polyMesh.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
template<class Face>
@ -301,10 +299,6 @@ Foam::UnsortedMeshedSurface<Face>::~UnsortedMeshedSurface()
{}
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
template<class Face>
@ -694,7 +688,6 @@ Foam::UnsortedMeshedSurface<Face>::xfer()
}
// Read from file, determine format from extension
template<class Face>
bool Foam::UnsortedMeshedSurface<Face>::read(const fileName& name)
@ -773,11 +766,6 @@ Foam::MeshedSurfaceProxy<Face>() const
}
// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "UnsortedMeshedSurfaceNew.C"

174
src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
View File

@ -91,6 +91,7 @@ private:
typedef MeshedSurface<Face> FriendType;
typedef MeshedSurfaceProxy<Face> ProxyType;
// Private Member Data
//- The zone Id associated with each face
@ -100,6 +101,7 @@ private:
// during reading and writing)
List<surfZoneIdentifier> zoneToc_;
// Private member functions
//- Disable resize with value
@ -111,6 +113,7 @@ private:
//- Read OpenFOAM Surface format
bool read(Istream&);
protected:
// Protected Member functions
@ -130,11 +133,13 @@ protected:
//- Set new zones from faceMap
virtual void remapFaces(const UList<label>& faceMap);
public:
//- Runtime type information
TypeName("UnsortedMeshedSurface");
// Static
//- Can we read this file format?
@ -149,6 +154,7 @@ public:
static wordHashSet readTypes();
static wordHashSet writeTypes();
// Constructors
//- Construct null
@ -198,6 +204,7 @@ public:
//- Construct from objectRegistry and a named surface
UnsortedMeshedSurface(const Time&, const word& surfName="");
// Declare run-time constructor selection table
declareRunTimeSelectionTable
@ -211,6 +218,7 @@ public:
(name)
);
// Selectors
//- Select constructed from filename (explicit extension)
@ -223,6 +231,7 @@ public:
//- Select constructed from filename (implicit extension)
static autoPtr<UnsortedMeshedSurface> New(const fileName&);
// Destructor
virtual ~UnsortedMeshedSurface();
@ -249,120 +258,119 @@ public:
// Member Functions
// Access
// Access
//- The surface size is the number of faces
label size() const
{
return ParentType::size();
}
//- The surface size is the number of faces
label size() const
{
return ParentType::size();
}
//- Reset size of face and zone list
void setSize(const label);
//- Reset size of face and zone list
void setSize(const label);
//- Return const access to the zone ids
const List<label>& zoneIds() const
{
return zoneIds_;
}
//- Return const access to the zone ids
const List<label>& zoneIds() const
{
return zoneIds_;
}
//- Return const access to the zone table-of-contents
const List<surfZoneIdentifier>& zoneToc() const
{
return zoneToc_;
}
//- Return const access to the zone table-of-contents
const List<surfZoneIdentifier>& zoneToc() const
{
return zoneToc_;
}
//- Sort faces according to zoneIds
// Returns a surfZoneList and sets faceMap to index within faces()
surfZoneList sortedZones(labelList& faceMap) const;
//- Sort faces according to zoneIds
// Returns a surfZoneList and sets faceMap to index within faces()
surfZoneList sortedZones(labelList& faceMap) const;
//- Set zones to 0 and set a single zone
void setOneZone();
//- Set zones to 0 and set a single zone
void setOneZone();
//- Set zone ids and zones
void setZones(const surfZoneList&);
//- Set zone ids and zones
void setZones(const surfZoneList&);
//- Set zone ids and zones
void setZones(const UList<label>& sizes, const UList<word>& names);
//- Set zone ids and zones
void setZones(const UList<label>& sizes, const UList<word>& names);
//- Set zone ids and zones with default names
void setZones(const UList<label>& sizes);
//- Set zone ids and zones with default names
void setZones(const UList<label>& sizes);
// Edit
// Edit
//- Clear all storage
virtual void clear();
//- Clear all storage
virtual void clear();
//- Return new surface.
// Returns return pointMap, faceMap from subsetMeshMap
UnsortedMeshedSurface subsetMesh
(
const labelHashSet& include,
labelList& pointMap,
labelList& faceMap
) const;
//- Return new surface.
// Returns return pointMap, faceMap from subsetMeshMap
UnsortedMeshedSurface subsetMesh
(
const labelHashSet& include,
labelList& pointMap,
labelList& faceMap
) const;
//- Return new surface.
UnsortedMeshedSurface subsetMesh
(
const labelHashSet& include
) const;
//- Return new surface.
UnsortedMeshedSurface subsetMesh
(
const labelHashSet& include
) const;
//- Transfer components (points, faces, zone ids).
virtual void reset
(
const Xfer< pointField >&,
const Xfer< List<Face> >&,
const Xfer< List<label> >& zoneIds
);
//- Transfer components (points, faces, zone ids).
virtual void reset
(
const Xfer< pointField >&,
const Xfer< List<Face> >&,
const Xfer< List<label> >& zoneIds
);
//- Transfer components (points, faces, zone ids).
virtual void reset
(
const Xfer< List<point> >&,
const Xfer< List<Face> >&,
const Xfer< List<label> >& zoneIds
);
//- Transfer components (points, faces, zone ids).
virtual void reset
(
const Xfer< List<point> >&,
const Xfer< List<Face> >&,
const Xfer< List<label> >& zoneIds
);
//- Transfer the contents of the argument and annull the argument
void transfer(UnsortedMeshedSurface<Face>&);
//- Transfer the contents of the argument and annull the argument
void transfer(UnsortedMeshedSurface<Face>&);
//- Transfer the contents of the argument and annull the argument
void transfer(MeshedSurface<Face>&);
//- Transfer the contents of the argument and annull the argument
void transfer(MeshedSurface<Face>&);
//- Transfer contents to the Xfer container
Xfer< UnsortedMeshedSurface<Face> > xfer();
//- Transfer contents to the Xfer container
Xfer< UnsortedMeshedSurface<Face> > xfer();
// Read
// Read
//- Read from file. Chooses reader based on explicit extension
bool read(const fileName&, const word& ext);
//- Read from file. Chooses reader based on explicit extension
bool read(const fileName&, const word& ext);
//- Read from file. Chooses reader based on detected extension
virtual bool read(const fileName&);
//- Read from file. Chooses reader based on detected extension
virtual bool read(const fileName&);
// Write
// Write
//- Generic write routine. Chooses writer based on extension.
virtual void write(const fileName& name) const
{
write(name, *this);
}
//- Generic write routine. Chooses writer based on extension.
virtual void write(const fileName& name) const
{
write(name, *this);
}
//- Write to database
void write(const Time&, const word& surfName="") const;
//- Write to database
void write(const Time&, const word& surfName="") const;
// Member operators
// Member operators
void operator=(const UnsortedMeshedSurface<Face>&);
//- Conversion operator to MeshedSurfaceProxy
operator MeshedSurfaceProxy<Face>() const;
void operator=(const UnsortedMeshedSurface<Face>&);
//- Conversion operator to MeshedSurfaceProxy
operator MeshedSurfaceProxy<Face>() const;
};

4
src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C
View File

@ -28,7 +28,6 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Face>
Foam::autoPtr< Foam::UnsortedMeshedSurface<Face> >
Foam::UnsortedMeshedSurface<Face>::New(const fileName& name, const word& ext)
@ -68,7 +67,7 @@ Foam::UnsortedMeshedSurface<Face>::New(const fileName& name, const word& ext)
"(const fileName&, const word&) : "
"constructing UnsortedMeshedSurface"
) << "Unknown file extension " << ext << nl << nl
<< "Valid types are :" << nl
<< "Valid types are:" << nl
<< supported
<< exit(FatalError);
}
@ -90,4 +89,5 @@ Foam::UnsortedMeshedSurface<Face>::New(const fileName& name)
return New(name, ext);
}
// ************************************************************************* //

2
src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfacesFwd.H
View File

@ -31,6 +31,8 @@ License
namespace Foam
{
// Forward declaration of classes
class face;
class triFace;

1
src/surfMesh/surfFields/surfFields/surfGeoMesh.H
View File

@ -76,7 +76,6 @@ public:
{
return size(mesh_);
}
};

1
src/surfMesh/surfFields/surfPointFields/surfPointGeoMesh.H
View File

@ -76,7 +76,6 @@ public:
{
return size(mesh_);
}
};

7
src/surfMesh/surfMesh/surfMesh.C
View File

@ -70,7 +70,6 @@ Foam::word Foam::surfMesh::meshSubDir = "surfMesh";
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::surfMesh::surfMesh(const IOobject& io, const word& surfName)
:
surfaceRegistry(io.db(), (surfName.size() ? surfName : io.name())),
@ -215,6 +214,7 @@ Foam::surfMesh::surfMesh
}
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::surfMesh::~surfMesh()
@ -271,7 +271,6 @@ void Foam::surfMesh::resetPrimitives
}
void Foam::surfMesh::transfer
(
MeshedSurface<face>& surf
@ -330,21 +329,25 @@ Foam::label Foam::surfMesh::nPoints() const
return this->points().size();
}
Foam::label Foam::surfMesh::nFaces() const
{
return this->faces().size();
}
const Foam::pointField& Foam::surfMesh::points() const
{
return this->storedIOPoints();
}
const Foam::faceList& Foam::surfMesh::faces() const
{
return this->storedIOFaces();
}
void Foam::surfMesh::checkZones()
{
// extra safety, ensure we have at some zones

7
src/surfMesh/surfMesh/surfMesh.H
View File

@ -96,9 +96,6 @@ private:
MeshReference;
// Permanent data
// Private member functions
//- Disallow construct as copy
@ -107,6 +104,7 @@ private:
//- Disallow default bitwise assignment
void operator=(const surfMesh&);
protected:
// Protected Member Functions
@ -129,7 +127,6 @@ protected:
return Allocator::storedIOZones();
}
//- Update references to storedFaces
virtual void updateFacesRef();
@ -139,6 +136,7 @@ protected:
//- Update references to storedPoints/storedFaces
virtual void updateRefs();
public:
// Public typedefs
@ -178,6 +176,7 @@ public:
const word& surfName=""
);
// Destructor
virtual ~surfMesh();

2
src/surfMesh/surfMesh/surfMeshIO.C
View File

@ -203,6 +203,4 @@ Foam::surfMesh::readUpdateState Foam::surfMesh::readUpdate()
}
// ************************************************************************* //

1
src/surfMesh/surfZone/surfZone/surfZone.C
View File

@ -45,7 +45,6 @@ Foam::surfZone::surfZone()
{}
Foam::surfZone::surfZone
(
const word& name,

2
src/surfMesh/surfZone/surfZone/surfZone.H
View File

@ -73,6 +73,7 @@ class surfZone
//- Start label of this group in the face list
label start_;
public:
//- Runtime type information
@ -167,6 +168,7 @@ public:
//- compare.
bool operator==(const surfZone&) const;
// IOstream Operators
friend Istream& operator>>(Istream&, surfZone&);

5
src/surfMesh/surfZone/surfZone/surfZoneIOList.C
View File

@ -153,9 +153,4 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const surfZoneIOList& L)
}
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * //
// ************************************************************************* //

10
src/surfMesh/surfZone/surfZone/surfZoneIOList.H
View File

@ -57,9 +57,6 @@ class surfZoneIOList
public surfZoneList,
public regIOobject
{
// Private data
// Private Member Functions
//- Disallow default bitwise copy construct
@ -86,6 +83,7 @@ public:
//- Construct from IOobject and surfZoneList
surfZoneIOList(const IOobject&, const Xfer<surfZoneList>&);
// Destructor
~surfZoneIOList();
@ -97,12 +95,6 @@ public:
bool writeData(Ostream&) const;
// Member Operators
// Friend Functions
// Friend Operators
// IOstream Operators
friend Ostream& operator<<(Ostream&, const surfZoneIOList&);

4
src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.C
View File

@ -27,8 +27,6 @@ License
#include "surfZoneIdentifier.H"
#include "dictionary.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::surfZoneIdentifier::surfZoneIdentifier()
@ -77,6 +75,7 @@ Foam::surfZoneIdentifier::surfZoneIdentifier
geometricType_(p.geometricType())
{}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::surfZoneIdentifier::~surfZoneIdentifier()
@ -136,4 +135,5 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const surfZoneIdentifier& p)
return os;
}
// ************************************************************************* //

1
src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.H
View File

@ -72,6 +72,7 @@ class surfZoneIdentifier
//- Type name of zone
mutable word geometricType_;
public:
// Constructors

6
src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
View File

@ -30,11 +30,6 @@ License
#include "tensor.H"
#include "primitivePatch.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Face>
@ -46,6 +41,7 @@ Foam::fileFormats::AC3DsurfaceFormat<Face>::AC3DsurfaceFormat
read(filename);
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Face>

5
src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.H
View File

@ -73,6 +73,7 @@ class AC3DsurfaceFormat
//- Disallow default bitwise assignment
void operator=(const AC3DsurfaceFormat<Face>&);
public:
// Constructors
@ -80,6 +81,7 @@ public:
//- Construct from file name
AC3DsurfaceFormat(const fileName&);
// Selectors
//- Read file and return surface
@ -91,6 +93,7 @@ public:
);
}
// Destructor
virtual ~AC3DsurfaceFormat()
@ -105,7 +108,6 @@ public:
//- Write UnsortedMeshedSurface, the output is always sorted by zones.
static void write(const fileName&, const UnsortedMeshedSurface<Face>&);
//- Read from file
virtual bool read(const fileName&);
@ -114,7 +116,6 @@ public:
{
write(name, MeshedSurfaceProxy<Face>(*this));
}
};

3
src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.C
View File

@ -29,8 +29,6 @@ License
#include "IFstream.H"
#include "IStringStream.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
bool Foam::fileFormats::AC3DsurfaceFormatCore::readCmd
@ -156,6 +154,5 @@ void Foam::fileFormats::AC3DsurfaceFormatCore::writeHeader
<< "kids " << zoneLst.size() << endl;
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
// ************************************************************************* //

36
src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.H
View File

@ -55,30 +55,30 @@ namespace fileFormats
class AC3DsurfaceFormatCore
{
protected:
// Protected Member Functions
//- Read a type via IStringStream
template<class Type>
static Type parse(const string&);
//- Read a type via IStringStream
template<class Type>
static Type parse(const string&);
//- Read cmd, args from IFstream
static bool readCmd(IFstream&, string& cmd, string& args);
//- Read cmd, args from IFstream
static bool readCmd(IFstream&, string& cmd, string& args);
//- Cue up to cmd, reading args
static bool cueTo(IFstream&, const string& cmd, string& args);
//- Cue up to cmd, reading args
static bool cueTo(IFstream&, const string& cmd, string& args);
//- Cue up to cmd, reading args or exit with a FatalError
// returns the command args
static string cueToOrDie
(
IFstream&,
const string& cmd,
const string& errorMsg=string::null
);
//- Write header with materials
static void writeHeader(Ostream&, const UList<surfZone>&);
//- Cue up to cmd, reading args or exit with a FatalError
// returns the command args
static string cueToOrDie
(
IFstream&,
const string& cmd,
const string& errorMsg=string::null
);
//- Write header with materials
static void writeHeader(Ostream&, const UList<surfZone>&);
};

1
src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCoreTemplates.C
View File

@ -39,6 +39,5 @@ Type Foam::fileFormats::AC3DsurfaceFormatCore::parse(const string& s)
return t;
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
// ************************************************************************* //

1
src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatRunTime.C
View File

@ -30,6 +30,7 @@ License
#include "addToMemberFunctionSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
namespace fileFormats

3
src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.C
View File

@ -28,8 +28,6 @@ License
#include "Keyed.H"
#include "IFstream.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Face>
@ -101,4 +99,5 @@ bool Foam::fileFormats::FTRsurfaceFormat<Face>::read
return true;
}
// ************************************************************************* //

4
src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.H
View File

@ -82,6 +82,7 @@ class FTRsurfaceFormat
}
};
// Private Member Functions
//- Disallow default bitwise copy construct
@ -90,6 +91,7 @@ class FTRsurfaceFormat
//- Disallow default bitwise assignment
void operator=(const FTRsurfaceFormat<Face>&);
public:
// Constructors
@ -97,6 +99,7 @@ public:
//- Construct from file name
FTRsurfaceFormat(const fileName&);
// Selectors
//- Read file and return surface
@ -119,7 +122,6 @@ public:
//- Read from file
virtual bool read(const fileName&);
};

1
src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormatRunTime.C
View File

@ -30,6 +30,7 @@ License
#include "addToMemberFunctionSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
namespace fileFormats

4
src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C
View File

@ -32,10 +32,6 @@ License
#include "Ostream.H"
#include "OFstream.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Face>

12
src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.H
View File

@ -66,6 +66,7 @@ class GTSsurfaceFormat
//- Disallow default bitwise assignment
void operator=(const GTSsurfaceFormat<Face>&);
public:
// Constructors
@ -73,6 +74,7 @@ public:
//- Construct from file name
GTSsurfaceFormat(const fileName&);
// Selectors
//- Read file and return surface
@ -84,9 +86,11 @@ public:
);
}
// Destructor
virtual ~GTSsurfaceFormat()
{}
//- Destructor
virtual ~GTSsurfaceFormat()
{}
// Member Functions
@ -96,7 +100,6 @@ public:
//- Write UnsortedMeshedSurface, the output remains unsorted
static void write(const fileName&, const UnsortedMeshedSurface<Face>&);
//- Read from file
virtual bool read(const fileName&);
@ -105,7 +108,6 @@ public:
{
write(name, *this);
}
};

1
src/surfMesh/surfaceFormats/gts/GTSsurfaceFormatRunTime.C
View File

@ -30,6 +30,7 @@ License
#include "addToMemberFunctionSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
namespace fileFormats

6
src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
View File

@ -28,11 +28,6 @@ License
#include "IFstream.H"
#include "IStringStream.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Face>
@ -393,4 +388,5 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
return true;
}
// ************************************************************************* //

5
src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.H
View File

@ -74,6 +74,7 @@ class NASsurfaceFormat
//- Disallow default bitwise assignment
void operator=(const NASsurfaceFormat<Face>&);
public:
// Constructors
@ -81,6 +82,7 @@ public:
//- Construct from file name
NASsurfaceFormat(const fileName&);
// Selectors
//- Read file and return surface
@ -92,16 +94,17 @@ public:
);
}
// Destructor
virtual ~NASsurfaceFormat()
{}
// Member Functions
//- Read from a file
virtual bool read(const fileName&);
};

4
src/surfMesh/surfaceFormats/nas/NASsurfaceFormatCore.C
View File

@ -27,8 +27,6 @@ License
#include "NASsurfaceFormatCore.H"
#include "IStringStream.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// Do weird things to extract a floating point number
@ -56,7 +54,5 @@ Foam::scalar Foam::fileFormats::NASsurfaceFormatCore::parseNASCoord
}
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
// ************************************************************************* //

8
src/surfMesh/surfaceFormats/nas/NASsurfaceFormatCore.H
View File

@ -53,11 +53,11 @@ namespace fileFormats
class NASsurfaceFormatCore
{
protected:
// Protected Member Functions
//- Do weird things to extract number
static scalar parseNASCoord(const string&);
//- Do weird things to extract number
static scalar parseNASCoord(const string&);
};
@ -68,8 +68,6 @@ protected:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
// ************************************************************************* //

1
src/surfMesh/surfaceFormats/nas/NASsurfaceFormatRunTime.C
View File

@ -30,6 +30,7 @@ License
#include "addToMemberFunctionSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
namespace fileFormats

2
src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
View File

@ -32,8 +32,6 @@ License
#include "OFstream.H"
#include "ListOps.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Face>

4
src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.H
View File

@ -66,6 +66,7 @@ class OBJsurfaceFormat
//- Disallow default bitwise assignment
void operator=(const OBJsurfaceFormat<Face>&);
public:
// Constructors
@ -73,6 +74,7 @@ public:
//- Construct from file name
OBJsurfaceFormat(const fileName&);
// Selectors
//- Read file and return surface
@ -84,6 +86,7 @@ public:
);
}
// Destructor
virtual ~OBJsurfaceFormat()
@ -103,7 +106,6 @@ public:
{
write(name, MeshedSurfaceProxy<Face>(*this));
}
};

1
src/surfMesh/surfaceFormats/obj/OBJsurfaceFormatRunTime.C
View File

@ -30,6 +30,7 @@ License
#include "addToMemberFunctionSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
namespace fileFormats

4
src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
View File

@ -31,10 +31,6 @@ License
#include "Ostream.H"
#include "OFstream.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Face>

12
src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.H
View File

@ -74,6 +74,7 @@ class OFFsurfaceFormat
//- Disallow default bitwise assignment
void operator=(const OFFsurfaceFormat&);
public:
// Constructors
@ -81,6 +82,7 @@ public:
//- Construct from file name
OFFsurfaceFormat(const fileName&);
// Selectors
//- Read file and return surface
@ -92,16 +94,17 @@ public:
);
}
// Destructor
virtual ~OFFsurfaceFormat()
{}
//- Destructor
virtual ~OFFsurfaceFormat()
{}
// Member Functions
//- Write surface mesh components by proxy
static void write(const fileName&, const MeshedSurfaceProxy<Face>&);
//- Read from file
virtual bool read(const fileName&);
@ -110,7 +113,6 @@ public:
{
write(name, MeshedSurfaceProxy<Face>(*this));
}
};

1
src/surfMesh/surfaceFormats/off/OFFsurfaceFormatRunTime.C
View File

@ -30,6 +30,7 @@ License
#include "addToMemberFunctionSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
namespace fileFormats

3
src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.C
View File

@ -29,8 +29,6 @@ License
#include "IStringStream.H"
#include "ListOps.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Face>
@ -257,4 +255,5 @@ void Foam::fileFormats::OFSsurfaceFormat<Face>::write
os.check("OFSsurfaceFormat<Face>::write(Ostream&)");
}
// ************************************************************************* //

6
src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.H
View File

@ -71,6 +71,7 @@ class OFSsurfaceFormat
//- Disallow default bitwise assignment
void operator=(const OFSsurfaceFormat<Face>&);
public:
// Constructors
@ -78,6 +79,7 @@ public:
//- Construct from file name
OFSsurfaceFormat(const fileName&);
// Selectors
//- Read file and return surface
@ -89,12 +91,14 @@ public:
);
}
// Destructor
virtual ~OFSsurfaceFormat()
{}
// Member Functions
//- Read surface mesh components
@ -124,7 +128,6 @@ public:
//- Write surface mesh components by proxy
static void write(const fileName&, const MeshedSurfaceProxy<Face>&);
//- Read from file
virtual bool read(const fileName&);
@ -133,7 +136,6 @@ public:
{
write(name, MeshedSurfaceProxy<Face>(*this));
}
};

4
src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatCore.C
View File

@ -27,8 +27,6 @@ License
#include "OFSsurfaceFormatCore.H"
#include "clock.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::fileFormats::OFSsurfaceFormatCore::writeHeader
@ -71,6 +69,4 @@ void Foam::fileFormats::OFSsurfaceFormatCore::writeHeader
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
// ************************************************************************* //

16
src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatCore.H
View File

@ -55,16 +55,16 @@ namespace fileFormats
class OFSsurfaceFormatCore
{
protected:
// Protected Member Functions
//- Write header information and surfZoneList
static void writeHeader
(
Ostream&,
const pointField&,
const UList<surfZone>&
);
//- Write header information and surfZoneList
static void writeHeader
(
Ostream&,
const pointField&,
const UList<surfZone>&
);
};

1
src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatRunTime.C
View File

@ -30,6 +30,7 @@ License
#include "addToMemberFunctionSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
namespace fileFormats

5
src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.C
View File

@ -30,16 +30,13 @@ License
#include "OFstream.H"
#include "Ostream.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Face>
Foam::fileFormats::SMESHsurfaceFormat<Face>::SMESHsurfaceFormat()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Face>

4
src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.H
View File

@ -70,6 +70,7 @@ class SMESHsurfaceFormat
//- Disallow default bitwise assignment
void operator=(const SMESHsurfaceFormat<Face>&);
public:
// Constructors
@ -77,7 +78,6 @@ public:
//- Construct null
SMESHsurfaceFormat();
// Selectors
// Destructor
@ -90,13 +90,11 @@ public:
//- Write surface mesh components by proxy
static void write(const fileName&, const MeshedSurfaceProxy<Face>&);
//- Write object
virtual void write(const fileName& name) const
{
write(name, MeshedSurfaceProxy<Face>(*this));
}
};

1
src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormatRunTime.C
View File

@ -30,6 +30,7 @@ License
#include "addToMemberFunctionSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
namespace fileFormats

3
src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
View File

@ -27,8 +27,6 @@ License
#include "STARCDsurfaceFormat.H"
#include "ListOps.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class Face>
@ -73,6 +71,7 @@ Foam::fileFormats::STARCDsurfaceFormat<Face>::STARCDsurfaceFormat
read(filename);
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Face>

12
src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.H
View File

@ -72,6 +72,7 @@ class STARCDsurfaceFormat
//- STAR-CD identifier for shell type (shells vs. baffles)
static const int starcdShellType_ = 4;
// Private Member Functions
static inline void writeShell
@ -88,6 +89,7 @@ class STARCDsurfaceFormat
//- Disallow default bitwise assignment
void operator=(const STARCDsurfaceFormat<Face>&);
public:
// Constructors
@ -95,6 +97,7 @@ public:
//- Construct from file name
STARCDsurfaceFormat(const fileName&);
// Selectors
//- Read file and return surface
@ -106,9 +109,10 @@ public:
);
}
// Destructor
virtual ~STARCDsurfaceFormat()
{}
//- Destructor
virtual ~STARCDsurfaceFormat()
{}
// Member Functions
@ -116,7 +120,6 @@ public:
//- Write surface mesh components by proxy
static void write(const fileName&, const MeshedSurfaceProxy<Face>&);
//- Read from file
virtual bool read(const fileName&);
@ -125,7 +128,6 @@ public:
{
write(name, MeshedSurfaceProxy<Face>(*this));
}
};

3
src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.C
View File

@ -28,8 +28,6 @@ License
#include "clock.H"
#include "IStringStream.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
bool Foam::fileFormats::STARCDsurfaceFormatCore::readHeader
@ -193,7 +191,6 @@ void Foam::fileFormats::STARCDsurfaceFormatCore::writeCase
os.flush();
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
// ************************************************************************* //

4
src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.H
View File

@ -55,6 +55,7 @@ namespace fileFormats
class STARCDsurfaceFormatCore
{
protected:
// Protected Member Functions
static bool readHeader(IFstream&, const word&);
@ -72,7 +73,6 @@ protected:
const label nFaces,
const UList<surfZone>&
);
};
@ -83,8 +83,6 @@ protected:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
// ************************************************************************* //

1
src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatRunTime.C
View File

@ -30,6 +30,7 @@ License
#include "addToMemberFunctionSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
namespace fileFormats

1
src/surfMesh/surfaceFormats/stl/STLpoint.H
View File

@ -87,7 +87,6 @@ public:
{
return point(x(), y(), z());
}
};

3
src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C
View File

@ -28,8 +28,6 @@ License
#include "ListOps.H"
#include "triPointRef.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class Face>
@ -441,6 +439,7 @@ void Foam::fileFormats::STLsurfaceFormat<Face>::writeBinary
}
}
template<class Face>
void Foam::fileFormats::STLsurfaceFormat<Face>::write
(

13
src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.H
View File

@ -86,6 +86,8 @@ class STLsurfaceFormat
//- Disallow default bitwise assignment
void operator=(const STLsurfaceFormat<Face>&);
public:
// Constructors
@ -93,6 +95,7 @@ public:
//- Construct from file name
STLsurfaceFormat(const fileName&);
// Selectors
//- Read file and return surface
@ -104,9 +107,11 @@ public:
);
}
// Destructor
virtual ~STLsurfaceFormat()
{}
//- Destructor
virtual ~STLsurfaceFormat()
{}
// Member Functions
@ -146,7 +151,6 @@ public:
// as ASCII or BINARY, depending on the extension
static void write(const fileName&, const UnsortedMeshedSurface<Face>&);
//- Read from file
virtual bool read(const fileName&);
@ -155,7 +159,6 @@ public:
{
write(name, MeshedSurfaceProxy<Face>(*this));
}
};

3
src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.C
View File

@ -33,8 +33,6 @@ License
#undef DEBUG_STLBINARY
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// check binary by getting the header and number of facets
@ -276,4 +274,5 @@ void Foam::fileFormats::STLsurfaceFormatCore::writeHeaderBINARY
}
// ************************************************************************* //

9
src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.H
View File

@ -71,6 +71,7 @@ class STLsurfaceFormatCore
//- The solid count, in the order of their first appearance
List<label> sizes_;
// Private Member Functions
//- Disallow default bitwise copy construct
@ -88,6 +89,7 @@ class STLsurfaceFormatCore
//- Read BINARY
bool readBINARY(istream&, const off_t);
public:
// Static Data
@ -95,20 +97,24 @@ public:
//- The number of bytes in the STL binary header
static const unsigned int headerSize = 80;
// Static Member Functions
//- Write "STL binary file" and number of triangles to stream
static void writeHeaderBINARY(ostream&, unsigned int);
// Constructors
//- Read from file, filling in the information
STLsurfaceFormatCore(const fileName&);
// Destructor
~STLsurfaceFormatCore();
// Member Functions
//- File read was already sorted
@ -150,7 +156,6 @@ public:
{
return sizes_;
}
};
@ -161,8 +166,6 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
// ************************************************************************* //

1
src/surfMesh/surfaceFormats/stl/STLsurfaceFormatRunTime.C
View File

@ -30,6 +30,7 @@ License
#include "addToMemberFunctionSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
namespace fileFormats

3
src/surfMesh/surfaceFormats/stl/STLtriangle.H
View File

@ -65,6 +65,7 @@ class STLtriangle
//- The attribute information could for colour or solid id, etc
STLattrib attrib_;
public:
// Constructors
@ -96,11 +97,13 @@ public:
inline const STLpoint& c() const;
inline unsigned short attrib() const;
// Read
//- Read from istream (binary)
inline void read(istream&);
// Write
//- Write to ostream (binary)

9
src/surfMesh/surfaceFormats/stl/STLtriangleI.H
View File

@ -24,8 +24,6 @@ License
\*---------------------------------------------------------------------------*/
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
inline Foam::STLtriangle::STLtriangle()
@ -62,21 +60,25 @@ inline const Foam::STLpoint& Foam::STLtriangle::normal() const
return normal_;
}
inline const Foam::STLpoint& Foam::STLtriangle::a() const
{
return a_;
}
inline const Foam::STLpoint& Foam::STLtriangle::b() const
{
return b_;
}
inline const Foam::STLpoint& Foam::STLtriangle::c() const
{
return c_;
}
inline unsigned short Foam::STLtriangle::attrib() const
{
return attrib_;
@ -96,6 +98,7 @@ inline void Foam::STLtriangle::write(ostream& os)
os.write(reinterpret_cast<char*>(&attrib_), sizeof(STLattrib));
}
// * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * //
inline Foam::Ostream& Foam::operator<<(Ostream& os, const STLtriangle& t)
@ -110,6 +113,4 @@ inline Foam::Ostream& Foam::operator<<(Ostream& os, const STLtriangle& t)
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// ************************************************************************* //

33
src/surfMesh/surfaceFormats/surfaceFormatsCore.C
View File

@ -38,8 +38,7 @@ Foam::word Foam::fileFormats::surfaceFormatsCore::nativeExt("ofs");
// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
Foam::string
Foam::fileFormats::surfaceFormatsCore::getLineNoComment
Foam::string Foam::fileFormats::surfaceFormatsCore::getLineNoComment
(
IFstream& is
)
@ -54,9 +53,12 @@ Foam::fileFormats::surfaceFormatsCore::getLineNoComment
return line;
}
#if 0
Foam::fileName
Foam::fileFormats::surfaceFormatsCore::localMeshFileName(const word& surfName)
Foam::fileName Foam::fileFormats::surfaceFormatsCore::localMeshFileName
(
const word& surfName
)
{
const word name(surfName.size() ? surfName : surfaceRegistry::defaultName);
@ -68,8 +70,7 @@ Foam::fileFormats::surfaceFormatsCore::localMeshFileName(const word& surfName)
}
Foam::fileName
Foam::fileFormats::surfaceFormatsCore::findMeshInstance
Foam::fileName Foam::fileFormats::surfaceFormatsCore::findMeshInstance
(
const Time& t,
const word& surfName
@ -109,8 +110,7 @@ Foam::fileFormats::surfaceFormatsCore::findMeshInstance
}
Foam::fileName
Foam::fileFormats::surfaceFormatsCore::findMeshFile
Foam::fileName Foam::fileFormats::surfaceFormatsCore::findMeshFile
(
const Time& t,
const word& surfName
@ -154,8 +154,7 @@ Foam::fileFormats::surfaceFormatsCore::findMeshFile
#endif
bool
Foam::fileFormats::surfaceFormatsCore::checkSupport
bool Foam::fileFormats::surfaceFormatsCore::checkSupport
(
const wordHashSet& available,
const word& ext,
@ -199,18 +198,4 @@ Foam::fileFormats::surfaceFormatsCore::~surfaceFormatsCore()
{}
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// ************************************************************************* //

19
src/surfMesh/surfaceFormats/surfaceFormatsCore.H
View File

@ -78,6 +78,7 @@ protected:
//- Read non-comment line
static string getLineNoComment(IFstream&);
public:
// Static Data
@ -86,6 +87,7 @@ public:
// Normally "ofs" (mnemonic: OF = OpenFOAM, S = Surface)
static word nativeExt;
// Static Member Functions
static bool checkSupport
@ -96,7 +98,6 @@ public:
const word& functionName
);
//- Return the local file name (within time directory)
// NEEDS FIXING
static fileName localMeshFileName(const word& surfName="");
@ -109,28 +110,16 @@ public:
// NEEDS FIXING
static fileName findMeshFile(const Time&, const word& surfName="");
// Constructors
//- Construct null
surfaceFormatsCore();
// Destructor
virtual ~surfaceFormatsCore();
// Member Functions
// Access
// Edit
// Read
// Write
// Member operators
// Ostream Operator
};

3
src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C
View File

@ -27,8 +27,6 @@ License
#include "TRIsurfaceFormat.H"
#include "ListOps.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class Face>
@ -235,4 +233,5 @@ void Foam::fileFormats::TRIsurfaceFormat<Face>::write
}
}
// ************************************************************************* //

12
src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.H
View File

@ -77,6 +77,7 @@ class TRIsurfaceFormat
//- Disallow default bitwise assignment
void operator=(const TRIsurfaceFormat<Face>&);
public:
// Constructors
@ -84,6 +85,7 @@ public:
//- Construct from file name
TRIsurfaceFormat(const fileName&);
// Selectors
//- Read file and return surface
@ -95,9 +97,11 @@ public:
);
}
// Destructor
virtual ~TRIsurfaceFormat()
{}
//- Destructor
virtual ~TRIsurfaceFormat()
{}
// Member Functions
@ -108,7 +112,6 @@ public:
// by default the output is not sorted by zones
static void write(const fileName&, const UnsortedMeshedSurface<Face>&);
//- Read from file
virtual bool read(const fileName&);
@ -117,7 +120,6 @@ public:
{
write(name, MeshedSurfaceProxy<Face>(*this));
}
};

5
src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.C
View File

@ -30,10 +30,6 @@ License
#include "IStringStream.H"
#include "Map.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::fileFormats::TRIsurfaceFormatCore::TRIsurfaceFormatCore
@ -49,6 +45,7 @@ Foam::fileFormats::TRIsurfaceFormatCore::TRIsurfaceFormatCore
read(filename);
}
// * * * * * * * * * * * * * * * * Destructors * * * * * * * * * * * * * * * //
Foam::fileFormats::TRIsurfaceFormatCore::~TRIsurfaceFormatCore()

7
src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.H
View File

@ -71,6 +71,7 @@ class TRIsurfaceFormatCore
//- The solid count, in the order of their first appearance
List<label> sizes_;
// Private Member Functions
//- Disallow default bitwise copy construct
@ -81,6 +82,7 @@ class TRIsurfaceFormatCore
bool read(const fileName&);
public:
// Constructors
@ -88,10 +90,12 @@ public:
//- Read from file, filling in the information
TRIsurfaceFormatCore(const fileName&);
// Destructor
~TRIsurfaceFormatCore();
// Member Functions
//- File read was already sorted
@ -126,7 +130,6 @@ public:
{
return sizes_;
}
};
@ -137,8 +140,6 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
// ************************************************************************* //

1
src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatRunTime.C
View File

@ -30,6 +30,7 @@ License
#include "addToMemberFunctionSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
namespace fileFormats

3
src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
View File

@ -26,9 +26,8 @@ License
#include "VTKsurfaceFormat.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class Face>
void Foam::fileFormats::VTKsurfaceFormat<Face>::writeHeaderPolygons
(

28
src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H
View File

@ -70,6 +70,7 @@ class VTKsurfaceFormat
//- Disallow default bitwise assignment
void operator=(const VTKsurfaceFormat<Face>&);
public:
// Constructors
@ -77,30 +78,35 @@ public:
//- Construct null
VTKsurfaceFormat();
// Selectors
// Destructor
virtual ~VTKsurfaceFormat()
{}
// Member Functions
// Write
//- Write surface mesh components by proxy
static void write(const fileName&, const MeshedSurfaceProxy<Face>&);
//- Write surface mesh components by proxy
static void write
(
const fileName&, const MeshedSurfaceProxy<Face>&
);
//- Write UnsortedMeshedSurface, the output remains unsorted
static void write(const fileName&, const UnsortedMeshedSurface<Face>&);
//- Write UnsortedMeshedSurface, the output remains unsorted
static void write
(
const fileName&, const UnsortedMeshedSurface<Face>&
);
//- Write object
virtual void write(Ostream& os) const
{
write(os, MeshedSurfaceProxy<Face>(*this));
}
//- Write object
virtual void write(Ostream& os) const
{
write(os, MeshedSurfaceProxy<Face>(*this));
}
};

4
src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.C
View File

@ -27,8 +27,6 @@ License
#include "VTKsurfaceFormatCore.H"
#include "clock.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::fileFormats::VTKsurfaceFormatCore::writeHeader
@ -127,6 +125,4 @@ void Foam::fileFormats::VTKsurfaceFormatCore::writeTail
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
// ************************************************************************* //

22
src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.H
View File

@ -54,21 +54,21 @@ namespace fileFormats
class VTKsurfaceFormatCore
{
protected:
// Protected Member Functions
//- Write header information with points
static void writeHeader
(
Ostream&,
const pointField&
);
//- Write header information with points
static void writeHeader
(
Ostream&,
const pointField&
);
//- Write trailing information with zone information
static void writeTail(Ostream&, const UList<surfZone>&);
//- Write trailing information with zone Ids
static void writeTail(Ostream&, const UList<label>& zoneIds);
//- Write trailing information with zone information
static void writeTail(Ostream&, const UList<surfZone>&);
//- Write trailing information with zone Ids
static void writeTail(Ostream&, const UList<label>& zoneIds);
};

1
src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatRunTime.C
View File

@ -30,6 +30,7 @@ License
#include "addToMemberFunctionSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
namespace fileFormats

3
src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.C
View File

@ -30,8 +30,6 @@ License
#include "OFstream.H"
#include "ListOps.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Face>
@ -140,7 +138,6 @@ void Foam::fileFormats::WRLsurfaceFormat<Face>::write
" }\n" // end Shape
" ]\n" // end children
"}\n"; // end Group
}

2
src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.H
View File

@ -74,8 +74,6 @@ public:
//- Construct null
WRLsurfaceFormat();
// Selectors
// Destructor

6
src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatCore.C
View File

@ -27,8 +27,6 @@ License
#include "WRLsurfaceFormatCore.H"
#include "clock.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::fileFormats::WRLsurfaceFormatCore::writeHeader
@ -52,8 +50,6 @@ void Foam::fileFormats::WRLsurfaceFormatCore::writeHeader
os << "# " << zoneI << " " << zoneLst[zoneI].name()
<< " (nFaces: " << zoneLst[zoneI].size() << ")" << nl;
}
}
@ -75,6 +71,4 @@ void Foam::fileFormats::WRLsurfaceFormatCore::writeAppearance
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
// ************************************************************************* //

1
src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatRunTime.C
View File

@ -30,6 +30,7 @@ License
#include "addToMemberFunctionSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
namespace fileFormats

2
src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.C
View File

@ -32,8 +32,6 @@ License
#include "OFstream.H"
#include "ListOps.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Face>

2
src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.H
View File

@ -73,8 +73,6 @@ public:
//- Construct null
X3DsurfaceFormat();
// Selectors
// Destructor

4
src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormatCore.C
View File

@ -27,8 +27,6 @@ License
#include "X3DsurfaceFormatCore.H"
#include "clock.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::fileFormats::X3DsurfaceFormatCore::writeHeader
@ -65,6 +63,4 @@ void Foam::fileFormats::X3DsurfaceFormatCore::writeAppearance
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
// ************************************************************************* //

2
src/surfMesh/surfaceRegistry/surfaceRegistry.C
View File

@ -62,7 +62,5 @@ Foam::surfaceRegistry::surfaceRegistry
Foam::surfaceRegistry::~surfaceRegistry()
{}
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
// ************************************************************************* //

Some files were not shown because too many files have changed in this diff Show More