Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
integration-cfmesh
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Community
integration-cfmesh
Commits
278ebae5
Commit
278ebae5
authored
Sep 14, 2017
by
Andrew Heather
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
COMP: Initial updates for integration into OpenFOAM
parent
4c98ca6f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
28 deletions
+0
-28
meshLibrary/Make/options
meshLibrary/Make/options
+0
-4
meshLibrary/utilities/helperClasses/geometry/quadricFitting/quadricFittingI.H
...s/helperClasses/geometry/quadricFitting/quadricFittingI.H
+0
-4
meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/tetMeshOptimisation.C
...y/meshOptimizer/tetMeshOptimisation/tetMeshOptimisation.C
+0
-12
meshLibrary/utilities/triSurfaceTools/triSurface2DCheck/triSurface2DCheck.C
...ies/triSurfaceTools/triSurface2DCheck/triSurface2DCheck.C
+0
-8
No files found.
meshLibrary/Make/options
View file @
278ebae5
...
...
@@ -14,10 +14,6 @@ ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
endif
endif
ifeq (v, $(findstring v, $(WM_PROJECT_VERSION)))
CFMESH_MACROS += -DOpenCFDSpecific
endif
ifeq ($(WM_PROJECT), foam)
VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
ifeq ($(VER), 1)
...
...
meshLibrary/utilities/helperClasses/geometry/quadricFitting/quadricFittingI.H
View file @
278ebae5
...
...
@@ -52,11 +52,7 @@ void quadricFitting::calculateNormalVector()
//- estimate the normal as the eigenvector associated
//- to the smallest eigenvalue
# ifdef OpenCFDSpecific
normal_
=
eigenVectors
(
mat
,
ev
).
x
();
# else
normal_
=
eigenVector
(
mat
,
ev
[
0
]);
# endif
}
void
quadricFitting
::
calculateCoordinateSystem
()
...
...
meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/tetMeshOptimisation.C
View file @
278ebae5
...
...
@@ -495,11 +495,7 @@ void tetMeshOptimisation::optimiseBoundaryVolumeOptimizer
if
(
mag
(
ev
[
2
])
>
(
mag
(
ev
[
1
])
+
mag
(
ev
[
0
]))
)
{
//- ordinary surface vertex
# ifdef OpenCFDSpecific
vector
normal
=
eigenVectors
(
nt
,
ev
).
z
();
# else
vector
normal
=
eigenVector
(
nt
,
ev
[
2
]);
# endif
normal
/=
(
mag
(
normal
)
+
VSMALL
);
disp
-=
(
disp
&
normal
)
*
normal
;
...
...
@@ -507,19 +503,11 @@ void tetMeshOptimisation::optimiseBoundaryVolumeOptimizer
else
if
(
mag
(
ev
[
1
])
>
0
.
5
*
(
mag
(
ev
[
2
])
+
mag
(
ev
[
0
]))
)
{
//- this vertex is on an edge
# ifdef OpenCFDSpecific
vector
normal1
=
eigenVectors
(
nt
,
ev
).
y
();
# else
vector
normal1
=
eigenVector
(
nt
,
ev
[
1
]);
# endif
normal1
/=
(
mag
(
normal1
)
+
VSMALL
);
# ifdef OpenCFDSpecific
vector
normal2
=
eigenVectors
(
nt
,
ev
).
z
();
# else
vector
normal2
=
eigenVector
(
nt
,
ev
[
2
]);
# endif
normal2
/=
(
mag
(
normal2
)
+
VSMALL
);
...
...
meshLibrary/utilities/triSurfaceTools/triSurface2DCheck/triSurface2DCheck.C
View file @
278ebae5
...
...
@@ -86,19 +86,11 @@ bool triSurface2DCheck::is2DSurface() const
//- calculate the plane normal as a cross prduct of the two
//- eigenVectors spanning the plane
# ifdef OpenCFDSpecific
const
vector
n
(
eigenVectors
(
covarianceMatrix_
,
eigenVal
).
y
()
^
eigenVectors
(
covarianceMatrix_
,
eigenVal
).
z
()
);
# else
const
vector
n
(
eigenVector
(
covarianceMatrix_
,
eigenVal
[
1
])
^
eigenVector
(
covarianceMatrix_
,
eigenVal
[
2
])
);
# endif
//- check if the plane is in the x-y plane of the coordinate system
if
(
mag
(
n
.
x
())
>
SMALL
||
mag
(
n
.
y
())
>
SMALL
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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