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
949d38d0
Commit
949d38d0
authored
Dec 26, 2017
by
igor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor changes to make MS compiler happy for non MPI version
parent
c5a1d492
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
22 additions
and
7 deletions
+22
-7
Source/IO/mesh_vtu_file.cpp
Source/IO/mesh_vtu_file.cpp
+1
-1
Source/Mesh/modify.cpp
Source/Mesh/modify.cpp
+1
-1
Source/Mesh/parallel.cpp
Source/Mesh/parallel.cpp
+1
-1
Source/Solver/SolverInterface.h
Source/Solver/SolverInterface.h
+1
-0
Source/Solver/solver_ani/SolverANI.cpp
Source/Solver/solver_ani/SolverANI.cpp
+3
-0
Source/Solver/solver_inner/SolverInner.cpp
Source/Solver/solver_inner/SolverInner.cpp
+4
-2
Source/Solver/solver_inner/solver_ddpqiluc2/SolverDDPQILUC2.cpp
.../Solver/solver_inner/solver_ddpqiluc2/SolverDDPQILUC2.cpp
+1
-0
Source/Solver/solver_inner/solver_ilu2/SolverILU2.cpp
Source/Solver/solver_inner/solver_ilu2/SolverILU2.cpp
+2
-1
Source/Solver/solver_inner/solver_mptilu2/SolverMPTILU2.cpp
Source/Solver/solver_inner/solver_mptilu2/SolverMPTILU2.cpp
+1
-0
Source/Solver/solver_inner/solver_mptiluc/SolverMPTILUC.cpp
Source/Solver/solver_inner/solver_mptiluc/SolverMPTILUC.cpp
+1
-0
Source/Solver/solver_inner/solver_mptiluc/solver_mtiluc2.cpp
Source/Solver/solver_inner/solver_mptiluc/solver_mtiluc2.cpp
+2
-1
Source/Solver/solver_petsc/solver_petsc.cpp
Source/Solver/solver_petsc/solver_petsc.cpp
+4
-0
No files found.
Source/IO/mesh_vtu_file.cpp
View file @
949d38d0
...
...
@@ -170,7 +170,7 @@ namespace INMOST
{
std
::
stringstream
type
(
v
->
GetChild
(
"Cells"
)
->
GetChildWithAttrib
(
"Name"
,
"types"
)
->
GetContents
());
int
ctype
;
bool
have_2d
=
false
;
//
bool have_2d = false;
for
(
int
q
=
0
;
q
<
ncells
&&
grid_is_2d
==
2
;
++
q
)
{
type
>>
ctype
;
...
...
Source/Mesh/modify.cpp
View file @
949d38d0
...
...
@@ -604,7 +604,7 @@ namespace INMOST
for
(
dynarray
<
HandleType
,
64
>::
size_type
it
=
0
;
it
<
nodes
.
size
();
it
++
)
//delete nodes inside the face
{
adj_type
const
&
hc
=
m
->
HighConn
(
nodes
[
it
]);
//
adj_type const & hc = m->HighConn(nodes[it]);
if
(
m
->
GetMarker
(
nodes
[
it
],
rem
)
)
{
assert
(
m
->
HighConn
(
nodes
[
it
]).
empty
()
||
m
->
Count
(
m
->
HighConn
(
nodes
[
it
]).
data
(),
static_cast
<
integer
>
(
m
->
HighConn
(
nodes
[
it
]).
size
()),
hm
)
==
0
);
...
...
Source/Mesh/parallel.cpp
View file @
949d38d0
...
...
@@ -4361,7 +4361,7 @@ namespace INMOST
time
=
Timer
()
-
time
;
REPORT_VAL
(
"time"
,
time
);
#else //USE_MPI and USE_PARALLEL_STORAGE
(
void
)
mask
;
(
void
)
ghost
;
(
void
)
shared
;
(
void
)
mask
;
#endif //USE_MPI and USE_PARALLEL_STORAGE
EXIT_FUNC
();
}
...
...
Source/Solver/SolverInterface.h
View file @
949d38d0
...
...
@@ -61,6 +61,7 @@ namespace INMOST {
virtual
INMOST_DATA_REAL_TYPE
Condest
(
INMOST_DATA_REAL_TYPE
tol
,
INMOST_DATA_ENUM_TYPE
maxiter
)
{
throw
INMOST
::
SolverUnsupportedOperation
;
(
void
)
tol
;
(
void
)
maxiter
;
};
virtual
~
SolverInterface
()
{};
...
...
Source/Solver/solver_ani/SolverANI.cpp
View file @
949d38d0
...
...
@@ -8,15 +8,18 @@ namespace INMOST {
SolverInterface
*
SolverANI
::
Copy
(
const
SolverInterface
*
other
)
{
throw
INMOST
::
SolverUnsupportedOperation
;
//later
(
void
)
other
;
};
void
SolverANI
::
Assign
(
const
SolverInterface
*
other
)
{
throw
INMOST
::
SolverUnsupportedOperation
;
//later
(
void
)
other
;
}
void
SolverANI
::
Setup
(
int
*
argc
,
char
***
argv
,
SolverParameters
&
p
)
{
solver
.
n
=
0
;
m
.
n
=
0
;
(
void
)
argc
;
(
void
)
argv
;
(
void
)
p
;
}
void
SolverANI
::
SetMatrix
(
Sparse
::
Matrix
&
A
,
bool
ModifiedPattern
,
bool
OldPreconditioner
)
{
...
...
Source/Solver/solver_inner/SolverInner.cpp
View file @
949d38d0
...
...
@@ -13,11 +13,13 @@ namespace INMOST {
SolverInterface
*
SolverInner
::
Copy
(
const
SolverInterface
*
other
)
{
//You should not really want to copy solver's information
throw
INMOST
::
SolverUnsupportedOperation
;
(
void
)
other
;
}
void
SolverInner
::
Assign
(
const
SolverInterface
*
other
)
{
//You should not really want to copy solver's information
throw
INMOST
::
SolverUnsupportedOperation
;
(
void
)
other
;
}
void
SolverInner
::
Setup
(
int
*
argc
,
char
***
argv
,
SolverParameters
&
p
)
...
...
@@ -42,7 +44,7 @@ namespace INMOST {
for
(
parameters_iterator_t
parameter
=
p
.
parameters
.
begin
();
parameter
<
p
.
parameters
.
end
();
parameter
++
)
this
->
SetParameter
((
*
parameter
).
first
,
(
*
parameter
).
second
);
}
(
void
)
argc
;
(
void
)
argv
;
}
bool
SolverInner
::
Solve
(
Sparse
::
Vector
&
RHS
,
Sparse
::
Vector
&
SOL
)
{
...
...
@@ -300,4 +302,4 @@ namespace INMOST {
this
->
Clear
();
}
}
\ No newline at end of file
}
Source/Solver/solver_inner/solver_ddpqiluc2/SolverDDPQILUC2.cpp
View file @
949d38d0
...
...
@@ -20,6 +20,7 @@ namespace INMOST {
SolverDDPQILUC2
::
SolverDDPQILUC2
(
const
SolverInterface
*
other
)
{
//You should not really want to copy solver's information
throw
INMOST
::
SolverUnsupportedOperation
;
(
void
)
other
;
}
void
SolverDDPQILUC2
::
SetMatrix
(
Sparse
::
Matrix
&
A
,
bool
ModifiedPattern
,
bool
OldPreconditioner
)
{
...
...
Source/Solver/solver_inner/solver_ilu2/SolverILU2.cpp
View file @
949d38d0
...
...
@@ -18,6 +18,7 @@ namespace INMOST {
SolverILU2
::
SolverILU2
(
const
SolverInterface
*
other
)
{
//You should not really want to copy solver's information
throw
INMOST
::
SolverUnsupportedOperation
;
(
void
)
other
;
}
void
SolverILU2
::
SetMatrix
(
Sparse
::
Matrix
&
A
,
bool
ModifiedPattern
,
bool
OldPreconditioner
)
{
...
...
@@ -62,4 +63,4 @@ namespace INMOST {
}
}
\ No newline at end of file
}
Source/Solver/solver_inner/solver_mptilu2/SolverMPTILU2.cpp
View file @
949d38d0
...
...
@@ -19,6 +19,7 @@ namespace INMOST {
SolverMPTILU2
::
SolverMPTILU2
(
const
SolverInterface
*
other
)
{
//You should not really want to copy solver's information
throw
INMOST
::
SolverUnsupportedOperation
;
(
void
)
other
;
}
void
SolverMPTILU2
::
SetMatrix
(
Sparse
::
Matrix
&
A
,
bool
ModifiedPattern
,
bool
OldPreconditioner
)
{
...
...
Source/Solver/solver_inner/solver_mptiluc/SolverMPTILUC.cpp
View file @
949d38d0
...
...
@@ -20,6 +20,7 @@ namespace INMOST {
SolverMPTILUC
::
SolverMPTILUC
(
const
SolverInterface
*
other
)
{
//You should not really want to copy solver's information
throw
INMOST
::
SolverUnsupportedOperation
;
(
void
)
other
;
}
void
SolverMPTILUC
::
SetMatrix
(
Sparse
::
Matrix
&
A
,
bool
ModifiedPattern
,
bool
OldPreconditioner
)
{
...
...
Source/Solver/solver_inner/solver_mptiluc/solver_mtiluc2.cpp
View file @
949d38d0
...
...
@@ -597,6 +597,7 @@ public:
interval
<
INMOST_DATA_ENUM_TYPE
,
INMOST_DATA_REAL_TYPE
>
LineValuesU
(
mobeg
,
moend
,
0.0
),
LineValuesL
(
mobeg
,
moend
,
0.0
);
interval
<
INMOST_DATA_ENUM_TYPE
,
INMOST_DATA_ENUM_TYPE
>
LineIndecesU
(
mobeg
,
moend
+
1
,
UNDEF
),
LineIndecesL
(
mobeg
,
moend
+
1
,
UNDEF
);
double
tfactor
=
0.0
,
tswap
=
0.0
,
trescale
=
0.0
,
treorder
=
0.0
,
ttransversal
=
0.0
,
treassamble
=
0.0
,
ttotal
,
tt
,
testimator
=
0.0
,
tlocal
;
(
void
)
tswap
;
//can be unused for some defines
#if defined(REORDER_METIS_ND)
double
tmetisgraph
=
0
,
tmetisnd
=
0
;
#endif
...
...
@@ -1371,7 +1372,7 @@ public:
trcmorder
=
Timer
();
std
::
fill
(
Ulist
.
begin
()
+
wbeg
-
mobeg
,
Ulist
.
begin
()
+
wend
-
mobeg
,
ENUMUNDEF
);
//find node with the lowest order
INMOST_DATA_ENUM_TYPE
start
=
wbeg
;
//
INMOST_DATA_ENUM_TYPE start = wbeg;
INMOST_DATA_ENUM_TYPE
index
=
wbeg
;
INMOST_DATA_ENUM_TYPE
cur
=
ENUMUNDEF
;
std
::
deque
<
INMOST_DATA_ENUM_TYPE
>
q
;
...
...
Source/Solver/solver_petsc/solver_petsc.cpp
View file @
949d38d0
...
...
@@ -63,6 +63,7 @@ void MatrixInitDataPetsc(Mat **matrix, INMOST_MPI_Comm comm, const char *name)
*
matrix
=
new
Mat
();
#if !defined(USE_MPI)
ierr
=
MatCreate
(
PETSC_COMM_WORLD
,
*
matrix
);
(
void
)
comm
;
#else
ierr
=
MatCreate
(
comm
,
*
matrix
);
#endif
...
...
@@ -137,6 +138,7 @@ void VectorInitDataPetsc(Vec **vector, INMOST_MPI_Comm comm, const char *name)
*
vector
=
new
Vec
();
#if !defined(USE_MPI)
ierr
=
VecCreate
(
PETSC_COMM_WORLD
,
*
vector
);
(
void
)
comm
;
#else
ierr
=
VecCreate
(
comm
,
*
vector
);
#endif
...
...
@@ -214,6 +216,7 @@ void SolverInitDataPetsc(KSP **ksp, INMOST_MPI_Comm comm, const char *name)
*
ksp
=
new
KSP
();
#if !defined(USE_MPI)
ierr
=
KSPCreate
(
PETSC_COMM_WORLD
,
*
ksp
);
(
void
)
comm
;
#else
ierr
=
KSPCreate
(
comm
,
*
ksp
);
#endif
...
...
@@ -233,6 +236,7 @@ void SolverCopyDataPetsc(KSP **ksp, KSP *other_ksp, INMOST_MPI_Comm comm)
*
ksp
=
new
KSP
();
#if !defined(USE_MPI)
ierr
=
KSPCreate
(
PETSC_COMM_WORLD
,
*
ksp
);
(
void
)
comm
;
#else
ierr
=
KSPCreate
(
comm
,
*
ksp
);
#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