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
c22c8352
Commit
c22c8352
authored
Oct 15, 2017
by
Kirill Terekhov
Browse files
Fix include keyword behavior in eclipse grid reader; properly read 2d meshes with VTU reader
parent
5a69bf6c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Source/IO/mesh_ecl_file.cpp
View file @
c22c8352
...
...
@@ -1269,7 +1269,7 @@ namespace INMOST
}
std
::
vector
<
std
::
pair
<
std
::
pair
<
FILE
*
,
std
::
string
>
,
int
>
>
fs
(
1
,
std
::
make_pair
(
std
::
make_pair
(
f
,
File
),
0
));
char
readline
[
2048
],
readlines
[
2048
],
*
p
,
*
pend
,
rec
[
2048
],
pupper
[
2048
];
int
text_end
,
text_start
,
state
=
ECL_NONE
,
state_from
=
ECL_NONE
,
nchars
;
int
text_end
,
text_start
,
state
=
ECL_NONE
,
state_from
=
ECL_NONE
,
state_incl
=
ECL_NONE
,
nchars
;
int
waitlines
=
0
;
int
have_dimens
=
0
,
totread
,
downread
,
numrecs
,
offset
;
int
gtype
=
ECL_GTYPE_NONE
;
...
...
@@ -1662,7 +1662,7 @@ namespace INMOST
}
else
{
//
std::cout << __FILE__ << ":" << __LINE__ << " skipped " << p << " in " << fs.back().first.second << ":" << fs.back().second << std::endl;
std
::
cout
<<
__FILE__
<<
":"
<<
__LINE__
<<
" skipped "
<<
p
<<
" in "
<<
fs
.
back
().
first
.
second
<<
":"
<<
fs
.
back
().
second
<<
std
::
endl
;
}
break
;
case
ECL_SKIP_SECTION
:
...
...
@@ -1689,7 +1689,8 @@ namespace INMOST
throw
BadFileName
;
}
fs
.
push_back
(
std
::
make_pair
(
std
::
make_pair
(
f
,
GetFolder
(
fs
.
back
().
first
.
second
)
+
"/"
+
std
::
string
(
rec
+
shift_one
)),
0
));
if
(
*
(
pend
-
1
)
==
'/'
)
state
=
state_from
;
else
state
=
ECL_SKIP_SECTION
;
if
(
*
(
pend
-
1
)
==
'/'
)
state_incl
=
ECL_NONE
;
else
state_incl
=
ECL_SKIP_SECTION
;
state
=
ECL_NONE
;
}
else
{
...
...
@@ -2667,6 +2668,7 @@ namespace INMOST
ecl_exit_loop:
fclose
(
fs
.
back
().
first
.
first
);
fs
.
pop_back
();
if
(
!
fs
.
empty
()
)
state
=
state_incl
;
}
if
(
radial
==
ECL_GTYPE_RADIAL
)
{
...
...
Source/IO/mesh_vtu_file.cpp
View file @
c22c8352
...
...
@@ -65,6 +65,9 @@ namespace INMOST
for
(
Mesh
::
iteratorNode
it
=
BeginNode
();
it
!=
EndNode
();
++
it
)
old_nodes
[
qq
++
]
=
*
it
;
}
if
(
grid_is_2d
&&
old_nodes
.
empty
()
)
SetDimensions
(
2
);
if
(
!
old_nodes
.
empty
())
{
std
::
sort
(
old_nodes
.
begin
(),
old_nodes
.
end
(),
CentroidComparator
(
this
));
...
...
@@ -222,8 +225,23 @@ namespace INMOST
}
else
if
(
ctype
==
3
)
//VTK_LINE
{
newcells
[
q
]
=
CreateEdge
(
hnodes
).
first
.
GetHandle
();
have_edges
=
true
;
if
(
grid_is_2d
==
1
)
{
ElementArray
<
Edge
>
f_edges
(
this
,
hnodes
.
size
());
ElementArray
<
Node
>
e_nodes
(
this
,
1
);
for
(
int
k
=
0
;
k
<
(
int
)
hnodes
.
size
();
++
k
)
{
e_nodes
[
0
]
=
hnodes
[
k
];
f_edges
[
k
]
=
CreateEdge
(
e_nodes
).
first
;
}
newcells
[
q
]
=
CreateFace
(
f_edges
).
first
.
GetHandle
();
have_faces
=
true
;
}
else
{
newcells
[
q
]
=
CreateEdge
(
hnodes
).
first
.
GetHandle
();
have_edges
=
true
;
}
}
else
if
(
ctype
==
4
)
{
...
...
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