Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
INMOST
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
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
Kirill Terekhov
INMOST
Commits
868e1316
Commit
868e1316
authored
Nov 06, 2014
by
Kirill Nikitin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Various small fixes
Fix few compile warnings and a small bug in Element::Mean.
parent
601f715a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
6 deletions
+9
-6
geometry.cpp
geometry.cpp
+2
-2
mesh_parallel.cpp
mesh_parallel.cpp
+1
-1
solver_ddpqiluc2.hpp
solver_ddpqiluc2.hpp
+6
-3
No files found.
geometry.cpp
View file @
868e1316
...
...
@@ -1103,8 +1103,8 @@ namespace INMOST
for
(
adjacent
<
Element
>::
iterator
f
=
rfaces
.
begin
();
f
!=
rfaces
.
end
();
f
++
)
{
adjacent
<
Node
>
nodes
=
f
->
getNodes
();
n
[
k
]
=
nodes
.
size
();
for
(
int
i
=
0
;
i
<
n
.
back
()
;
i
++
)
int
nn
=
n
[
k
]
=
nodes
.
size
();
for
(
int
i
=
0
;
i
<
n
n
;
i
++
)
{
Storage
::
real_array
a
=
nodes
[
i
].
Coords
();
v
.
insert
(
v
.
end
(),
a
.
begin
(),
a
.
end
());
...
...
mesh_parallel.cpp
View file @
868e1316
...
...
@@ -798,7 +798,7 @@ namespace INMOST
//~ #else
std
::
vector
<
unsigned
>
sendsizeall
(
mpisize
*
2
);
int
pack_size2
=
0
;
unsigned
usend
[
2
]
=
{
sendsize
,
pack_real
.
size
()};
unsigned
long
usend
[
2
]
=
{(
unsigned
)
sendsize
,
pack_real
.
size
()};
MPI_Pack_size
(
2
,
MPI_UNSIGNED
,
comm
,
&
pack_size2
);
for
(
unsigned
k
=
0
;
k
<
procs
.
size
();
k
++
)
...
...
solver_ddpqiluc2.hpp
View file @
868e1316
...
...
@@ -11,7 +11,10 @@
//#undef REPORT_ILU_PROGRESS
using
namespace
INMOST
;
#ifndef DEFAULT_TAU
#define DEFAULT_TAU 0.01
#endif
#define REORDER_DDPQ
#define REORDER_NNZ
#define DDPQ_TAU 0.8 //ratio is time consumed for factorization by time for schur complement calculation
...
...
@@ -1610,7 +1613,7 @@ public:
#elif defined(REPORT_ILU_PROGRESS)
if
(
k
%
100
==
0
)
{
printf
(
"%
d %d/%d factor %6.2f%%
\t\t\r
"
,
level_size
.
size
(
),
cend
,
moend
,
100.0
f
*
(
k
-
cbeg
)
/
(
float
)(
cend
-
cbeg
));
printf
(
"%
lu %d/%d factor %6.2f%%
\t\t\r
"
,
static_cast
<
unsigned
long
>
(
level_size
.
size
()
),
cend
,
moend
,
100.0
f
*
(
k
-
cbeg
)
/
(
float
)(
cend
-
cbeg
));
//printf("%6.2f%% nnz LU %8d condition L %10f D %10f U %10f\r", 100.0f*(k - cbeg) / (float)(cend - cbeg), nzLU, NuL, NuD, NuU);
fflush
(
stdout
);
}
...
...
@@ -1834,7 +1837,7 @@ public:
#if defined(REPORT_ILU_PROGRESS)
if
(
i
%
100
==
0
)
{
printf
(
"%
d %d/%d schur1 %6.2f%%
\t\t\r
"
,
level_size
.
size
(
),
cend
,
moend
,
100.
f
*
(
i
-
cend
)
/
(
1.
f
*
(
wend
-
cend
)));
printf
(
"%
lu %d/%d schur1 %6.2f%%
\t\t\r
"
,
static_cast
<
unsigned
long
>
(
level_size
.
size
()
),
cend
,
moend
,
100.
f
*
(
i
-
cend
)
/
(
1.
f
*
(
wend
-
cend
)));
fflush
(
stdout
);
}
#endif
...
...
@@ -2074,7 +2077,7 @@ public:
#elif defined(REPORT_ILU_PROGRESS)
if
(
i
%
100
==
0
)
{
printf
(
"%
d %d/%d schur2 %6.2f%%
\t\t\r
"
,
level_size
.
size
(
),
cend
,
moend
,
100.
f
*
(
i
-
cend
)
/
(
1.
f
*
(
wend
-
cend
)));
printf
(
"%
lu %d/%d schur2 %6.2f%%
\t\t\r
"
,
static_cast
<
unsigned
long
>
(
level_size
.
size
()
),
cend
,
moend
,
100.
f
*
(
i
-
cend
)
/
(
1.
f
*
(
wend
-
cend
)));
fflush
(
stdout
);
}
#endif
...
...
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