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
bcb1556c
Commit
bcb1556c
authored
Jun 04, 2017
by
Kirill Terekhov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reduce visual studio complains
+switch off Octree example - not compiling on windows
parent
ab616c05
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
5 deletions
+10
-5
CMakeLists.txt
CMakeLists.txt
+5
-0
Examples/CMakeLists.txt
Examples/CMakeLists.txt
+1
-1
Source/IO/mesh_gmv_file.cpp
Source/IO/mesh_gmv_file.cpp
+1
-1
Source/IO/mesh_pmf_file.cpp
Source/IO/mesh_pmf_file.cpp
+1
-1
Source/IO/mesh_vtk_file.cpp
Source/IO/mesh_vtk_file.cpp
+2
-2
No files found.
CMakeLists.txt
View file @
bcb1556c
...
...
@@ -215,6 +215,11 @@ if(USE_AUTODIFF_EXPRESSION_TEMPLATES)
endif
()
endif
()
if
(
MSVC
)
message
(
"Adding flag for exception handling in Visual Studio that is sometimes missing for some reason"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
/EHsc"
)
endif
()
if
(
MSVC
)
if
(
USE_SOLVER_TRILINOS
)
...
...
Examples/CMakeLists.txt
View file @
bcb1556c
...
...
@@ -19,5 +19,5 @@ add_subdirectory(MFD-ES)
endif
(
USE_AUTODIFF AND USE_SOLVER AND USE_MESH
)
#add_subdirectory(OctreeCutcell)
if
(
USE_MESH AND USE_PARTITIONER
)
add_subdirectory
(
Octree
)
#
add_subdirectory(Octree)
endif
(
USE_MESH AND USE_PARTITIONER
)
\ No newline at end of file
Source/IO/mesh_gmv_file.cpp
View file @
bcb1556c
...
...
@@ -19,7 +19,7 @@ namespace INMOST
sprintf
(
keyword
,
"gmvinput"
);
fwrite
(
keyword
,
1
,
8
,
file
);
sprintf
(
keyword
,
"ieee"
);
if
(
sizeof
(
Storage
::
real
)
!=
8
||
sizeof
(
Storage
::
integer
)
!=
8
)
sprintf
(
keyword
,
"ieeei%
ldr%l
d"
,
sizeof
(
Storage
::
integer
),
sizeof
(
Storage
::
real
));
sprintf
(
keyword
,
"ieeei%
zdr%z
d"
,
sizeof
(
Storage
::
integer
),
sizeof
(
Storage
::
real
));
fwrite
(
keyword
,
1
,
8
,
file
);
sprintf
(
keyword
,
"nodev"
);
fwrite
(
keyword
,
1
,
8
,
file
);
keynum
=
static_cast
<
Storage
::
integer
>
(
NumberOfNodes
());
fwrite
(
&
keynum
,
sizeof
(
Storage
::
integer
),
1
,
file
);
...
...
Source/IO/mesh_pmf_file.cpp
View file @
bcb1556c
...
...
@@ -76,7 +76,7 @@ namespace INMOST
static_cast
<
INMOST_DATA_ENUM_TYPE
>
(
NumberOfCells
()),
static_cast
<
INMOST_DATA_ENUM_TYPE
>
(
NumberOfSets
()),
NumberOfTags
()
-
5
,
//add counter to skip unwanted tags here SKIPHERE, search by SKIPHERE for additional instructions
m_state
,
static_cast
<
INMOST_DATA_ENUM_TYPE
>
(
m_state
)
,
static_cast
<
INMOST_DATA_ENUM_TYPE
>
(
GetProcessorRank
())
},
k
;
for
(
k
=
0
;
k
<
9
;
k
++
)
uconv
.
write_iValue
(
out
,
header
[
k
]);
...
...
Source/IO/mesh_vtk_file.cpp
View file @
bcb1556c
...
...
@@ -263,10 +263,10 @@ safe_output:
}
}
fprintf
(
f
,
"CELLS %u %
l
d
\n
"
,
NumberOfCells
()
+
NumberOfFaces
(),
values
.
size
());
fprintf
(
f
,
"CELLS %u %
z
d
\n
"
,
NumberOfCells
()
+
NumberOfFaces
(),
values
.
size
());
}
else
fprintf
(
f
,
"CELLS %u %
l
d
\n
"
,
NumberOfCells
(),
values
.
size
());
fprintf
(
f
,
"CELLS %u %
z
d
\n
"
,
NumberOfCells
(),
values
.
size
());
for
(
dynarray
<
Storage
::
integer
,
64
>::
size_type
i
=
0
;
i
<
values
.
size
();
i
++
)
{
...
...
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