Enhancement: Field data export by MuellerSeb · Pull Request #17 · pyscience-projects/pyevtk

MuellerSeb · 2020-04-22T20:52:10Z

This PR adresses #15. In addition I made some corrections in the code:

reformatted with black
removed call to non-existing writeBlockSize64Bit
removed largeFile attribute form VtkFile
rewrote doc string in numpydoc style
converted None comparisons from val != None to val is not None

…ove ref to non-existing routine (64bit)

- removes EOL'ed python versions - switches Travis's base image to the latest (ubuntu bionic)

renefritze · 2020-04-23T07:21:05Z

Thank you for the contribution @MuellerSeb !

I'm having a little trouble discovering the functional changes in between the formatting ones. Can you help me with that?

I've also update the CI setup in #18 just now, if you rebase on master now, travis can work again.

MuellerSeb

Here I pointed out the substantial changes. Most of them are related to field data.

MuellerSeb · 2020-04-23T07:33:49Z

examples/unstructured.py


+point_data = {"test_pd": np.array([1, 2, 3, 4, 5, 6])}
+cell_data = {"test_cd": np.array([1, 2, 3])}
+field_data = {"test_fd": np.array([1.0, 2.0])}


Here I added field data to the grid.

MuellerSeb · 2020-04-23T07:34:19Z

examples/unstructured.py

+    cell_types=ctype,
+    cellData=cell_data,
+    pointData=point_data,
+    fieldData=field_data,


This field data can now simply be added to the call of the export functions.

MuellerSeb · 2020-04-23T07:35:34Z

pyevtk/hl.py

 #       Helper functions
 # =================================
-def _addDataToFile(vtkFile, cellData, pointData):
+def _addDataToFile(vtkFile, cellData, pointData, fieldData=None):


Here you can now pass field data to create a corresponding section.

MuellerSeb · 2020-04-23T07:36:18Z

pyevtk/hl.py

-def _appendDataToFile(vtkFile, cellData, pointData):
+    # Field data
+    # https://www.visitusers.org/index.php?title=Time_and_Cycle_in_VTK_files#XML_VTK_files
+    if fieldData:


Field data has no attributes, so just a section is created.

MuellerSeb · 2020-04-23T07:36:46Z

pyevtk/hl.py

+        vtkFile.closeData("Field")
+
+
+def _appendDataToFile(vtkFile, cellData, pointData, fieldData=None):


Here we can now create DataSets for field data.

MuellerSeb · 2020-04-23T07:39:29Z

pyevtk/hl.py

+    cell_types,
+    cellData=None,
+    pointData=None,
+    fieldData=None,


Added fieldData keyword to unstructuredGridToVTK

MuellerSeb · 2020-04-23T07:39:48Z

pyevtk/hl.py

+    npilars=16,
+    cellData=None,
+    pointData=None,
+    fieldData=None,


Added fieldData keyword to cylinderToVTK

MuellerSeb · 2020-04-23T07:41:15Z

pyevtk/vtk.py

+        The default is False.
+    """
+
+    def __init__(self, filepath, ftype):


removed the unused largeFile keyword.

MuellerSeb · 2020-04-23T07:42:28Z

pyevtk/vtk.py

+        VtkFile
+            This VtkFile to allow chained calls.
        """
        self.xml.openElement(nodeType + "Data")


This creates the FieldData element, when nodeType="Field"

MuellerSeb · 2020-04-23T07:44:04Z

pyevtk/vtk.py

-        if self.largeFile == False:
-            writeBlockSize(self.xml.stream, block_size)
-        else:
-            writeBlockSize64Bit(self.xml.stream, block_size)


This routine did not exists.

…ove ref to non-existing routine (64bit)

MuellerSeb · 2020-04-23T08:00:07Z

Thank you for the contribution @MuellerSeb !

I'm having a little trouble discovering the functional changes in between the formatting ones. Can you help me with that?

