Skip to content

Commit 5da00bb

Browse files
authored
eclab.mpr: Add additional columns no. 115, 884, 903. (#233)
* Fix unknown columns in gcpl. * add test files and tests. * docs --------- Co-authored-by: Peter Kraus <peter.kraus@tondon.de>
1 parent 6b17a05 commit 5da00bb

File tree

7 files changed

+19109
-1
lines changed

7 files changed

+19109
-1
lines changed

docs/source/version.6_2.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,6 @@ Bug fixes in ``yadg-next`` include:
4141
- Fixed metadata extraction in :mod:`yadg.extractors.eclab.mpt` so that multiple ``Comments:`` lines are concatenated instead of just the last line being kept.
4242
- Added further ``Set I/C`` parameters. Thanks to `@Locki3 <https://github.com/Locki3>`_ for providing test files.
4343
- Fixed ``param format`` and ``data_column`` in CV files generated with EC-Lab version 11.50 using the :mod:`yadg.extractors.eclab.mpr` module. Thank you to J.N. Hausmann from Helmholtz-Zentrum Berlin für Materialien und Energie for providing the test files.
44-
- Fixed parsing of various kinds of Modulo Bat files in :mod:`yadg.extractors.eclab.mpr`. Thank you to `@JohannesBaller <https://github.com/JohannesBaller>`_ for providing test files.
44+
- Fixed parsing of various kinds of Modulo Bat files in :mod:`yadg.extractors.eclab.mpr`. Thank you to `Johannes Baller <https://github.com/JohannesBaller>`_ for providing test files.
45+
- Fixed parsing of missing columns in GCPL files in :mod:`yadg.extractors.eclab.mpr`. Thank you to `Joachim Laviolette <https://github.com/JL-CEA>`_ for providing test files.
4546
- Columns in :mod:`yadg.extractors.eclab.mpr` files may have different meanings based on which other columns are also present in the files, see `issue 225 <https://github.com/dgbowl/yadg/issues/225>`_. Added a (hopefully extensible) way to tackle such conflicts and clarified the warnings.

src/yadg/extractors/eclab/mpr_columns.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
99: ("<f4", "|Zce|", "Ω"),
101101
100: ("<f4", "Re(Zce)", "Ω"),
102102
101: ("<f4", "-Im(Zce)", "Ω"),
103+
115: ("<f8", "Energy ce charge", "W·h"),
103104
123: ("<f8", "Energy we charge", "W·h"),
104105
124: ("<f8", "Energy we discharge", "W·h"),
105106
125: ("<f8", "Capacitance charge", "µF"),
@@ -180,6 +181,8 @@
180181
501: ("<f4", "|Ece h5|", "V"),
181182
502: ("<f4", "|Ece h6|", "V"),
182183
503: ("<f4", "|Ece h7|", "V"),
184+
884: ("<f8", "Energy ce discharge", "W·h"),
185+
893: ("<f8", "Capacitance charge", "µF"),
183186
981: ("<u4", "z cycle", None), # 981 % 512 = 469, also z cycle
184187
}
185188

tests/test_x_eclab.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ def compare_params(left, right):
6565
("gcpl.issue_226.I", "en_US"),
6666
("gcpl.issue_226.CxN", "en_US"),
6767
("gcpl.issue_228", "en_US"),
68+
("gcpl.issue_230", "en_US"),
6869
("geis", "en_US"),
6970
("lsv", "en_US"),
7071
("lsv.issue_195", "en_US"),
2.07 MB
Binary file not shown.
6.32 MB
Binary file not shown.

tests/test_x_eclab/gcpl.issue_230.mpt

Lines changed: 19103 additions & 0 deletions
Large diffs are not rendered by default.
10.7 MB
Binary file not shown.

0 commit comments

Comments
 (0)