Skip to content

Commit b0a59a8

Browse files
committed
Fixes
1 parent db615e1 commit b0a59a8

File tree

4 files changed

+29
-16
lines changed

4 files changed

+29
-16
lines changed

pyproject.toml

+1
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ dependencies = [
6767
"xarray",
6868
"xtgeo >= 3.3.0",
6969
"fastexcel>=0.12.1",
70+
"xlsxwriter>=3.2.2",
7071
]
7172

7273
[project.scripts]

src/ert/enkf_main.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -167,12 +167,12 @@ def save_design_matrix_to_ensemble(
167167
if not set(design_matrix_df.get_column("REAL")).issubset(set(active_realizations)):
168168
raise KeyError("Active realizations not found in design matrix data frame.")
169169
for row in design_matrix_df.filter(
170-
pl.col("REAL").is_in(active_realizations)
170+
pl.col("REAL").is_in(pl.Series(active_realizations))
171171
).to_numpy():
172172
ds = xr.Dataset(
173173
{
174-
"values": ("names", row[1:]),
175-
"transformed_values": ("names", row[1:]),
174+
"values": ("names", list(row[1:])),
175+
"transformed_values": ("names", list(row[1:])),
176176
"names": param_names,
177177
}
178178
)

tests/ert/ui_tests/cli/analysis/test_design_matrix.py

+14-13
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
from textwrap import dedent
66

77
import numpy as np
8-
import pandas as pd
8+
import polars as pl
99
import pytest
10+
from xlsxwriter import Workbook
1011

1112
from ert.cli.main import ErtCliError
1213
from ert.config import ErtConfig
@@ -16,11 +17,11 @@
1617

1718

1819
def _create_design_matrix(filename, design_sheet_df, default_sheet_df=None):
19-
with pd.ExcelWriter(filename) as xl_write:
20-
design_sheet_df.to_excel(xl_write, index=False, sheet_name="DesignSheet01")
20+
with Workbook(filename) as wb:
21+
design_sheet_df.write_excel(wb, worksheet="DesignSheet01")
2122
if default_sheet_df is not None:
22-
default_sheet_df.to_excel(
23-
xl_write, index=False, sheet_name="DefaultSheet", header=False
23+
default_sheet_df.write_excel(
24+
wb, worksheet="DefaultSheet", include_header=False
2425
)
2526

2627

@@ -30,14 +31,14 @@ def test_run_poly_example_with_design_matrix():
3031
a_values = list(range(num_realizations))
3132
_create_design_matrix(
3233
"poly_design.xlsx",
33-
pd.DataFrame(
34+
pl.DataFrame(
3435
{
3536
"REAL": list(range(num_realizations)),
3637
"a": a_values,
3738
"category": 5 * ["cat1"] + 5 * ["cat2"],
3839
}
3940
),
40-
pd.DataFrame([["b", 1], ["c", 2]]),
41+
pl.DataFrame([["b", 1], ["c", 2]], orient="row"),
4142
)
4243

4344
with open("poly.ert", "w", encoding="utf-8") as fout:
@@ -132,13 +133,13 @@ def test_run_poly_example_with_design_matrix_and_genkw_merge(default_values, err
132133
a_values = list(range(num_realizations))
133134
_create_design_matrix(
134135
"poly_design.xlsx",
135-
pd.DataFrame(
136+
pl.DataFrame(
136137
{
137138
"REAL": list(range(num_realizations)),
138139
"a": a_values,
139140
}
140141
),
141-
pd.DataFrame(default_values),
142+
pl.DataFrame(default_values, orient="row"),
142143
)
143144

144145
with open("poly.ert", "w", encoding="utf-8") as fout:
@@ -219,23 +220,23 @@ def test_run_poly_example_with_multiple_design_matrix_instances():
219220
a_values = list(range(num_realizations))
220221
_create_design_matrix(
221222
"poly_design_1.xlsx",
222-
pd.DataFrame(
223+
pl.DataFrame(
223224
{
224225
"REAL": list(range(num_realizations)),
225226
"a": a_values,
226227
}
227228
),
228-
pd.DataFrame([["b", 1], ["c", 2]]),
229+
pl.DataFrame([["b", 1], ["c", 2]], orient="row"),
229230
)
230231
_create_design_matrix(
231232
"poly_design_2.xlsx",
232-
pd.DataFrame(
233+
pl.DataFrame(
233234
{
234235
"REAL": list(range(num_realizations)),
235236
"d": num_realizations * [3],
236237
}
237238
),
238-
pd.DataFrame([["g", 4]]),
239+
pl.DataFrame([["g", 4]], orient="row"),
239240
)
240241

241242
with open("poly.ert", "w", encoding="utf-8") as fout:

uv.lock

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)