Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
iwr
amdis
Commits
147d19c0
Commit
147d19c0
authored
Mar 10, 2010
by
Thomas Witkowski
Browse files
Introduced stack for subElemMatrices.
parent
a76531aa
Changes
4
Show whitespace changes
Inline
Side-by-side
AMDiS/src/ElInfo.cc
View file @
147d19c0
...
@@ -14,6 +14,8 @@
...
@@ -14,6 +14,8 @@
namespace
AMDiS
{
namespace
AMDiS
{
std
::
map
<
unsigned
long
,
mtl
::
dense2D
<
double
>
>
ElInfo
::
subElemMatrices
;
ElInfo
::
ElInfo
(
Mesh
*
aMesh
)
ElInfo
::
ElInfo
(
Mesh
*
aMesh
)
:
mesh
(
aMesh
),
:
mesh
(
aMesh
),
element
(
NULL
),
element
(
NULL
),
...
...
AMDiS/src/ElInfo.h
View file @
147d19c0
...
@@ -544,6 +544,8 @@ namespace AMDiS {
...
@@ -544,6 +544,8 @@ namespace AMDiS {
mtl
::
dense2D
<
double
>
subElemCoordsMat_so
;
mtl
::
dense2D
<
double
>
subElemCoordsMat_so
;
public:
public:
static
std
::
map
<
unsigned
long
,
mtl
::
dense2D
<
double
>
>
subElemMatrices
;
/** \brief
/** \brief
* child_vertex[el_type][child][i] = father's local vertex index of new
* child_vertex[el_type][child][i] = father's local vertex index of new
* vertex i. 4 stands for the newly generated vertex .
* vertex i. 4 stands for the newly generated vertex .
...
...
AMDiS/src/ElInfo2d.cc
View file @
147d19c0
...
@@ -697,6 +697,11 @@ namespace AMDiS {
...
@@ -697,6 +697,11 @@ namespace AMDiS {
switch
(
degree
)
{
switch
(
degree
)
{
case
1
:
case
1
:
{
{
if
(
subElemMatrices
.
count
(
refinementPath
)
>
0
)
{
mat
=
subElemMatrices
[
refinementPath
];
return
;
}
mat
=
mat_d1
;
mat
=
mat_d1
;
dense2D
<
double
>
tmpMat
(
num_rows
(
mat
),
num_rows
(
mat
));
dense2D
<
double
>
tmpMat
(
num_rows
(
mat
),
num_rows
(
mat
));
...
@@ -709,6 +714,8 @@ namespace AMDiS {
...
@@ -709,6 +714,8 @@ namespace AMDiS {
mat
=
tmpMat
;
mat
=
tmpMat
;
}
}
}
}
subElemMatrices
[
refinementPath
]
=
mat
;
}
}
break
;
break
;
default:
default:
...
...
AMDiS/src/ProblemVec.cc
View file @
147d19c0
...
@@ -627,6 +627,8 @@ namespace AMDiS {
...
@@ -627,6 +627,8 @@ namespace AMDiS {
// printOpenmpTraverseInfo(this, true);
// printOpenmpTraverseInfo(this, true);
// std::cout << "ElInfo = " << ElInfo::subElemMatrices.size() << std::endl;
clock_t
first
=
clock
();
clock_t
first
=
clock
();
#ifdef _OPENMP
#ifdef _OPENMP
double
wtime
=
omp_get_wtime
();
double
wtime
=
omp_get_wtime
();
...
...
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