change name of function

tnatt · Aug 11, 2023 · fe7edc7 · fe7edc7
1 parent e806ef6
commit fe7edc7
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/webviz_subsurface/_models/inplace_volumes_model.py b/webviz_subsurface/_models/inplace_volumes_model.py
@@ -356,7 +356,7 @@ def extract_volframe_from_tableprovider(
             table_provider_set = create_csvfile_providerset_from_paths(
                 ensemble_paths, str(Path(volfolder) / volfile), drop_failed_realizations
             )
-            ensembledf = table_provider_set.get_combined_dataframe()
+            ensembledf = table_provider_set.get_aggregated_dataframe()
             volframes.append(ensembledf)
 
         # merge csvfiles from same SOURCE if more than one

diff --git a/webviz_subsurface/_utils/ensemble_table_provider_set.py b/webviz_subsurface/_utils/ensemble_table_provider_set.py
@@ -19,9 +19,8 @@ def __init__(self, provider_dict: Dict[str, EnsembleTableProvider]) -> None:
         self._all_realizations = self._create_union_of_realizations_from_providers(
             list(self._provider_dict.values())
         )
-        self._combined_dataframe = pd.DataFrame()
 
-    def get_combined_dataframe(self) -> pd.DataFrame:
+    def get_aggregated_dataframe(self) -> pd.DataFrame:
         dfs = []
         for ens, provider in self.items():
             df = provider.get_column_data(column_names=provider.column_names())

diff --git a/webviz_subsurface/plugins/_parameter_analysis/_plugin.py b/webviz_subsurface/plugins/_parameter_analysis/_plugin.py
@@ -117,7 +117,7 @@ def __init__(
         )
 
         parameter_provider_set = create_parameter_providerset_from_paths(ensemble_paths)
-        parameter_df = parameter_provider_set.get_combined_dataframe()
+        parameter_df = parameter_provider_set.get_aggregated_dataframe()
 
         self._pmodel = ParametersModel(
             dataframe=parameter_df,

diff --git a/webviz_subsurface/plugins/_parameter_response_correlation.py b/webviz_subsurface/plugins/_parameter_response_correlation.py
@@ -170,7 +170,7 @@ def __init__(
             parameter_provider_set = create_parameter_providerset_from_paths(
                 self.ens_paths
             )
-            parameterdf = parameter_provider_set.get_combined_dataframe()
+            parameterdf = parameter_provider_set.get_aggregated_dataframe()
 
             if self.response_file:
                 self.responsedf = load_csv(

diff --git a/webviz_subsurface/plugins/_simulation_time_series_onebyone/_plugin.py b/webviz_subsurface/plugins/_simulation_time_series_onebyone/_plugin.py
@@ -89,7 +89,7 @@ def __init__(
             )
 
         parameter_provider_set = create_parameter_providerset_from_paths(ensemble_paths)
-        parameter_df = parameter_provider_set.get_combined_dataframe()
+        parameter_df = parameter_provider_set.get_aggregated_dataframe()
         parametermodel = ParametersModel(dataframe=parameter_df, drop_constants=True)
 
         self.add_view(

diff --git a/webviz_subsurface/plugins/_volumetric_analysis/volumetric_analysis.py b/webviz_subsurface/plugins/_volumetric_analysis/volumetric_analysis.py
@@ -189,7 +189,7 @@ def __init__(
             parameter_provider_set = create_parameter_providerset_from_paths(
                 ensemble_paths, drop_failed_realizations
             )
-            parameters = parameter_provider_set.get_combined_dataframe()
+            parameters = parameter_provider_set.get_aggregated_dataframe()
         else:
             raise ValueError(
                 'Incorrent arguments. Either provide a "csvfile_vol" or "ensembles" and "volfiles"'