diff --git a/src/aeros_simulation/service.py b/src/aeros_simulation/service.py index b96b55e..63a5eb2 100644 --- a/src/aeros_simulation/service.py +++ b/src/aeros_simulation/service.py @@ -278,7 +278,7 @@ async def get_simulation_with_plot_result( elif use_location_tag: query = query.join( AerosNode, AerosNode.id == AerosSimulationPlotResult.aeros_node_id - ).filter(AerosNode.node_name == node_id) + ).filter(AerosNode.node_name == node_id).filter(AerosNode.node_type == "RegularNode") else: query = query.join( AerosNode, AerosNode.id == AerosSimulationPlotResult.aeros_node_id diff --git a/src/aeros_simulation/utils.py b/src/aeros_simulation/utils.py index 6a56baa..f07357b 100644 --- a/src/aeros_simulation/utils.py +++ b/src/aeros_simulation/utils.py @@ -123,6 +123,8 @@ def filter_by_month(hourly_data, start_month, end_month): filtered_data.append(data) return filtered_data + + def calculate_equivalent_derate_hours(data_list, max_flow_rate: float = 660) -> float: """ Calculate Equivalent Forced Derated Hours (EFDH).