I've also update the CI setup in #18 just now, if you rebase on master now, travis can work again.

I did a review, pointing out the essential changes.

I also rebased and travis succeeded.

renefritze · 2020-04-23T08:03:21Z

Great! Thanks. Those changes look good to me.

While I do not mind the style changes personally, lets see if @somada141 or @xylar have strong opinions.

xylar

I like the updated formatting. It might be hard to merge changes from Paulo Herrera's version but I don't think we expect much from there.

MuellerSeb · 2020-04-23T17:10:40Z

Cool. Is @somada141 still active on GitHub?

renefritze · 2020-04-24T06:48:33Z

I like the updated formatting. It might be hard to merge changes from Paulo Herrera's version but I don't think we expect much from there.

Indeed. There hasn't been anything in over a year. We can always just run black on the remote too before a hypothetical merge though.

Cool. Is @somada141 still active on GitHub?

Let's wait till monday with the merge in either way.

renefritze · 2020-04-27T07:47:58Z

Thank you again @MuellerSeb, I'll try to prepare a new release today.

MuellerSeb · 2020-04-27T08:50:44Z

@renefritze : maybe we could address #19 first, before releasing a new version.

MuellerSeb added 9 commits April 22, 2020 22:34

evtk: reformat with black

f428374

evtk-subpackage: reformat with black

d59bc12

xml: add doc; reformat with black

ce2224e

vtk: update doc; reformat with black; remove largefile attribute; rem…

5388d60

…ove ref to non-existing routine (64bit)

hl: add field_data export option; update doc; reformat with black

3b3fcf0

examples: reformat wit black; add field data example

e10458b

vtk: reset appended encoding to raw

dcd0fc1

minor doc corrections

71a9fab

setup.py: reformat with black

e4d7287

MuellerSeb mentioned this pull request Apr 22, 2020

Enhancement: export field data #15

Closed

[ci] update travis setup

fcfc346

- removes EOL'ed python versions - switches Travis's base image to the latest (ubuntu bionic)

MuellerSeb commented Apr 23, 2020

View reviewed changes

renefritze assigned renefritze and unassigned renefritze Apr 23, 2020

renefritze added the enhancement label Apr 23, 2020

MuellerSeb added 11 commits April 23, 2020 09:52

evtk: reformat with black

5150345

evtk-subpackage: reformat with black

666c780

xml: add doc; reformat with black

6da811f

vtk: update doc; reformat with black; remove largefile attribute; rem…

ab0b3af

…ove ref to non-existing routine (64bit)

hl: add field_data export option; update doc; reformat with black

4d0cdf2

examples: reformat wit black; add field data example

1f124ae

vtk: reset appended encoding to raw

b61c10e

minor doc corrections

d1f1e33

setup.py: reformat with black

6e058a4

add some missing descriptions

db63f75

solve conflicts; remove accidentally created .vtu

2dcbedc

xylar approved these changes Apr 23, 2020

View reviewed changes

renefritze merged commit 488306a into pyscience-projects:master Apr 27, 2020

MuellerSeb mentioned this pull request Jul 13, 2020

Enhancement: export field data paulo-herrera/PyEVTK#7

Open

		vtkFile.closeData("Field")


		def _appendDataToFile(vtkFile, cellData, pointData, fieldData=None):

Conversation

MuellerSeb commented Apr 22, 2020

Uh oh!

renefritze commented Apr 23, 2020

Uh oh!

MuellerSeb left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MuellerSeb commented Apr 23, 2020

Uh oh!

renefritze commented Apr 23, 2020

Uh oh!

xylar left a comment

Choose a reason for hiding this comment

Uh oh!

MuellerSeb commented Apr 23, 2020

Uh oh!

renefritze commented Apr 24, 2020

Uh oh!

renefritze commented Apr 27, 2020

Uh oh!

MuellerSeb commented Apr 27, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants