Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Kirill Terekhov
INMOST
Commits
c702e997
Commit
c702e997
authored
Jan 28, 2015
by
Kirill Terekhov
Browse files
Native mesh file format fix
Fixed incorrect writing of sets data. Returned ||Ax-b|| norm to solver.
parent
099bb160
Changes
4
Hide whitespace changes
Inline
Side-by-side
inmost_mesh.h
View file @
c702e997
...
...
@@ -903,7 +903,12 @@ namespace INMOST
class
ElementSet
:
public
Element
//implemented in eset.cpp
{
public:
static
const
enumerator
high_conn_reserved
=
4
;
//number of reserved positions in HighConn array
static
const
enumerator
high_conn_reserved
=
4
;
///< number of reserved positions in HighConn array
///< first position is handle to parent set
///< second position is handle to sibling set
///< third position is handle to child set
///< fourth position is number of sorted elements in the set
///< all the rest are positions of deleted elements
typedef
INMOST_DATA_BULK_TYPE
ComparatorType
;
static
const
ComparatorType
UNSORTED_COMPARATOR
=
0
;
static
const
ComparatorType
GLOBALID_COMPARATOR
=
1
;
...
...
mesh_file.cpp
View file @
c702e997
...
...
@@ -4439,7 +4439,8 @@ safe_output:
{
wetype
=
GetHandleElementType
(
*
kt
);
out
.
put
(
wetype
);
lid
=
IntegerDF
(
*
kt
,
set_id
);
assert
(
wetype
!=
NONE
);
lid
=
IntegerDF
(
*
kt
,
set_id
);
uconv
.
write_iValue
(
out
,
lid
);
}
else
out
.
put
(
NONE
);
...
...
@@ -4453,6 +4454,7 @@ safe_output:
{
wetype
=
GetHandleElementType
(
*
kt
);
out
.
put
(
wetype
);
assert
(
wetype
!=
NONE
);
lid
=
IntegerDF
(
*
kt
,
set_id
);
uconv
.
write_iValue
(
out
,
lid
);
}
...
...
@@ -4461,14 +4463,7 @@ safe_output:
//write additional information
for
(
Element
::
adj_type
::
iterator
kt
=
hc
.
begin
()
+
ElementSet
::
high_conn_reserved
-
1
;
kt
!=
hc
.
end
();
++
kt
)
{
if
(
*
kt
!=
InvalidHandle
()
)
{
wetype
=
GetHandleElementType
(
*
kt
);
out
.
put
(
wetype
);
lid
=
IntegerDF
(
*
kt
,
set_id
);
uconv
.
write_iValue
(
out
,
lid
);
}
else
out
.
put
(
NONE
);
uconv
.
write_iValue
(
out
,
*
kt
);
}
}
...
...
solver_bcgsl.hpp
View file @
c702e997
...
...
@@ -166,8 +166,8 @@ namespace INMOST
info
->
GetLocalRegion
(
info
->
GetRank
(),
vlocbeg
,
vlocend
);
info
->
GetVectorRegion
(
vbeg
,
vend
);
rhs_norm
=
info
->
ScalarProd
(
RHS
,
RHS
,
vlocbeg
,
vlocend
);
//
rhs_norm = 1;
//
rhs_norm = info->ScalarProd(RHS,RHS,vlocbeg,vlocend);
rhs_norm
=
1
;
//r[0] = b
std
::
copy
(
RHS
.
Begin
(),
RHS
.
End
(),
r
[
0
].
Begin
());
{
...
...
solver_ddpqiluc2.hpp
View file @
c702e997
...
...
@@ -5,7 +5,7 @@
#include "inmost_solver.h"
#include "solver_prototypes.hpp"
#define REPORT_ILU
//
#define REPORT_ILU
//#undef REPORT_ILU
//#define REPORT_ILU_PROGRESS
//#undef REPORT_ILU_PROGRESS
...
...
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