Permalink
Browse files

ENH: timeVaryingMapped: pointField version of timeVaryingMapped.

  • Loading branch information...
1 parent a977e64 commit e29adc111f7db2b86df61f954e9089a47fbd9d7e mattijs committed Apr 12, 2012
Oops, something went wrong.
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -66,9 +66,9 @@ SourceFiles
#define timeVaryingMappedFixedValueFvPatchField_H
#include "fixedValueFvPatchFields.H"
-#include "coordinateSystem.H"
#include "FixedList.H"
#include "instantList.H"
+#include "pointToPointPlanarInterpolation.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -95,16 +95,8 @@ class timeVaryingMappedFixedValueFvPatchField
//- Fraction of perturbation (fraction of bounding box) to add
scalar perturb_;
- //- Coordinate system
- autoPtr<coordinateSystem> referenceCS_;
-
- //- Current interpolation addressing to face centres of underlying
- // patch
- List<FixedList<label, 3> > nearestVertex_;
-
- //- Current interpolation factors to face centres of underlying
- // patch
- List<FixedList<scalar, 3> > nearestVertexWeight_;
+ //- 2D interpolation
+ autoPtr<pointToPointPlanarInterpolation> mapperPtr_;
//- List of boundaryData time directories
instantList sampleTimes_;
@@ -127,31 +119,6 @@ class timeVaryingMappedFixedValueFvPatchField
//- If setAverage: end average value
Type endAverage_;
-
- // Private Member Functions
-
- //- Get names of times
- static wordList timeNames(const instantList&);
-
- //- Find times around current time
- void findTime
- (
- const fileName& instance,
- const fileName& local,
- const scalar timeVal,
- label& lo,
- label& hi
- ) const;
-
-
- //- Read boundary points and determine interpolation weights to patch
- // faceCentres
- void readSamplePoints();
-
- //- Do actual interpolation using current weights
- tmp<Field<Type> > interpolate(const Field<Type>&) const;
-
-
public:
//- Runtime type information
@@ -224,12 +191,6 @@ public:
// Access
- //- Return the coordinateSystem
- const coordinateSystem& referenceCS() const
- {
- return referenceCS_;
- }
-
//- Return startSampledValues
const Field<Type> startSampledValues()
{
@@ -26,13 +26,19 @@ motionDiffusivity/manipulators/exponential/exponentialDiffusivity.C
fvPatchFields/derived/cellMotion/cellMotionFvPatchFields.C
fvPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementFvPatchFields.C
-pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
-pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
-
-pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
-pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
-pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
-pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
-pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
+derivedPoint = pointPatchFields/derived
+
+$(derivedPoint)/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
+$(derivedPoint)/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
+
+$(derivedPoint)/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
+$(derivedPoint)/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
+$(derivedPoint)/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
+$(derivedPoint)/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
+$(derivedPoint)/waveDisplacement/waveDisplacementPointPatchVectorField.C
+
+$(derivedPoint)/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchFields.C
+
+
LIB = $(FOAM_LIBBIN)/libfvMotionSolvers
Oops, something went wrong.

0 comments on commit e29adc1

Please sign in to comment.