Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Backofen, Rainer
amdis
Commits
784ec57d
Commit
784ec57d
authored
May 29, 2009
by
Thomas Witkowski
Browse files
small performace speedup for first order assembler.
parent
5134f0b8
Changes
2
Hide whitespace changes
Inline
Side-by-side
AMDiS/src/FirstOrderAssembler.cc
View file @
784ec57d
...
@@ -118,25 +118,21 @@ namespace AMDiS {
...
@@ -118,25 +118,21 @@ namespace AMDiS {
Lb
.
resize
(
nPoints
);
Lb
.
resize
(
nPoints
);
std
::
vector
<
double
>
phival
(
nCol
);
std
::
vector
<
double
>
phival
(
nCol
);
for
(
int
iq
=
0
;
iq
<
nPoints
;
iq
++
)
{
for
(
int
iq
=
0
;
iq
<
nPoints
;
iq
++
)
Lb
[
iq
].
set
(
0.0
);
Lb
[
iq
].
set
(
0.0
);
}
for
(
int
i
=
0
;
i
<
static_cast
<
int
>
(
terms
[
myRank
].
size
());
i
++
)
for
(
int
i
=
0
;
i
<
static_cast
<
int
>
(
terms
[
myRank
].
size
());
i
++
)
{
(
static_cast
<
FirstOrderTerm
*>
((
terms
[
myRank
][
i
])))
->
getLb
(
elInfo
,
nPoints
,
Lb
);
(
static_cast
<
FirstOrderTerm
*>
((
terms
[
myRank
][
i
])))
->
getLb
(
elInfo
,
nPoints
,
Lb
);
}
for
(
int
iq
=
0
;
iq
<
nPoints
;
iq
++
)
{
for
(
int
iq
=
0
;
iq
<
nPoints
;
iq
++
)
{
Lb
[
iq
]
*=
elInfo
->
getDet
();
Lb
[
iq
]
*=
elInfo
->
getDet
();
for
(
int
i
=
0
;
i
<
nCol
;
i
++
)
{
for
(
int
i
=
0
;
i
<
nCol
;
i
++
)
phival
[
i
]
=
(
*
(
phi
->
getPhi
(
i
)))(
quadrature
->
getLambda
(
iq
));
phival
[
i
]
=
(
*
(
phi
->
getPhi
(
i
)))(
quadrature
->
getLambda
(
iq
));
}
for
(
int
i
=
0
;
i
<
nRow
;
i
++
)
{
for
(
int
i
=
0
;
i
<
nRow
;
i
++
)
{
(
*
(
psi
->
getGrdPhi
(
i
)))(
quadrature
->
getLambda
(
iq
),
grdPsi
);
(
*
(
psi
->
getGrdPhi
(
i
)))(
quadrature
->
getLambda
(
iq
),
grdPsi
);
for
(
int
j
=
0
;
j
<
nCol
;
j
++
)
{
for
(
int
j
=
0
;
j
<
nCol
;
j
++
)
mat
[
i
][
j
]
+=
quadrature
->
getWeight
(
iq
)
*
(
Lb
[
iq
]
*
grdPsi
)
*
phival
[
j
];
mat
[
i
][
j
]
+=
quadrature
->
getWeight
(
iq
)
*
(
Lb
[
iq
]
*
grdPsi
)
*
phival
[
j
];
}
}
}
}
}
}
}
...
@@ -150,12 +146,10 @@ namespace AMDiS {
...
@@ -150,12 +146,10 @@ namespace AMDiS {
VectorOfFixVecs
<
DimVec
<
double
>
>
&
Lb
=
tmpLb
[
myRank
];
VectorOfFixVecs
<
DimVec
<
double
>
>
&
Lb
=
tmpLb
[
myRank
];
Lb
.
resize
(
nPoints
);
Lb
.
resize
(
nPoints
);
for
(
int
iq
=
0
;
iq
<
nPoints
;
iq
++
)
{
for
(
int
iq
=
0
;
iq
<
nPoints
;
iq
++
)
Lb
[
iq
].
set
(
0.0
);
Lb
[
iq
].
set
(
0.0
);
}
for
(
int
i
=
0
;
i
<
static_cast
<
int
>
(
terms
[
myRank
].
size
());
i
++
)
for
(
int
i
=
0
;
i
<
static_cast
<
int
>
(
terms
[
myRank
].
size
());
i
++
)
{
(
static_cast
<
FirstOrderTerm
*>
((
terms
[
myRank
][
i
])))
->
getLb
(
elInfo
,
nPoints
,
Lb
);
(
static_cast
<
FirstOrderTerm
*>
((
terms
[
myRank
][
i
])))
->
getLb
(
elInfo
,
nPoints
,
Lb
);
}
for
(
int
iq
=
0
;
iq
<
nPoints
;
iq
++
)
{
for
(
int
iq
=
0
;
iq
<
nPoints
;
iq
++
)
{
Lb
[
iq
]
*=
elInfo
->
getDet
();
Lb
[
iq
]
*=
elInfo
->
getDet
();
...
@@ -298,9 +292,8 @@ namespace AMDiS {
...
@@ -298,9 +292,8 @@ namespace AMDiS {
k
=
q10
->
getKVec
(
i
,
j
);
k
=
q10
->
getKVec
(
i
,
j
);
values
=
q10
->
getValVec
(
i
,
j
);
values
=
q10
->
getValVec
(
i
,
j
);
double
val
=
0.0
;
double
val
=
0.0
;
for
(
int
m
=
0
;
m
<
nEntries
[
i
][
j
];
m
++
)
{
for
(
int
m
=
0
;
m
<
nEntries
[
i
][
j
];
m
++
)
val
+=
values
[
m
]
*
Lb
[
0
][
k
[
m
]];
val
+=
values
[
m
]
*
Lb
[
0
][
k
[
m
]];
}
mat
[
i
][
j
]
+=
val
;
mat
[
i
][
j
]
+=
val
;
}
}
}
}
...
@@ -308,33 +301,33 @@ namespace AMDiS {
...
@@ -308,33 +301,33 @@ namespace AMDiS {
Stand01
::
Stand01
(
Operator
*
op
,
Assembler
*
assembler
,
Quadrature
*
quad
)
Stand01
::
Stand01
(
Operator
*
op
,
Assembler
*
assembler
,
Quadrature
*
quad
)
:
FirstOrderAssembler
(
op
,
assembler
,
quad
,
false
,
GRD_PHI
)
:
FirstOrderAssembler
(
op
,
assembler
,
quad
,
false
,
GRD_PHI
)
{}
{
VectorOfFixVecs
<
DimVec
<
double
>
>
grdPhi
(
assembler
->
getRowFESpace
()
->
getMesh
()
->
getDim
(),
nCol
,
NO_INIT
);
tmpGrdPhi
.
resize
(
omp_get_overall_max_threads
(),
grdPhi
);
}
void
Stand01
::
calculateElementMatrix
(
const
ElInfo
*
elInfo
,
ElementMatrix
&
mat
)
void
Stand01
::
calculateElementMatrix
(
const
ElInfo
*
elInfo
,
ElementMatrix
&
mat
)
{
{
VectorOfFixVecs
<
DimVec
<
double
>
>
grdPhi
(
dim
,
nCol
,
NO_INIT
);
const
BasisFunction
*
psi
=
owner
->
getRowFESpace
()
->
getBasisFcts
();
const
BasisFunction
*
psi
=
owner
->
getRowFESpace
()
->
getBasisFcts
();
const
BasisFunction
*
phi
=
owner
->
getColFESpace
()
->
getBasisFcts
();
const
BasisFunction
*
phi
=
owner
->
getColFESpace
()
->
getBasisFcts
();
int
nPoints
=
quadrature
->
getNumPoints
();
int
nPoints
=
quadrature
->
getNumPoints
();
int
myRank
=
omp_get_thread_num
();
int
myRank
=
omp_get_thread_num
();
VectorOfFixVecs
<
DimVec
<
double
>
>
&
Lb
=
tmpLb
[
myRank
];
VectorOfFixVecs
<
DimVec
<
double
>
>&
Lb
=
tmpLb
[
myRank
];
VectorOfFixVecs
<
DimVec
<
double
>
>&
grdPhi
=
tmpGrdPhi
[
myRank
];
Lb
.
resize
(
nPoints
);
Lb
.
resize
(
nPoints
);
for
(
int
iq
=
0
;
iq
<
nPoints
;
iq
++
)
{
for
(
int
iq
=
0
;
iq
<
nPoints
;
iq
++
)
Lb
[
iq
].
set
(
0.0
);
Lb
[
iq
].
set
(
0.0
);
}
for
(
int
i
=
0
;
i
<
static_cast
<
int
>
(
terms
[
myRank
].
size
());
i
++
)
for
(
int
i
=
0
;
i
<
static_cast
<
int
>
(
terms
[
myRank
].
size
());
i
++
)
{
(
static_cast
<
FirstOrderTerm
*>
((
terms
[
myRank
][
i
])))
->
getLb
(
elInfo
,
nPoints
,
Lb
);
(
static_cast
<
FirstOrderTerm
*>
((
terms
[
myRank
][
i
])))
->
getLb
(
elInfo
,
nPoints
,
Lb
);
}
for
(
int
iq
=
0
;
iq
<
nPoints
;
iq
++
)
{
for
(
int
iq
=
0
;
iq
<
nPoints
;
iq
++
)
{
Lb
[
iq
]
*=
elInfo
->
getDet
();
Lb
[
iq
]
*=
elInfo
->
getDet
();
for
(
int
i
=
0
;
i
<
nCol
;
i
++
)
{
for
(
int
i
=
0
;
i
<
nCol
;
i
++
)
(
*
(
phi
->
getGrdPhi
(
i
)))(
quadrature
->
getLambda
(
iq
),
grdPhi
[
i
]);
(
*
(
phi
->
getGrdPhi
(
i
)))(
quadrature
->
getLambda
(
iq
),
grdPhi
[
i
]);
}
for
(
int
i
=
0
;
i
<
nRow
;
i
++
)
{
for
(
int
i
=
0
;
i
<
nRow
;
i
++
)
{
double
psival
=
(
*
(
psi
->
getPhi
(
i
)))(
quadrature
->
getLambda
(
iq
));
double
psival
=
(
*
(
psi
->
getPhi
(
i
)))(
quadrature
->
getLambda
(
iq
));
...
@@ -370,12 +363,10 @@ namespace AMDiS {
...
@@ -370,12 +363,10 @@ namespace AMDiS {
VectorOfFixVecs
<
DimVec
<
double
>
>
&
Lb
=
tmpLb
[
myRank
];
VectorOfFixVecs
<
DimVec
<
double
>
>
&
Lb
=
tmpLb
[
myRank
];
Lb
.
resize
(
nPoints
);
Lb
.
resize
(
nPoints
);
for
(
int
iq
=
0
;
iq
<
nPoints
;
iq
++
)
{
for
(
int
iq
=
0
;
iq
<
nPoints
;
iq
++
)
Lb
[
iq
].
set
(
0.0
);
Lb
[
iq
].
set
(
0.0
);
}
for
(
int
i
=
0
;
i
<
static_cast
<
int
>
(
terms
[
myRank
].
size
());
i
++
)
for
(
int
i
=
0
;
i
<
static_cast
<
int
>
(
terms
[
myRank
].
size
());
i
++
)
{
(
static_cast
<
FirstOrderTerm
*>
((
terms
[
myRank
][
i
])))
->
getLb
(
elInfo
,
nPoints
,
Lb
);
(
static_cast
<
FirstOrderTerm
*>
((
terms
[
myRank
][
i
])))
->
getLb
(
elInfo
,
nPoints
,
Lb
);
}
for
(
int
iq
=
0
;
iq
<
nPoints
;
iq
++
)
{
for
(
int
iq
=
0
;
iq
<
nPoints
;
iq
++
)
{
Lb
[
iq
]
*=
elInfo
->
getDet
();
Lb
[
iq
]
*=
elInfo
->
getDet
();
...
@@ -383,10 +374,9 @@ namespace AMDiS {
...
@@ -383,10 +374,9 @@ namespace AMDiS {
const
double
*
psi
=
psiFast
->
getPhi
(
iq
);
const
double
*
psi
=
psiFast
->
getPhi
(
iq
);
grdPhi
=
phiFast
->
getGradient
(
iq
);
grdPhi
=
phiFast
->
getGradient
(
iq
);
for
(
int
i
=
0
;
i
<
nRow
;
i
++
)
{
for
(
int
i
=
0
;
i
<
nRow
;
i
++
)
for
(
int
j
=
0
;
j
<
nCol
;
j
++
)
for
(
int
j
=
0
;
j
<
nCol
;
j
++
)
mat
[
i
][
j
]
+=
quadrature
->
getWeight
(
iq
)
*
(
Lb
[
iq
]
*
(
*
grdPhi
)[
j
])
*
psi
[
i
];
mat
[
i
][
j
]
+=
quadrature
->
getWeight
(
iq
)
*
(
Lb
[
iq
]
*
(
*
grdPhi
)[
j
])
*
psi
[
i
];
}
}
}
}
}
...
...
AMDiS/src/FirstOrderAssembler.h
View file @
784ec57d
...
@@ -97,9 +97,13 @@ namespace AMDiS {
...
@@ -97,9 +97,13 @@ namespace AMDiS {
void
calculateElementMatrix
(
const
ElInfo
*
elInfo
,
ElementMatrix
&
mat
);
void
calculateElementMatrix
(
const
ElInfo
*
elInfo
,
ElementMatrix
&
mat
);
/// Implements SubAssembler::calculateElementVector().
/// Implements SubAssembler::calculateElementVector().
void
calculateElementVector
(
const
ElInfo
*
,
ElementVector
&
)
{
void
calculateElementVector
(
const
ElInfo
*
,
ElementVector
&
)
{
ERROR_EXIT
(
"should not be called
\n
"
);
ERROR_EXIT
(
"should not be called
\n
"
);
}
}
protected:
std
::
vector
<
VectorOfFixVecs
<
DimVec
<
double
>
>
>
tmpGrdPhi
;
};
};
...
...
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