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
cf1303c0
Commit
cf1303c0
authored
May 26, 2016
by
Alexander Danilov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Mesh: fix compilation with USE_MESH=OFF
parent
0a33c222
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
2 deletions
+12
-2
Examples/CMakeLists.txt
Examples/CMakeLists.txt
+3
-1
Examples/DrawMatrix/main.cpp
Examples/DrawMatrix/main.cpp
+1
-1
Source/Headers/inmost_xml.h
Source/Headers/inmost_xml.h
+4
-0
Source/Misc/xml.cpp
Source/Misc/xml.cpp
+4
-0
No files found.
Examples/CMakeLists.txt
View file @
cf1303c0
#add_subdirectory(DrawGrid)
if
(
USE_MESH
)
add_subdirectory
(
OldDrawGrid
)
add_subdirectory
(
GridGen
)
endif
(
USE_MESH
)
if
(
USE_SOLVER
)
add_subdirectory
(
DrawMatrix
)
add_subdirectory
(
MatSolve
)
endif
(
USE_SOLVER
)
add_subdirectory
(
GridGen
)
if
(
USE_SOLVER AND USE_MESH
)
add_subdirectory
(
FVDiscr
)
add_subdirectory
(
Solver
)
...
...
Examples/DrawMatrix/main.cpp
View file @
cf1303c0
...
...
@@ -170,7 +170,7 @@ class Reorder_ARMS
}
INMOST_DATA_ENUM_TYPE
GetOrder
(
INMOST_DATA_ENUM_TYPE
ind
)
{
return
static_cast
<
Storage
::
enumerator
>
(
neighbours
[
ind
].
size
());
return
static_cast
<
INMOST_DATA_ENUM_TYPE
>
(
neighbours
[
ind
].
size
());
INMOST_DATA_ENUM_TYPE
ret
=
0
,
k
;
for
(
k
=
0
;
k
<
neighbours
[
ind
].
size
();
k
++
)
if
(
!
markers
[
neighbours
[
ind
][
k
]])
...
...
Source/Headers/inmost_xml.h
View file @
cf1303c0
...
...
@@ -137,14 +137,18 @@ namespace INMOST
void
SplitValueMultiplier
(
std
::
string
expression
,
std
::
string
&
value
,
std
::
string
&
multiplier
);
bool
ParseBool
(
std
::
string
word
);
void
ParseCommaSeparated
(
std
::
string
word
,
std
::
vector
<
std
::
string
>
&
parsed
,
char
symbol
=
','
);
#if defined(USE_MESH)
void
ParseReal
(
std
::
string
word
,
std
::
vector
<
INMOST
::
Storage
::
real
>
&
Vector
,
int
&
Repeat
,
int
SetSize
);
#if defined(USE_AUTODIFF)
void
ParseVariable
(
std
::
string
word
,
std
::
vector
<
INMOST
::
Storage
::
var
>
&
Vector
,
int
&
Repeat
,
int
SetSize
);
#endif
void
ParseInteger
(
std
::
string
word
,
std
::
vector
<
INMOST
::
Storage
::
integer
>
&
Vector
,
int
&
Repeat
,
int
SetSize
);
#endif
void
ParseBulk
(
std
::
string
word
,
std
::
string
&
Vector
,
int
&
Repeat
,
int
SetSize
);
#if defined(USE_MESH)
void
ParseReference
(
std
::
string
word
,
std
::
vector
<
std
::
pair
<
INMOST
::
ElementType
,
int
>
>
&
Vector
,
int
&
Repeat
,
int
SetSize
);
void
ParseRemoteReference
(
std
::
string
word
,
std
::
vector
<
std
::
pair
<
std
::
string
,
std
::
pair
<
INMOST
::
ElementType
,
int
>
>
>
&
Vector
,
int
&
Repeat
,
int
SetSize
);
#endif
/// Structure for xml attribute.
struct
XMLAttrib
...
...
Source/Misc/xml.cpp
View file @
cf1303c0
...
...
@@ -1228,6 +1228,7 @@ namespace INMOST
}
while
(
comma
!=
std
::
string
::
npos
);
}
#if defined(USE_MESH)
void
XMLReader
::
ParseReal
(
std
::
string
word
,
std
::
vector
<
INMOST
::
Storage
::
real
>
&
Vector
,
int
&
Repeat
,
int
SetSize
)
{
//const char * debug = word.c_str();
...
...
@@ -1301,6 +1302,7 @@ namespace INMOST
Repeat
=
ConvertMultiplier
(
multiplier
,
SetSize
);
}
#endif
void
XMLReader
::
ParseBulk
(
std
::
string
word
,
std
::
string
&
Vector
,
int
&
Repeat
,
int
SetSize
)
{
...
...
@@ -1335,6 +1337,7 @@ namespace INMOST
Repeat
=
ConvertMultiplier
(
multiplier
,
SetSize
);
}
#if defined(USE_MESH)
void
XMLReader
::
ParseReference
(
std
::
string
word
,
std
::
vector
<
std
::
pair
<
INMOST
::
ElementType
,
int
>
>
&
Vector
,
int
&
Repeat
,
int
SetSize
)
{
std
::
string
value
,
multiplier
;
...
...
@@ -1398,6 +1401,7 @@ namespace INMOST
Repeat
=
ConvertMultiplier
(
multiplier
,
SetSize
);
}
#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