Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Praetorius, Simon
dune-amdis
Commits
245d9d94
Commit
245d9d94
authored
Nov 18, 2018
by
Praetorius, Simon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change return-type of make functions from shared_ptr to unique_ptr
parent
e034a097
Pipeline
#1442
passed with stage
in 19 minutes and 28 seconds
Changes
7
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
18 additions
and
13 deletions
+18
-13
src/amdis/FileWriter.hpp
src/amdis/FileWriter.hpp
+8
-3
src/amdis/LocalAssembler.hpp
src/amdis/LocalAssembler.hpp
+2
-2
src/amdis/LocalOperator.hpp
src/amdis/LocalOperator.hpp
+1
-1
src/amdis/ProblemStat.inc.hpp
src/amdis/ProblemStat.inc.hpp
+2
-2
src/amdis/QuadratureFactory.hpp
src/amdis/QuadratureFactory.hpp
+3
-3
src/amdis/linear_algebra/DOFMatrixBase.inc.hpp
src/amdis/linear_algebra/DOFMatrixBase.inc.hpp
+1
-1
src/amdis/linear_algebra/DOFVectorBase.inc.hpp
src/amdis/linear_algebra/DOFVectorBase.inc.hpp
+1
-1
No files found.
src/amdis/FileWriter.hpp
View file @
245d9d94
...
...
@@ -123,13 +123,18 @@ namespace AMDiS
Dune
::
VTK
::
OutputType
mode_
;
};
template
<
class
GlobalBasis
,
class
ValueType
,
class
TreePath
>
auto
makeFileWriter
(
std
::
string
const
&
name
,
DiscreteFunction
<
GlobalBasis
,
ValueType
,
TreePath
>
const
&
discreteFct
)
{
return
FileWriter
<
GlobalBasis
,
ValueType
,
TreePath
>
{
name
,
discreteFct
};
}
template
<
class
GlobalBasis
,
class
ValueType
,
class
TreePath
>
std
::
shared_ptr
<
FileWriter
<
GlobalBasis
,
ValueType
,
TreePath
>>
makeFileWriterPtr
(
std
::
string
const
&
name
,
auto
makeFileWriterPtr
(
std
::
string
const
&
name
,
DiscreteFunction
<
GlobalBasis
,
ValueType
,
TreePath
>
const
&
discreteFct
)
{
return
std
::
make_
shared
<
FileWriter
<
GlobalBasis
,
ValueType
,
TreePath
>>
(
name
,
discreteFct
);
return
std
::
make_
unique
<
FileWriter
<
GlobalBasis
,
ValueType
,
TreePath
>>
(
name
,
discreteFct
);
}
}
// end namespace AMDiS
src/amdis/LocalAssembler.hpp
View file @
245d9d94
...
...
@@ -149,13 +149,13 @@ namespace AMDiS
std
::
enable_if_t
<
not
Traits
::
IsReferenceWrapper
<
Operator
>
::
value
,
int
>
=
0
>
auto
makeLocalAssemblerPtr
(
Operator
const
&
op
,
Nodes
const
&
...)
{
return
std
::
make_
shared
<
LocalAssembler
<
LocalContext
,
Operator
,
Nodes
...
>>
(
op
);
return
std
::
make_
unique
<
LocalAssembler
<
LocalContext
,
Operator
,
Nodes
...
>>
(
op
);
}
template
<
class
LocalContext
,
class
Operator
,
class
...
Nodes
>
auto
makeLocalAssemblerPtr
(
std
::
reference_wrapper
<
Operator
>
const
&
op
,
Nodes
const
&
...)
{
return
std
::
make_
shared
<
LocalAssembler
<
LocalContext
,
Operator
,
Nodes
...
>>
(
op
);
return
std
::
make_
unique
<
LocalAssembler
<
LocalContext
,
Operator
,
Nodes
...
>>
(
op
);
}
}
// end namespace AMDiS
src/amdis/LocalOperator.hpp
View file @
245d9d94
...
...
@@ -200,7 +200,7 @@ namespace AMDiS
template
<
class
Derived
,
class
LocalContext
,
class
GridView
>
auto
makeLocalOperatorPtr
(
LocalOperator
<
Derived
,
LocalContext
>
const
&
localOp
,
GridView
const
&
/*gridView*/
)
{
return
std
::
make_
shared
<
Derived
>
(
localOp
.
derived
());
return
std
::
make_
unique
<
Derived
>
(
localOp
.
derived
());
}
}
// end namespace AMDiS
src/amdis/ProblemStat.inc.hpp
View file @
245d9d94
...
...
@@ -258,8 +258,8 @@ addDirichletBC(Predicate const& predicate, RowTreePath row, ColTreePath col, Val
using
Range
=
RangeType_t
<
decltype
(
i
)
>
;
using
BcType
=
DirichletBC
<
WorldVector
,
Range
>
;
auto
bc
=
std
::
make_
shared
<
BcType
>
(
predicate
,
valueGridFct
);
constraints_
[
i
][
j
].
push_back
(
bc
);
auto
bc
=
std
::
make_
unique
<
BcType
>
(
predicate
,
valueGridFct
);
constraints_
[
i
][
j
].
push_back
(
std
::
move
(
bc
)
)
;
// TODO: make DirichletBC an abstract class and add specialization with gridfunction type
}
...
...
src/amdis/QuadratureFactory.hpp
View file @
245d9d94
...
...
@@ -85,7 +85,7 @@ namespace AMDiS
auto
makeQuadratureFactoryPtr
(
PreQuadFactoryFromLocalFunction
const
&
/*pre*/
)
{
using
Factory
=
QuadFactoryFromLocalFunction
<
ctype
,
dimension
,
LocalFunction
>
;
return
std
::
shared_ptr
<
Factory
>
(
new
Factory
{}
);
return
std
::
make_unique
<
Factory
>
(
);
}
...
...
@@ -141,7 +141,7 @@ namespace AMDiS
auto
makeQuadratureFactoryPtr
(
PreQuadFactoryFromOrder
const
&
pre
)
{
using
Factory
=
QuadFactoryFromOrder
<
ctype
,
dimension
,
LocalFunction
>
;
return
std
::
make_
shared
<
Factory
>
(
pre
.
order
,
pre
.
qt
);
return
std
::
make_
unique
<
Factory
>
(
pre
.
order
,
pre
.
qt
);
}
...
...
@@ -191,7 +191,7 @@ namespace AMDiS
auto
makeQuadratureFactoryPtr
(
PreQuadFactoryFromRule
<
QuadRule
>
const
&
pre
)
{
using
Factory
=
QuadFactoryFromRule
<
ctype
,
dimension
,
LocalFunction
>
;
return
std
::
make_
shared
<
Factory
>
(
pre
.
rule
);
return
std
::
make_
unique
<
Factory
>
(
pre
.
rule
);
}
}
// end namespace AMDiS
src/amdis/linear_algebra/DOFMatrixBase.inc.hpp
View file @
245d9d94
...
...
@@ -62,7 +62,7 @@ addOperator(ContextTag contextTag, Operator const& preOp,
auto
op
=
makeLocalOperator
<
Context
>
(
preOp
,
rowBasis_
->
gridView
());
auto
localAssembler
=
makeLocalAssemblerPtr
<
Context
>
(
std
::
move
(
op
),
i
,
j
);
operators_
[
i
][
j
].
push
(
contextTag
,
localAssembler
);
operators_
[
i
][
j
].
push
(
contextTag
,
std
::
move
(
localAssembler
)
)
;
}
...
...
src/amdis/linear_algebra/DOFVectorBase.inc.hpp
View file @
245d9d94
...
...
@@ -53,7 +53,7 @@ addOperator(ContextTag contextTag, Operator const& preOp, TreePath path)
auto
op
=
makeLocalOperator
<
Context
>
(
preOp
,
basis_
->
gridView
());
auto
localAssembler
=
makeLocalAssemblerPtr
<
Context
>
(
std
::
move
(
op
),
i
);
operators_
[
i
].
push
(
contextTag
,
localAssembler
);
operators_
[
i
].
push
(
contextTag
,
std
::
move
(
localAssembler
)
)
;
}
...
...
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