ecopipeline 0.4.12__tar.gz → 0.4.14__tar.gz

{ecopipeline-0.4.12/src/ecopipeline.egg-info → ecopipeline-0.4.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ecopipeline
-Version: 0.4.12
+Version: 0.4.14
 Summary: Contains functions for use in Ecotope Datapipelines
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)

{ecopipeline-0.4.12 → ecopipeline-0.4.14}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = ecopipeline
-version = 0.4.12
+version = 0.4.14
 authors = ["Carlos Bello, <bellocarlos@seattleu.edu>, Emil Fahrig <fahrigemil@seattleu.edu>, Casey Mang <cmang@seattleu.edu>, Julian Harris <harrisjulian@seattleu.edu>, Roger Tram <rtram@seattleu.edu>, Nolan Price <nolan@ecotope.com>"]
 description = Contains functions for use in Ecotope Datapipelines
 long_description = file: README.md

{ecopipeline-0.4.12 → ecopipeline-0.4.14}/src/ecopipeline/transform/__init__.py

@@ -1,4 +1,4 @@
-from .transform import rename_sensors, avg_duplicate_times, remove_outliers, ffill_missing, nullify_erroneous, sensor_adjustment, round_time, aggregate_df, join_to_hourly, concat_last_row, join_to_daily, cop_method_1, cop_method_2, create_summary_tables, remove_partial_days,convert_c_to_f,convert_l_to_g, convert_on_off_col_to_bool, flag_dhw_outage,generate_event_log_df,convert_time_zone, shift_accumulative_columns
+from .transform import rename_sensors, avg_duplicate_times, remove_outliers, ffill_missing, nullify_erroneous, sensor_adjustment, round_time, aggregate_df, join_to_hourly, concat_last_row, join_to_daily, cop_method_1, cop_method_2, create_summary_tables, remove_partial_days,convert_c_to_f,convert_l_to_g, convert_on_off_col_to_bool, flag_dhw_outage,generate_event_log_df,convert_time_zone, shift_accumulative_columns,heat_output_calc
 from .lbnl import nclarity_filter_new, site_specific, condensate_calculations, gas_valve_diff, gather_outdoor_conditions, aqsuite_prep_time, nclarity_csv_to_df, _add_date, add_local_time, aqsuite_filter_new, get_refrig_charge, elev_correction, change_ID_to_HVAC, get_hvac_state, get_cop_values, get_cfm_values, replace_humidity, create_fan_curves, lbnl_temperature_conversions, lbnl_pressure_conversions, lbnl_sat_calculations, get_site_cfm_info, get_site_info, merge_indexlike_rows
 from .bayview import calculate_cop_values, aggregate_values, get_energy_by_min, verify_power_energy, get_temp_zones120, get_storage_gals120
 __all__ = ["rename_sensors", "avg_duplicate_times", "remove_outliers", "ffill_missing", "nullify_erroneous", "sensor_adjustment", "round_time", "aggregate_df", "join_to_hourly", "concat_last_row", "join_to_daily", 
@@ -6,4 +6,4 @@ __all__ = ["rename_sensors", "avg_duplicate_times", "remove_outliers", "ffill_mi
            "nclarity_csv_to_df", "_add_date", "add_local_time", "aqsuite_filter_new", "get_refrig_charge", "elev_correction", "change_ID_to_HVAC", "get_hvac_state", "get_cop_values", "get_cfm_values", "replace_humidity", 
            "create_fan_curves", "lbnl_temperature_conversions", "lbnl_pressure_conversions", "lbnl_sat_calculations", "get_site_cfm_info", "get_site_info", "merge_indexlike_rows", "calculate_cop_values", "aggregate_values", 
            "get_energy_by_min", "verify_power_energy", "get_temp_zones120", "get_storage_gals120","convert_c_to_f","convert_l_to_g", "convert_on_off_col_to_bool", "flag_dhw_outage","generate_event_log_df","convert_time_zone",
-           "shift_accumulative_columns"]
+           "shift_accumulative_columns","heat_output_calc"]

{ecopipeline-0.4.12 → ecopipeline-0.4.14}/src/ecopipeline/transform/transform.py

@@ -271,6 +271,7 @@ def ffill_missing(original_df: pd.DataFrame, config : ConfigManager, previous_fi
         Pandas dataframe that has been forward filled to the specifications detailed in the vars_filename csv
     """
     df = original_df.copy()
+    df = df.sort_index()
     vars_filename = config.get_var_names_path()
     try:
         # ffill dataframe holds ffill length and changepoint bool
@@ -345,6 +346,36 @@ def nullify_erroneous(original_df: pd.DataFrame, config : ConfigManager) -> pd.D
 
     return df
 
+def heat_output_calc(df: pd.DataFrame, flow_var : str, hot_temp : str, cold_temp : str, heat_out_col_name : str, return_as_kw : bool = True):
+    """
+    Function will take a flow varriable and two temperature inputs to calculate heat output 
+
+    Parameters
+    ---------- 
+    df: pd.DataFrame
+        Pandas dataframe with minute-to-minute data
+    flow_var : str
+        The column name of the flow varriable for the calculation. Units of the column should be gal/min
+    hot_temp : str
+        The column name of the hot temperature varriable for the calculation. Units of the column should be degrees F
+    cold_temp : str
+        The column name of the cold temperature varriable for the calculation. Units of the column should be degrees F
+    heat_out_col_name : str
+        The new column name for the heat output calculated from the varriables
+    return_as_kw : bool
+        Set to true for new heat out column to have kW units. Set to false to return column as BTU/hr
+        
+    Returns
+    ------- 
+    pd.DataFrame: 
+        Pandas dataframe with new heat output column of specified name.
+    """
+    df[heat_out_col_name] = 500 * df[flow_var] * (df[hot_temp] - df[cold_temp]) #BTU/hr
+    df[heat_out_col_name] = np.where(df[heat_out_col_name] > 0, df[heat_out_col_name], 0)
+    if return_as_kw:
+        df[heat_out_col_name] = df[heat_out_col_name]/3412 # convert to kW
+    return df
+
 #TODO investigate if this can be removed
 def sensor_adjustment(df: pd.DataFrame, config : ConfigManager) -> pd.DataFrame:
     """

{ecopipeline-0.4.12 → ecopipeline-0.4.14/src/ecopipeline.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ecopipeline
-Version: 0.4.12
+Version: 0.4.14
 Summary: Contains functions for use in Ecotope Datapipelines
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)