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
a72b1824
Commit
a72b1824
authored
Apr 11, 2017
by
Dmitry Bagaev
Browse files
Fix warnings for Intel Compilers
warning #858: type qualifier on return type is meaningless
parent
57eb7e0a
Changes
18
Hide whitespace changes
Inline
Side-by-side
Examples/AdaptiveMesh/CMakeLists.txt
View file @
a72b1824
...
...
@@ -16,7 +16,7 @@ if(USE_MPI)
endif
()
endif
(
USE_MPI
)
set_property
(
TARGET AdaptiveMeshLib PROPERTY PUBLIC_HEADER
"
${
PROJECT_BINARY_DIR
}
/Examples/AdaptiveMesh
/amesh.h"
)
set_property
(
TARGET AdaptiveMeshLib PROPERTY PUBLIC_HEADER
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/amesh.h"
)
install
(
TARGETS AdaptiveMeshLib EXPORT inmost-targets
LIBRARY DESTINATION lib
...
...
Source/Headers/inmost_solver.h
View file @
a72b1824
...
...
@@ -332,10 +332,10 @@ namespace INMOST
void
SetParameter
(
std
::
string
name
,
std
::
string
value
);
/// Return the number of iterations performed by the last solution.
/// @see Sparse::Solve
const
INMOST_DATA_ENUM_TYPE
Iterations
()
const
;
INMOST_DATA_ENUM_TYPE
Iterations
()
const
;
/// Return the final residual achieved by the last solution.
/// @see Sparse::Solve
const
INMOST_DATA_REAL_TYPE
Residual
()
const
;
INMOST_DATA_REAL_TYPE
Residual
()
const
;
/// Get the reason of convergence or divergence of the last solution.
/// @see Sparse::Solve
const
std
::
string
ReturnReason
()
const
;
...
...
Source/Solver/SolverInterface.h
View file @
a72b1824
...
...
@@ -49,9 +49,9 @@ namespace INMOST {
virtual
void
SetParameter
(
std
::
string
name
,
std
::
string
value
)
=
0
;
virtual
const
INMOST_DATA_ENUM_TYPE
Iterations
()
const
=
0
;
virtual
INMOST_DATA_ENUM_TYPE
Iterations
()
const
=
0
;
virtual
const
INMOST_DATA_REAL_TYPE
Residual
()
const
=
0
;
virtual
INMOST_DATA_REAL_TYPE
Residual
()
const
=
0
;
virtual
const
std
::
string
ReturnReason
()
const
=
0
;
...
...
Source/Solver/solver.cpp
View file @
a72b1824
...
...
@@ -153,11 +153,11 @@ namespace INMOST {
return
solver
->
SetParameter
(
name
,
value
);
}
const
INMOST_DATA_ENUM_TYPE
Solver
::
Iterations
()
const
{
INMOST_DATA_ENUM_TYPE
Solver
::
Iterations
()
const
{
return
solver
->
Iterations
();
}
const
INMOST_DATA_REAL_TYPE
Solver
::
Residual
()
const
{
INMOST_DATA_REAL_TYPE
Solver
::
Residual
()
const
{
return
solver
->
Residual
();
}
...
...
Source/Solver/solver_ani/SolverANI.cpp
View file @
a72b1824
...
...
@@ -120,11 +120,11 @@ namespace INMOST {
//throw INMOST::SolverUnsupportedOperation;
}
const
INMOST_DATA_ENUM_TYPE
SolverANI
::
Iterations
()
const
{
INMOST_DATA_ENUM_TYPE
SolverANI
::
Iterations
()
const
{
return
static_cast
<
INMOST_DATA_ENUM_TYPE
>
(
solver
.
ITER
);
}
const
INMOST_DATA_REAL_TYPE
SolverANI
::
Residual
()
const
{
INMOST_DATA_REAL_TYPE
SolverANI
::
Residual
()
const
{
return
solver
.
RESID
;
}
...
...
Source/Solver/solver_ani/SolverANI.h
View file @
a72b1824
...
...
@@ -33,9 +33,9 @@ namespace INMOST {
virtual
void
SetParameter
(
std
::
string
name
,
std
::
string
value
);
virtual
const
INMOST_DATA_ENUM_TYPE
Iterations
()
const
;
virtual
INMOST_DATA_ENUM_TYPE
Iterations
()
const
;
virtual
const
INMOST_DATA_REAL_TYPE
Residual
()
const
;
virtual
INMOST_DATA_REAL_TYPE
Residual
()
const
;
virtual
const
std
::
string
ReturnReason
()
const
;
...
...
Source/Solver/solver_fcbiilu2/SolverFCBIILU2.cpp
View file @
a72b1824
...
...
@@ -183,11 +183,11 @@ namespace INMOST {
#endif
}
const
INMOST_DATA_ENUM_TYPE
SolverFCBIILU2
::
Iterations
()
const
{
INMOST_DATA_ENUM_TYPE
SolverFCBIILU2
::
Iterations
()
const
{
return
static_cast
<
INMOST_DATA_ENUM_TYPE
>
(
solver_data
->
ITER
);
}
const
INMOST_DATA_REAL_TYPE
SolverFCBIILU2
::
Residual
()
const
{
INMOST_DATA_REAL_TYPE
SolverFCBIILU2
::
Residual
()
const
{
return
solver_data
->
RESID
;
}
...
...
Source/Solver/solver_fcbiilu2/SolverFCBIILU2.h
View file @
a72b1824
...
...
@@ -35,9 +35,9 @@ namespace INMOST {
virtual
void
SetParameter
(
std
::
string
name
,
std
::
string
value
);
virtual
const
INMOST_DATA_ENUM_TYPE
Iterations
()
const
;
virtual
INMOST_DATA_ENUM_TYPE
Iterations
()
const
;
virtual
const
INMOST_DATA_REAL_TYPE
Residual
()
const
;
virtual
INMOST_DATA_REAL_TYPE
Residual
()
const
;
virtual
const
std
::
string
ReturnReason
()
const
;
...
...
Source/Solver/solver_inner/SolverInner.cpp
View file @
a72b1824
...
...
@@ -94,11 +94,11 @@ namespace INMOST {
#endif
}
const
INMOST_DATA_ENUM_TYPE
SolverInner
::
Iterations
()
const
{
INMOST_DATA_ENUM_TYPE
SolverInner
::
Iterations
()
const
{
return
solver
->
GetIterations
();
}
const
INMOST_DATA_REAL_TYPE
SolverInner
::
Residual
()
const
{
INMOST_DATA_REAL_TYPE
SolverInner
::
Residual
()
const
{
return
solver
->
GetResidual
();
}
...
...
Source/Solver/solver_inner/SolverInner.h
View file @
a72b1824
...
...
@@ -38,9 +38,9 @@ namespace INMOST {
virtual
void
SetParameter
(
std
::
string
name
,
std
::
string
value
);
virtual
const
INMOST_DATA_ENUM_TYPE
Iterations
()
const
;
virtual
INMOST_DATA_ENUM_TYPE
Iterations
()
const
;
virtual
const
INMOST_DATA_REAL_TYPE
Residual
()
const
;
virtual
INMOST_DATA_REAL_TYPE
Residual
()
const
;
virtual
const
std
::
string
ReturnReason
()
const
;
...
...
Source/Solver/solver_k3biilu2/SolverK3BIILU2.cpp
View file @
a72b1824
...
...
@@ -191,11 +191,11 @@ namespace INMOST {
#endif
}
const
INMOST_DATA_ENUM_TYPE
SolverK3BIILU2
::
Iterations
()
const
{
INMOST_DATA_ENUM_TYPE
SolverK3BIILU2
::
Iterations
()
const
{
return
static_cast
<
INMOST_DATA_ENUM_TYPE
>
(
solver_data
->
istat
[
2
]);
}
const
INMOST_DATA_REAL_TYPE
SolverK3BIILU2
::
Residual
()
const
{
INMOST_DATA_REAL_TYPE
SolverK3BIILU2
::
Residual
()
const
{
return
solver_data
->
dstat
[
2
];
}
...
...
Source/Solver/solver_k3biilu2/SolverK3BIILU2.h
View file @
a72b1824
...
...
@@ -35,9 +35,9 @@ namespace INMOST {
virtual
void
SetParameter
(
std
::
string
name
,
std
::
string
value
);
virtual
const
INMOST_DATA_ENUM_TYPE
Iterations
()
const
;
virtual
INMOST_DATA_ENUM_TYPE
Iterations
()
const
;
virtual
const
INMOST_DATA_REAL_TYPE
Residual
()
const
;
virtual
INMOST_DATA_REAL_TYPE
Residual
()
const
;
virtual
const
std
::
string
ReturnReason
()
const
;
...
...
Source/Solver/solver_petsc/SolverPETSc.cpp
View file @
a72b1824
...
...
@@ -254,11 +254,11 @@ namespace INMOST {
#endif
}
const
INMOST_DATA_ENUM_TYPE
SolverPETSc
::
Iterations
()
const
{
INMOST_DATA_ENUM_TYPE
SolverPETSc
::
Iterations
()
const
{
return
static_cast
<
INMOST_DATA_ENUM_TYPE
>
(
SolverIterationNumberPetsc
(
ksp
));
}
const
INMOST_DATA_REAL_TYPE
SolverPETSc
::
Residual
()
const
{
INMOST_DATA_REAL_TYPE
SolverPETSc
::
Residual
()
const
{
return
SolverResidualNormPetsc
(
ksp
);
}
...
...
Source/Solver/solver_petsc/SolverPETSc.h
View file @
a72b1824
...
...
@@ -43,9 +43,9 @@ namespace INMOST {
virtual
void
SetParameter
(
std
::
string
name
,
std
::
string
value
);
virtual
const
INMOST_DATA_ENUM_TYPE
Iterations
()
const
;
virtual
INMOST_DATA_ENUM_TYPE
Iterations
()
const
;
virtual
const
INMOST_DATA_REAL_TYPE
Residual
()
const
;
virtual
INMOST_DATA_REAL_TYPE
Residual
()
const
;
virtual
const
std
::
string
ReturnReason
()
const
;
...
...
Source/Solver/solver_superlu/SolverSUPERLU.cpp
View file @
a72b1824
...
...
@@ -128,11 +128,11 @@ namespace INMOST {
//throw INMOST::SolverUnsupportedOperation;
}
const
INMOST_DATA_ENUM_TYPE
SolverSUPERLU
::
Iterations
()
const
{
INMOST_DATA_ENUM_TYPE
SolverSUPERLU
::
Iterations
()
const
{
return
1
;
}
const
INMOST_DATA_REAL_TYPE
SolverSUPERLU
::
Residual
()
const
{
INMOST_DATA_REAL_TYPE
SolverSUPERLU
::
Residual
()
const
{
return
0
;
}
...
...
Source/Solver/solver_superlu/SolverSUPERLU.h
View file @
a72b1824
...
...
@@ -36,9 +36,9 @@ namespace INMOST {
virtual
void
SetParameter
(
std
::
string
name
,
std
::
string
value
);
virtual
const
INMOST_DATA_ENUM_TYPE
Iterations
()
const
;
virtual
INMOST_DATA_ENUM_TYPE
Iterations
()
const
;
virtual
const
INMOST_DATA_REAL_TYPE
Residual
()
const
;
virtual
INMOST_DATA_REAL_TYPE
Residual
()
const
;
virtual
const
std
::
string
ReturnReason
()
const
;
...
...
Source/Solver/solver_trilinos/SolverTrilinos.cpp
View file @
a72b1824
...
...
@@ -143,11 +143,11 @@ namespace INMOST {
#endif
}
const
INMOST_DATA_ENUM_TYPE
SolverTrilinos
::
Iterations
()
const
{
INMOST_DATA_ENUM_TYPE
SolverTrilinos
::
Iterations
()
const
{
return
lastIterations
;
}
const
INMOST_DATA_REAL_TYPE
SolverTrilinos
::
Residual
()
const
{
INMOST_DATA_REAL_TYPE
SolverTrilinos
::
Residual
()
const
{
return
lastResidual
;
}
...
...
Source/Solver/solver_trilinos/SolverTrilinos.h
View file @
a72b1824
...
...
@@ -70,9 +70,9 @@ namespace INMOST {
virtual
void
SetParameter
(
std
::
string
name
,
std
::
string
value
);
virtual
const
INMOST_DATA_ENUM_TYPE
Iterations
()
const
;
virtual
INMOST_DATA_ENUM_TYPE
Iterations
()
const
;
virtual
const
INMOST_DATA_REAL_TYPE
Residual
()
const
;
virtual
INMOST_DATA_REAL_TYPE
Residual
()
const
;
virtual
const
std
::
string
ReturnReason
()
const
;
...
...
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