Skip to content

Support file I/O for string columns in SolutionArray#900

Merged
bryanwweber merged 5 commits intoCantera:mainfrom
ischoegl:fix-solutionarray-str-columns
Aug 9, 2020
Merged

Support file I/O for string columns in SolutionArray#900
bryanwweber merged 5 commits intoCantera:mainfrom
ischoegl:fix-solutionarray-str-columns

Conversation

@ischoegl
Copy link
Copy Markdown
Member

@ischoegl ischoegl commented Jul 10, 2020 •
edited
Loading

Changes proposed in this pull request

  • Enable CSV import of string columns
  • Enable HDF export/import of string columns
  • Add phase_of_matter to SolutionArray

If applicable, fill in the issue number this pull request is fixing

Fixes #896

Checklist

  • There is a clear use-case for this code change
  • The commit message has a short title & references relevant issues
  • Build passes (scons build & scons test) and unit tests address code coverage
  • The pull request is ready for review

@ischoegl ischoegl marked this pull request as draft July 10, 2020 20:44
@ischoegl ischoegl marked this pull request as ready for review July 10, 2020 21:55
@ischoegl ischoegl mentioned this pull request Jul 10, 2020
Merged
4 tasks
@ischoegl ischoegl changed the title Implement support for string columns in SolutionArray Support file I/O for string columns in SolutionArray Jul 10, 2020
@codecov
Copy link
Copy Markdown

codecov bot commented Jul 10, 2020 •
edited
Loading

Codecov Report

Merging #900 into main will increase coverage by 0.00%.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             main     #900   +/-   ##
=======================================
  Coverage   71.17%   71.18%           
=======================================
  Files         376      376           
  Lines       46190    46201   +11     
=======================================
+ Hits        32877    32888   +11     
  Misses      13313    13313
Impacted Files Coverage Δ
test/general/test_containers.cpp 99.57% <0.00%> (-0.43%) ⬇️
src/base/AnyMap.cpp 83.99% <0.00%> (+0.21%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 773523a...e4e7f3d. Read the comment docs.

@ischoegl ischoegl mentioned this pull request Jul 10, 2020
Closed
@ischoegl ischoegl force-pushed the fix-solutionarray-str-columns branch 2 times, most recently from b669247 to 11677fd Compare July 11, 2020 18:19
@ischoegl ischoegl force-pushed the fix-solutionarray-str-columns branch from 11677fd to a0a19c1 Compare July 14, 2020 14:42
@ischoegl
Copy link
Copy Markdown
Member Author

ischoegl commented Aug 3, 2020 •
edited
Loading

@bryanwweber ... enabling strings wasn’t difficult after all. However, any comments (or better ideas) on the numpy version if/else condition here? (Alternative would be a less specific try/except)

It’s pretty quiet these days otherwise: I hope that the work on beta is coming along.

bryanwweber
bryanwweber requested changes Aug 4, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@bryanwweber bryanwweber left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @ischoegl. In 6edb133 we set the minimum NumPy version to 1.12, since that's required for #838 to work properly. Ubuntu 18.04 provides 1.13.x in the system packages, and we didn't want to break compatibility with that version, so that's how I picked 1.12. Anyhow, I left a comment below about the version comparison.
Too many other things going on right now, with the semester approaching. It is my goal to get 2.5.0 out before the semester (i.e., before August 31) but... you know 😄

@ischoegl
Copy link
Copy Markdown
Member Author

ischoegl commented Aug 4, 2020 •
edited
Loading

@bryanwweber ... thanks for the review: your recommendations were useful as always and were easily addressed. I'm happy about the suggestion for np.lib.NumpyVersion, as I didn't like the distutils dependency (which I however still preferred to a try ... except structure).

Definitely looking forward to the release of 2.5.0 - I appreciate your and @speth's efforts on getting this out! I won't teach combustion again until next spring though 😜

PS: failing tests are fixed by #905

bryanwweber
bryanwweber reviewed Aug 5, 2020
View reviewed changes
@ischoegl ischoegl force-pushed the fix-solutionarray-str-columns branch 2 times, most recently from e20368f to 2fb21e9 Compare August 7, 2020 01:02
@ischoegl
Copy link
Copy Markdown
Member Author

ischoegl commented Aug 7, 2020 •
edited
Loading

@bryanwweber ... thanks again for your feedback - the comment is now added; I believe everything is taken care of at this point.

@ischoegl
[thermo] Add comment for maximum length of strings in SolutionArray
e4e7f3d 
The length of strings assigned by built-in SolutionArray methods is
limited to 50 characters.
@ischoegl ischoegl force-pushed the fix-solutionarray-str-columns branch from 2fb21e9 to e4e7f3d Compare August 7, 2020 01:41
bryanwweber
bryanwweber approved these changes Aug 9, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@bryanwweber bryanwweber left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @ischoegl!

@bryanwweber bryanwweber merged commit 29f6b94 into Cantera:main Aug 9, 2020
@ischoegl
Copy link
Copy Markdown
Member Author

ischoegl commented Aug 9, 2020

Thanks @bryanwweber!

@ischoegl ischoegl deleted the fix-solutionarray-str-columns branch September 3, 2020 03:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bryanwweber bryanwweber bryanwweber approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

What to do about str columns in SolutionArray

3 participants

@ischoegl @bryanwweber @speth