Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
77913b2e
Commit
77913b2e
authored
Oct 23, 2008
by
henry
Browse files
Same change as before again.
parent
c781b84d
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/finiteVolume/fvMesh/fvMesh.C
View file @
77913b2e
...
...
@@ -42,15 +42,9 @@ License
#include
"extendedLeastSquaresVectors.H"
#include
"extendedLeastSquaresVectors.H"
#include
"leastSquaresVectors.H"
<<<<<<<
HEAD
:
src
/
finiteVolume
/
fvMesh
/
fvMesh
.
C
#include
"CentredFitData.H"
#include
"linearFitPolynomial.H"
#include
"quadraticLinearFitPolynomial.H"
=======
//#include "linearFitData.H"
//#include "quadraticFitData.H"
//#include "quadraticFitSnGradData.H"
>>>>>>>
a5197e512825ed4dd1a45d45c1706c8b56f61489
:
src
/
finiteVolume
/
fvMesh
/
fvMesh
.
C
#include
"skewCorrectionVectors.H"
#include
"centredCECStencilObject.H"
...
...
@@ -100,14 +94,8 @@ void Foam::fvMesh::clearGeom()
extendedLeastSquaresVectors
::
Delete
(
*
this
);
extendedLeastSquaresVectors
::
Delete
(
*
this
);
leastSquaresVectors
::
Delete
(
*
this
);
<<<<<<<
HEAD
:
src
/
finiteVolume
/
fvMesh
/
fvMesh
.
C
CentredFitData
<
linearFitPolynomial
>::
Delete
(
*
this
);
CentredFitData
<
quadraticLinearFitPolynomial
>::
Delete
(
*
this
);
=======
//linearFitData::Delete(*this);
//quadraticFitData::Delete(*this);
//quadraticFitSnGradData::Delete(*this);
>>>>>>>
a5197e512825ed4dd1a45d45c1706c8b56f61489
:
src
/
finiteVolume
/
fvMesh
/
fvMesh
.
C
skewCorrectionVectors
::
Delete
(
*
this
);
}
...
...
@@ -122,14 +110,8 @@ void Foam::fvMesh::clearAddressing()
extendedLeastSquaresVectors
::
Delete
(
*
this
);
extendedLeastSquaresVectors
::
Delete
(
*
this
);
leastSquaresVectors
::
Delete
(
*
this
);
<<<<<<<
HEAD
:
src
/
finiteVolume
/
fvMesh
/
fvMesh
.
C
CentredFitData
<
linearFitPolynomial
>::
Delete
(
*
this
);
CentredFitData
<
quadraticLinearFitPolynomial
>::
Delete
(
*
this
);
=======
//linearFitData::Delete(*this);
//quadraticFitData::Delete(*this);
//quadraticFitSnGradData::Delete(*this);
>>>>>>>
a5197e512825ed4dd1a45d45c1706c8b56f61489
:
src
/
finiteVolume
/
fvMesh
/
fvMesh
.
C
skewCorrectionVectors
::
Delete
(
*
this
);
centredCECStencilObject
::
Delete
(
*
this
);
...
...
@@ -680,142 +662,12 @@ Foam::tmp<Foam::scalarField> Foam::fvMesh::movePoints(const pointField& p)
// Hack until proper callbacks. Below are all the fvMesh MeshObjects with a
// movePoints function.
<<<<<<<
HEAD
:
src
/
finiteVolume
/
fvMesh
/
fvMesh
.
C
MeshObjectMovePoints
<
volPointInterpolation
>
(
*
this
);
MeshObjectMovePoints
<
extendedLeastSquaresVectors
>
(
*
this
);
MeshObjectMovePoints
<
leastSquaresVectors
>
(
*
this
);
MeshObjectMovePoints
<
CentredFitData
<
linearFitPolynomial
>
>
(
*
this
);
MeshObjectMovePoints
<
CentredFitData
<
quadraticLinearFitPolynomial
>
>
(
*
this
);
MeshObjectMovePoints
<
skewCorrectionVectors
>
(
*
this
);
=======
// volPointInterpolation
if
(
db
().
objectRegistry
::
foundObject
<
volPointInterpolation
>
(
volPointInterpolation
::
typeName
)
)
{
const_cast
<
volPointInterpolation
&>
(
db
().
objectRegistry
::
lookupObject
<
volPointInterpolation
>
(
volPointInterpolation
::
typeName
)
).
movePoints
();
}
// extendedLeastSquaresVectors
if
(
db
().
objectRegistry
::
foundObject
<
extendedLeastSquaresVectors
>
(
extendedLeastSquaresVectors
::
typeName
)
)
{
const_cast
<
extendedLeastSquaresVectors
&>
(
db
().
objectRegistry
::
lookupObject
<
extendedLeastSquaresVectors
>
(
extendedLeastSquaresVectors
::
typeName
)
).
movePoints
();
}
// leastSquaresVectors
if
(
db
().
objectRegistry
::
foundObject
<
leastSquaresVectors
>
(
leastSquaresVectors
::
typeName
)
)
{
const_cast
<
leastSquaresVectors
&>
(
db
().
objectRegistry
::
lookupObject
<
leastSquaresVectors
>
(
leastSquaresVectors
::
typeName
)
).
movePoints
();
}
//// linearFitData
//if
//(
// db().objectRegistry::foundObject<linearFitData>
// (
// linearFitData::typeName
// )
//)
//{
// const_cast<linearFitData&>
// (
// db().objectRegistry::lookupObject<linearFitData>
// (
// linearFitData::typeName
// )
// ).movePoints();
//}
//// quadraticFitData
//if
//(
// db().objectRegistry::foundObject<quadraticFitData>
// (
// quadraticFitData::typeName
// )
//)
//{
// const_cast<quadraticFitData&>
// (
// db().objectRegistry::lookupObject<quadraticFitData>
// (
// quadraticFitData::typeName
// )
// ).movePoints();
//}
//// quadraticFitSnGradData
//if
//(
// db().objectRegistry::foundObject<quadraticFitSnGradData>
// (
// quadraticFitSnGradData::typeName
// )
//)
//{
// const_cast<quadraticFitSnGradData&>
// (
// db().objectRegistry::lookupObject<quadraticFitSnGradData>
// (
// quadraticFitSnGradData::typeName
// )
// ).movePoints();
//}
// skewCorrectionVectors
if
(
db
().
objectRegistry
::
foundObject
<
skewCorrectionVectors
>
(
skewCorrectionVectors
::
typeName
)
)
{
const_cast
<
skewCorrectionVectors
&>
(
db
().
objectRegistry
::
lookupObject
<
skewCorrectionVectors
>
(
skewCorrectionVectors
::
typeName
)
).
movePoints
();
}
>>>>>>>
a5197e512825ed4dd1a45d45c1706c8b56f61489
:
src
/
finiteVolume
/
fvMesh
/
fvMesh
.
C
return
tsweptVols
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment