Skip to content

Commit

Permalink
Remove unused functions
Browse files Browse the repository at this point in the history
  • Loading branch information
oyvindeide committed Aug 20, 2024
1 parent a898d7c commit 9d9dc7c
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 39 deletions.
21 changes: 7 additions & 14 deletions src/ert/config/ensemble_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
List,
Optional,
Sequence,
Type,
Union,
no_type_check,
overload,
Expand Down Expand Up @@ -194,6 +193,8 @@ def __getitem__(self, key: str) -> Union[ParameterConfig, ResponseConfig]:
return self.parameter_configs[key]
elif key in self.response_configs:
return self.response_configs[key]
elif isinstance(key, int):
return self[self.keys[key]]
else:
raise KeyError(f"The key:{key} is not in the ensemble configuration")

Expand All @@ -217,20 +218,12 @@ def addNode(self, config_node: Union[ParameterConfig, ResponseConfig]) -> None:
else:
self.response_configs[config_node.name] = config_node

def getKeylistFromImplType(self, node_type: Type[Any]) -> List[str]:
mylist = []

for key in self.keys:
if isinstance(self[key], node_type):
mylist.append(key)

return mylist

def get_keylist_gen_kw(self) -> List[str]:
return self.getKeylistFromImplType(GenKwConfig)

def get_keylist_gen_data(self) -> List[str]:
return self.getKeylistFromImplType(GenDataConfig)
return [
val.name
for val in self.parameter_configuration
if isinstance(val, GenKwConfig)
]

@property
def grid_file(self) -> Optional[str]:
Expand Down
12 changes: 0 additions & 12 deletions src/ert/libres_facade.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
EnkfObservationImplementationType,
ErtConfig,
Field,
GenKwConfig,
)
from ert.data import MeasuredData
from ert.data._measured_data import ObservationError, ResponseError
Expand All @@ -42,7 +41,6 @@

from ert.config import (
EnkfObs,
PriorDict,
WorkflowJob,
)
from ert.run_arg import RunArg
Expand Down Expand Up @@ -243,16 +241,6 @@ def load_all_misfit_data(ensemble: Ensemble) -> DataFrame:

return misfit

def gen_kw_priors(self) -> Dict[str, List["PriorDict"]]:
gen_kw_keys = self.get_gen_kw()
all_gen_kw_priors = {}
for key in gen_kw_keys:
gen_kw_config = self.config.ensemble_config.parameter_configs[key]
if isinstance(gen_kw_config, GenKwConfig):
all_gen_kw_priors[key] = gen_kw_config.get_priors()

return all_gen_kw_priors

def get_workflow_job(self, name: str) -> Optional["WorkflowJob"]:
return self.config.workflow_jobs.get(name)

Expand Down
5 changes: 2 additions & 3 deletions tests/performance_tests/test_memory_usage.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import xarray as xr

from ert.analysis import smoother_update
from ert.config import ErtConfig, SummaryConfig
from ert.config import ErtConfig
from ert.enkf_main import sample_prior
from ert.storage import open_storage
from tests.performance_tests.performance_utils import make_poly_example
Expand Down Expand Up @@ -72,7 +72,6 @@ def fill_storage_with_data(poly_template: Path, ert_config: ErtConfig) -> None:
)
source = storage.create_ensemble(experiment_id, name="prior", ensemble_size=100)

summary_obs_keys = ens_config.getKeylistFromImplType(SummaryConfig)
realizations = list(range(ert_config.model_config.num_realizations))
for _, obs in ert_config.observations.items():
data_key = obs.attrs["response"]
Expand All @@ -88,7 +87,7 @@ def fill_storage_with_data(poly_template: Path, ert_config: ErtConfig) -> None:
obs_time_list = ens_config.refcase.all_dates
source.save_response(
data_key,
make_summary_data(summary_obs_keys, obs_time_list),
make_summary_data(["summary"], obs_time_list),
real,
)

Expand Down
10 changes: 0 additions & 10 deletions tests/unit_tests/test_libres_facade.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,6 @@ def test_gen_kw_log_appended_extra():
fh.writelines("MY_KEYWORD LOGNORMAL 1 2")


def test_gen_kw_priors(facade):
priors = facade.gen_kw_priors()
assert len(priors["SNAKE_OIL_PARAM"]) == 10
assert {
"key": "OP1_PERSISTENCE",
"function": "UNIFORM",
"parameters": {"MIN": 0.01, "MAX": 0.4},
} in priors["SNAKE_OIL_PARAM"]


@pytest.mark.filterwarnings("ignore:.*Use load_responses.*:DeprecationWarning")
def test_summary_collector(
monkeypatch, snake_oil_case_storage, snake_oil_default_storage, snapshot
Expand Down

0 comments on commit 9d9dc7c

Please sign in to comment.