Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
amdis
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
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
Aland, Sebastian
amdis
Commits
7d7433bd
Commit
7d7433bd
authored
Aug 15, 2014
by
Siqi Ling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
follow last submit message
parent
da186244
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
14 deletions
+13
-14
AMDiS/src/io/Reader.h
AMDiS/src/io/Reader.h
+2
-5
AMDiS/src/io/Writer.h
AMDiS/src/io/Writer.h
+3
-5
AMDiS/src/io/detail/VtkReader.h
AMDiS/src/io/detail/VtkReader.h
+1
-1
AMDiS/src/io/detail/VtkWriter.cc
AMDiS/src/io/detail/VtkWriter.cc
+5
-1
AMDiS/src/io/detail/VtkWriter.hh
AMDiS/src/io/detail/VtkWriter.hh
+2
-2
No files found.
AMDiS/src/io/Reader.h
View file @
7d7433bd
...
...
@@ -44,7 +44,6 @@
#include "detail/ReaderWriter.h"
#include "boost/filesystem.hpp"
namespace
AMDiS
{
...
...
@@ -62,9 +61,8 @@ namespace AMDiS
void
readFile
(
std
::
string
filename
,
Container
&
container
)
{
using
boost
::
filesystem
::
path
;
std
::
string
ext
=
filename
.
substr
(
filename
.
find_last_of
(
"."
))
;
std
::
string
ext
=
path
(
filename
).
extension
().
string
();
Mesh
*
mesh
=
detail
::
getMesh
(
container
);
if
(
ext
==
".1d"
||
ext
==
".2d"
||
ext
==
".3d"
)
{
...
...
@@ -132,9 +130,8 @@ namespace AMDiS
void
readFile
(
std
::
string
filename
,
Mesh
*
mesh
)
{
using
boost
::
filesystem
::
path
;
std
::
string
ext
=
path
(
filename
).
extension
().
string
(
);
std
::
string
ext
=
filename
.
substr
(
filename
.
find_last_of
(
"."
)
);
if
(
ext
==
".1d"
||
ext
==
".2d"
||
ext
==
".3d"
)
{
std
::
string
periodicFilename
=
""
;
...
...
AMDiS/src/io/Writer.h
View file @
7d7433bd
...
...
@@ -44,7 +44,6 @@
#include "detail/ReaderWriter.h"
#include "boost/filesystem.hpp"
namespace
AMDiS
{
...
...
@@ -64,10 +63,9 @@ namespace AMDiS
template
<
typename
Container
>
void
writeFile
(
Container
&
container
,
std
::
string
filename
)
{
using
boost
::
filesystem
::
path
;
std
::
string
ext
=
path
(
filename
).
extension
().
string
();
{
std
::
string
ext
=
filename
.
substr
(
filename
.
find_last_of
(
"."
));
if
(
ext
==
".1d"
||
ext
==
".2d"
||
ext
==
".3d"
)
{
DataCollector
<
double
>
dc
(
detail
::
getFeSpace
(
container
,
0
),
...
...
AMDiS/src/io/detail/VtkReader.h
View file @
7d7433bd
...
...
@@ -121,7 +121,7 @@ namespace AMDiS
if
(
zlib
)
{
#ifdef HAVE_COMPRESSION
string
s
=
input
.
substr
(
0
,
6
);
string
s
=
input
.
substr
(
0
,
8
);
s
=
detail
::
base64ToStr
(
s
);
tmp
=
const_cast
<
char
*>
(
s
.
c_str
());
ptr
=
reinterpret_cast
<
int
*>
(
tmp
);
...
...
AMDiS/src/io/detail/VtkWriter.cc
View file @
7d7433bd
...
...
@@ -139,9 +139,13 @@ namespace AMDiS { namespace io {
path
pvd_path
=
animationFilename
;
path
::
iterator
it_vtu
,
it_pvd
;
#if (BOOST_VERSION < 104800)
path
vtu_path0
=
complete
(
vtu_path
);
vtu_path0
.
remove_filename
();
path
pvd_path0
=
complete
(
pvd_path
);
pvd_path0
.
remove_filename
();
#else
path
vtu_path0
=
absolute
(
vtu_path
);
vtu_path0
.
remove_filename
();
path
pvd_path0
=
absolute
(
pvd_path
);
pvd_path0
.
remove_filename
();
#endif
// find matching root directories
for
(
it_vtu
=
vtu_path0
.
begin
(),
it_pvd
=
pvd_path0
.
begin
();
it_vtu
!=
vtu_path0
.
end
()
&&
it_pvd
!=
pvd_path0
.
end
()
&&
*
it_vtu
==
*
it_pvd
;
...
...
AMDiS/src/io/detail/VtkWriter.hh
View file @
7d7433bd
...
...
@@ -158,8 +158,8 @@ namespace AMDiS { namespace io {
dataBase64Vec
[
valueSize
+
1
]
=
getStreamData
();
//DataArray
uint32_t
tmp32
=
0
;
for
(
int
i
=
0
;
i
<
nElements
;
i
++
)
{
tmp32
=
(
i
+
1
)
*
vertices
;
for
(
int
i
=
1
;
i
<=
nElements
;
i
++
)
{
tmp32
=
i
*
vertices
;
bstream
<<
tmp32
;
}
dataBase64Vec
[
valueSize
+
2
]
=
getStreamData
();
...
...
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