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
61acd40e
Commit
61acd40e
authored
Nov 24, 2017
by
Kirill Nikitin
Browse files
Fixed linux compilation issues
parent
bd2c1337
Changes
2
Hide whitespace changes
Inline
Side-by-side
Source/Solver/solver_inner/solver_mlmptiluc/solver_mlmtiluc2.cpp
View file @
61acd40e
...
...
@@ -3242,7 +3242,7 @@ public:
Li
=
LineIndecesU
[
Li
];
}
LF_Address
[
k
].
last
=
static_cast
<
INMOST_DATA_ENUM_TYPE
>
(
LF_Entries
.
size
());
assert
(
std
::
is_sorted
(
LF_Entries
.
begin
()
+
LF_Address
[
k
].
first
,
LF_Entries
.
end
()));
//
assert(std::is_sorted(LF_Entries.begin()+LF_Address[k].first,LF_Entries.end()));
///////////////////////////////////////////////////////////////////////////////////
// clean linked list //
///////////////////////////////////////////////////////////////////////////////////
...
...
Source/Solver/solver_petsc/solver_petsc.cpp
View file @
61acd40e
...
...
@@ -282,10 +282,10 @@ bool SolverSolvePetsc(KSP *ksp, Vec *rhs, Vec *sol)
ierr
=
KSPGetOptionsPrefix
(
*
ksp
,
const_cast
<
const
char
**>
(
&
prefix
));
if
(
ierr
!=
PETSC_SUCCESS
)
throw
INMOST
::
ErrorInSolver
;
//due to https://www.mcs.anl.gov/petsc/documentation/changes/37.html
#if PETSC_VERSION_MAJOR >
=
3 || (PETSC_VERSION_MAJOR == 3 && PETSC_VERSION_MINOR >= 7)
#if PETSC_VERSION_MAJOR > 3 || (PETSC_VERSION_MAJOR == 3 && PETSC_VERSION_MINOR >= 7)
ierr
=
PetscOptionsGetString
(
NULL
,
prefix
,
"-ksp_type"
,
typeksp
,
2048
,
&
haveksp
);
#else //PETSC_VERSION
ierr
=
PetscOptionsGetString
(
prefix
,
"-ksp_type"
,
typeksp
,
2048
,
&
haveksp
);
ierr
=
PetscOptionsGetString
(
prefix
,
"-ksp_type"
,
typeksp
,
2048
,
&
haveksp
);
#endif //PETSC_VERSION
if
(
ierr
!=
PETSC_SUCCESS
)
throw
INMOST
::
ErrorInSolver
;
if
(
haveksp
&&
!
strcmp
(
typeksp
,
"preonly"
))
guess
=
false
;
...
...
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