Skip to content

Commit 1d70073

Browse files
committed
Include localization columns when joining obs dataframes
1 parent 7fa0935 commit 1d70073

5 files changed

Lines changed: 27 additions & 0 deletions

File tree

src/ert/storage/local_ensemble.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1152,6 +1152,9 @@ def get_observations_and_responses(
11521152
"observation_key",
11531153
"observations",
11541154
"std",
1155+
"east",
1156+
"north",
1157+
"radius",
11551158
]
11561159
)
11571160

tests/ert/performance_tests/test_analysis.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@ def g(X):
8383
"index": np.arange(len(observations)),
8484
"observations": observations,
8585
"std": observation_noise,
86+
"east": pl.Series([None] * len(observations), dtype=pl.Float32),
87+
"north": pl.Series([None] * len(observations), dtype=pl.Float32),
88+
"radius": pl.Series([None] * len(observations), dtype=pl.Float32),
8689
}
8790
)
8891

tests/ert/performance_tests/test_obs_and_responses_performance.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,9 @@ def create_experiment_args(
142142
rng.normal(loc=0.2, scale=0.1, size=num_gen_data_obs),
143143
dtype=pl.Float32,
144144
),
145+
"east": pl.Series([None] * num_gen_data_obs, dtype=pl.Float32),
146+
"north": pl.Series([None] * num_gen_data_obs, dtype=pl.Float32),
147+
"radius": pl.Series([None] * num_gen_data_obs, dtype=pl.Float32),
145148
}
146149
)
147150

@@ -195,6 +198,9 @@ def create_experiment_args(
195198
rng.normal(loc=0.2, scale=0.1, size=num_summary_obs),
196199
dtype=pl.Float32,
197200
),
201+
"east": pl.Series([None] * num_summary_obs, dtype=pl.Float32),
202+
"north": pl.Series([None] * num_summary_obs, dtype=pl.Float32),
203+
"radius": pl.Series([None] * num_summary_obs, dtype=pl.Float32),
198204
}
199205
)
200206

tests/ert/unit_tests/analysis/test_es_update.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ def obs() -> pl.DataFrame:
4242
"index": pl.Series([0, 1, 2], dtype=pl.UInt16),
4343
"observations": pl.Series([1.0, 1.0, 1.0], dtype=pl.Float32),
4444
"std": pl.Series([0.1, 1.0, 10.0], dtype=pl.Float32),
45+
"east": pl.Series([None, None, None], dtype=pl.Float32),
46+
"north": pl.Series([None, None, None], dtype=pl.Float32),
47+
"radius": pl.Series([None, None, None], dtype=pl.Float32),
4548
}
4649
)
4750

@@ -250,6 +253,9 @@ def test_update_handles_precision_loss_in_std_dev(tmp_path):
250253
[559437122.6211826, 999999999.9999999, 1.9],
251254
dtype=pl.Float32,
252255
),
256+
"east": pl.Series([None, None, None], dtype=pl.Float32),
257+
"north": pl.Series([None, None, None], dtype=pl.Float32),
258+
"radius": pl.Series([None, None, None], dtype=pl.Float32),
253259
}
254260
)
255261
},
@@ -364,6 +370,9 @@ def test_update_raises_on_singular_matrix(tmp_path):
364370
[0.33333334, 0.14142136, 0.0],
365371
dtype=pl.Float32,
366372
),
373+
"east": pl.Series([None, None, None], dtype=pl.Float32),
374+
"north": pl.Series([None, None, None], dtype=pl.Float32),
375+
"radius": pl.Series([None, None, None], dtype=pl.Float32),
367376
}
368377
)
369378
},
@@ -940,6 +949,9 @@ def test_gen_data_obs_data_mismatch(storage, uniform_parameter):
940949
"index": pl.Series([1000], dtype=pl.UInt16),
941950
"observations": pl.Series([1.0], dtype=pl.Float32),
942951
"std": pl.Series([0.1], dtype=pl.Float32),
952+
"east": pl.Series([None], dtype=pl.Float32),
953+
"north": pl.Series([None], dtype=pl.Float32),
954+
"radius": pl.Series([None], dtype=pl.Float32),
943955
}
944956
)
945957

tests/ert/unit_tests/storage/test_local_storage.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -787,6 +787,9 @@ def test_asof_joining_summary(tmp_path, perturb_observations, perturb_responses)
787787
[0.1] * len(response_keys),
788788
dtype=pl.Float32,
789789
),
790+
"north": pl.Series([None] * len(response_keys), dtype=pl.Float32),
791+
"east": pl.Series([None] * len(response_keys), dtype=pl.Float32),
792+
"radius": pl.Series([None] * len(response_keys), dtype=pl.Float32),
790793
}
791794
)
792795

0 commit comments

Comments
 (0)