Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
ScalFMM
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
5
Issues
5
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
solverstack
ScalFMM
Commits
1d83eea0
Commit
1d83eea0
authored
Apr 28, 2015
by
BLANCHARD Pierre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed default behaviour for Unif kernel and m2lhandler ctors.
parent
87ef2404
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
10 deletions
+16
-10
Src/Kernels/Uniform/FUnifKernel.hpp
Src/Kernels/Uniform/FUnifKernel.hpp
+2
-2
Src/Kernels/Uniform/FUnifM2LHandler.hpp
Src/Kernels/Uniform/FUnifM2LHandler.hpp
+4
-4
Src/Kernels/Uniform/FUnifTensorialKernel.hpp
Src/Kernels/Uniform/FUnifTensorialKernel.hpp
+8
-2
Src/Kernels/Uniform/FUnifTensorialM2LHandler.hpp
Src/Kernels/Uniform/FUnifTensorialM2LHandler.hpp
+2
-2
No files found.
Src/Kernels/Uniform/FUnifKernel.hpp
View file @
1d83eea0
...
...
@@ -73,13 +73,13 @@ public:
const
FReal
inBoxWidth
,
const
FPoint
<
FReal
>&
inBoxCenter
,
const
MatrixKernelClass
*
const
inMatrixKernel
,
const
int
inLeafLevelSeparationCriterion
)
const
int
inLeafLevelSeparationCriterion
=
1
)
:
FAbstractUnifKernel
<
FReal
,
CellClass
,
ContainerClass
,
MatrixKernelClass
,
ORDER
,
NVALS
>
(
inTreeHeight
,
inBoxWidth
,
inBoxCenter
),
MatrixKernel
(
inMatrixKernel
),
M2LHandler
(
MatrixKernel
,
inTreeHeight
,
inBoxWidth
,
inLeafLevelSeparationCriterion
)
,
inLeafLevelSeparationCriterion
),
LeafLevelSeparationCriterion
(
inLeafLevelSeparationCriterion
)
{
}
...
...
Src/Kernels/Uniform/FUnifM2LHandler.hpp
View file @
1d83eea0
...
...
@@ -197,7 +197,7 @@ class FUnifM2LHandler<FReal, ORDER,HOMOGENEOUS>
public:
template
<
typename
MatrixKernelClass
>
FUnifM2LHandler
(
const
MatrixKernelClass
*
const
MatrixKernel
,
const
unsigned
int
,
const
FReal
,
const
int
inLeafLevelSeparationCriterion
)
FUnifM2LHandler
(
const
MatrixKernelClass
*
const
MatrixKernel
,
const
unsigned
int
,
const
FReal
,
const
int
inLeafLevelSeparationCriterion
=
1
)
:
FC
(
nullptr
),
Dft
(),
opt_rc
(
rc
/
2
+
1
),
LeafLevelSeparationCriterion
(
inLeafLevelSeparationCriterion
)
{
// init DFT
...
...
@@ -216,7 +216,7 @@ public:
* Copy constructor
*/
FUnifM2LHandler
(
const
FUnifM2LHandler
&
other
)
:
FC
(
other
.
FC
),
Dft
(),
opt_rc
(
other
.
opt_rc
)
:
FC
(
other
.
FC
),
Dft
(),
opt_rc
(
other
.
opt_rc
)
,
LeafLevelSeparationCriterion
(
other
.
LeafLevelSeparationCriterion
)
{
// init DFT
const
int
steps
[
dimfft
]
=
{
rc
};
...
...
@@ -361,7 +361,7 @@ class FUnifM2LHandler<FReal,ORDER,NON_HOMOGENEOUS>
public:
template
<
typename
MatrixKernelClass
>
FUnifM2LHandler
(
const
MatrixKernelClass
*
const
MatrixKernel
,
const
unsigned
int
inTreeHeight
,
const
FReal
inRootCellWidth
,
const
int
inLeafLevelSeparationCriterion
)
FUnifM2LHandler
(
const
MatrixKernelClass
*
const
MatrixKernel
,
const
unsigned
int
inTreeHeight
,
const
FReal
inRootCellWidth
,
const
int
inLeafLevelSeparationCriterion
=
1
)
:
TreeHeight
(
inTreeHeight
),
RootCellWidth
(
inRootCellWidth
),
Dft
(),
opt_rc
(
rc
/
2
+
1
),
LeafLevelSeparationCriterion
(
inLeafLevelSeparationCriterion
)
...
...
@@ -390,7 +390,7 @@ public:
:
FC
(
other
.
FC
),
TreeHeight
(
other
.
TreeHeight
),
RootCellWidth
(
other
.
RootCellWidth
),
Dft
(),
opt_rc
(
other
.
opt_rc
)
Dft
(),
opt_rc
(
other
.
opt_rc
)
,
LeafLevelSeparationCriterion
(
other
.
LeafLevelSeparationCriterion
)
{
// init DFT
const
int
steps
[
dimfft
]
=
{
rc
};
...
...
Src/Kernels/Uniform/FUnifTensorialKernel.hpp
View file @
1d83eea0
...
...
@@ -84,6 +84,9 @@ protected://PB: for OptiDis
/// Needed for M2L operator
const
M2LHandlerClass
M2LHandler
;
/// Leaf level separation criterion
const
int
LeafLevelSeparationCriterion
;
public:
/**
* The constructor initializes all constant attributes and it reads the
...
...
@@ -94,13 +97,16 @@ public:
const
FReal
inBoxWidth
,
const
FPoint
<
FReal
>&
inBoxCenter
,
const
MatrixKernelClass
*
const
inMatrixKernel
,
const
FReal
inBoxWidthExtension
)
const
FReal
inBoxWidthExtension
,
const
int
inLeafLevelSeparationCriterion
=
1
)
:
FAbstractUnifKernel
<
FReal
,
CellClass
,
ContainerClass
,
MatrixKernelClass
,
ORDER
,
NVALS
>
(
inTreeHeight
,
inBoxWidth
,
inBoxCenter
,
inBoxWidthExtension
),
MatrixKernel
(
inMatrixKernel
),
M2LHandler
(
MatrixKernel
,
inTreeHeight
,
inBoxWidth
,
inBoxWidthExtension
)
inBoxWidthExtension
,
inLeafLevelSeparationCriterion
),
LeafLevelSeparationCriterion
(
inLeafLevelSeparationCriterion
)
{
}
...
...
Src/Kernels/Uniform/FUnifTensorialM2LHandler.hpp
View file @
1d83eea0
...
...
@@ -226,7 +226,7 @@ class FUnifTensorialM2LHandler<FReal, ORDER,MatrixKernelClass,HOMOGENEOUS>
public:
FUnifTensorialM2LHandler
(
const
MatrixKernelClass
*
const
MatrixKernel
,
const
unsigned
int
,
const
FReal
,
const
FReal
inCellWidthExtension
,
const
int
inLeafLevelSeparationCriterion
)
FUnifTensorialM2LHandler
(
const
MatrixKernelClass
*
const
MatrixKernel
,
const
unsigned
int
,
const
FReal
,
const
FReal
inCellWidthExtension
,
const
int
inLeafLevelSeparationCriterion
=
1
)
:
CellWidthExtension
(
inCellWidthExtension
),
Dft
(),
opt_rc
(
rc
/
2
+
1
),
LeafLevelSeparationCriterion
(
inLeafLevelSeparationCriterion
)
{
...
...
@@ -421,7 +421,7 @@ class FUnifTensorialM2LHandler<FReal,ORDER,MatrixKernelClass,NON_HOMOGENEOUS>
public:
FUnifTensorialM2LHandler
(
const
MatrixKernelClass
*
const
MatrixKernel
,
const
unsigned
int
inTreeHeight
,
const
FReal
inRootCellWidth
,
const
FReal
inCellWidthExtension
,
const
int
inLeafLevelSeparationCriterion
)
FUnifTensorialM2LHandler
(
const
MatrixKernelClass
*
const
MatrixKernel
,
const
unsigned
int
inTreeHeight
,
const
FReal
inRootCellWidth
,
const
FReal
inCellWidthExtension
,
const
int
inLeafLevelSeparationCriterion
=
1
)
:
TreeHeight
(
inTreeHeight
),
RootCellWidth
(
inRootCellWidth
),
CellWidthExtension
(
inCellWidthExtension
),
...
...
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