Feature/v3/update #352
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -204,13 +204,14 @@ def _plausibility_checks(self) -> None: | |
| f'(in {self.label_full}) and variable size is uncommon. Please check if this is intended!' | ||
| ) | ||
|
|
||
| def transform_data(self, flow_system: FlowSystem, name_prefix: str = '') -> None: | ||
| super().transform_data(flow_system, name_prefix) | ||
| if self.conversion_factors: | ||
| self.conversion_factors = self._transform_conversion_factors(flow_system) | ||
| if self.piecewise_conversion: | ||
| self.piecewise_conversion.has_time_dim = True | ||
| prefix = '|'.join(filter(None, [name_prefix, self.label_full])) | ||
| self.piecewise_conversion.transform_data(flow_system, f'{prefix}|PiecewiseConversion') | ||
|
|
||
| def _transform_conversion_factors(self, flow_system: FlowSystem) -> list[dict[str, xr.DataArray]]: | ||
| """Converts all conversion factors to internal datatypes""" | ||
|
|
@@ -261,10 +262,12 @@ class Storage(Component): | |
| initial_charge_state: Storage charge state at the beginning of the time horizon. | ||
| Can be numeric value or 'lastValueOfSim', which is recommended for if the initial start state is not known. | ||
| Default is 0. | ||
| minimal_final_charge_state: Minimum absolute charge state required at the end of the time horizon. | ||
| maximal_final_charge_state: Maximum absolute charge state allowed at the end of the time horizon. | ||
| relative_minimum_final_charge_state: Minimum relative charge state required at the end of the time horizon. | ||
| Defaults to the last value of the relative_minimum_charge_state. | ||
| relative_maximum_final_charge_state: Maximum relative charge state allowed at the end of the time horizon. | ||
| Defaults to the last value of the relative_maximum_charge_state. | ||
| eta_charge: Charging efficiency factor (0-1 range). Accounts for conversion | ||
| losses during charging. Default is 1 (perfect efficiency). | ||
| eta_discharge: Discharging efficiency factor (0-1 range). Accounts for | ||
|
|
@@ -420,46 +423,47 @@ def create_model(self, model: FlowSystemModel) -> StorageModel: | |
| self.submodel = StorageModel(model, self) | ||
| return self.submodel | ||
|
|
||
| def transform_data(self, flow_system: FlowSystem, name_prefix: str = '') -> None: | ||
| super().transform_data(flow_system, name_prefix) | ||
| base = '|'.join(filter(None, [name_prefix, self.label_full])) | ||
| self.relative_minimum_charge_state = flow_system.fit_to_model_coords( | ||
| f'{base}|relative_minimum_charge_state', | ||
| self.relative_minimum_charge_state, | ||
| ) | ||
| self.relative_maximum_charge_state = flow_system.fit_to_model_coords( | ||
| f'{base}|relative_maximum_charge_state', | ||
| self.relative_maximum_charge_state, | ||
| ) | ||
| self.eta_charge = flow_system.fit_to_model_coords(f'{base}|eta_charge', self.eta_charge) | ||
| self.eta_discharge = flow_system.fit_to_model_coords(f'{base}|eta_discharge', self.eta_discharge) | ||
| self.relative_loss_per_hour = flow_system.fit_to_model_coords( | ||
| f'{base}|relative_loss_per_hour', self.relative_loss_per_hour | ||
| ) | ||
| if not isinstance(self.initial_charge_state, str): | ||
| self.initial_charge_state = flow_system.fit_to_model_coords( | ||
| f'{base}|initial_charge_state', self.initial_charge_state, dims=['year', 'scenario'] | ||
| ) | ||
| self.minimal_final_charge_state = flow_system.fit_to_model_coords( | ||
| f'{base}|minimal_final_charge_state', self.minimal_final_charge_state, dims=['year', 'scenario'] | ||
| ) | ||
| self.maximal_final_charge_state = flow_system.fit_to_model_coords( | ||
| f'{base}|maximal_final_charge_state', self.maximal_final_charge_state, dims=['year', 'scenario'] | ||
| ) | ||
| self.relative_minimum_final_charge_state = flow_system.fit_to_model_coords( | ||
| f'{base}|relative_minimum_final_charge_state', | ||
| self.relative_minimum_final_charge_state, | ||
| dims=['year', 'scenario'], | ||
| ) | ||
| self.relative_maximum_final_charge_state = flow_system.fit_to_model_coords( | ||
| f'{base}|relative_maximum_final_charge_state', | ||
| self.relative_maximum_final_charge_state, | ||
| dims=['year', 'scenario'], | ||
| ) | ||
| if isinstance(self.capacity_in_flow_hours, InvestParameters): | ||
| self.capacity_in_flow_hours.transform_data(flow_system, f'{base}|InvestParameters') | ||
| else: | ||
| self.capacity_in_flow_hours = flow_system.fit_to_model_coords( | ||
| f'{base}|capacity_in_flow_hours', self.capacity_in_flow_hours, dims=['year', 'scenario'] | ||
| ) | ||
|
|
||
| def _plausibility_checks(self) -> None: | ||
|
|
@@ -691,14 +695,11 @@ def create_model(self, model) -> TransmissionModel: | |
| self.submodel = TransmissionModel(model, self) | ||
| return self.submodel | ||
|
|
||
| def transform_data(self, flow_system: FlowSystem, name_prefix: str = '') -> None: | ||
| super().transform_data(flow_system, name_prefix) | ||
| base = '|'.join(filter(None, [name_prefix, self.label_full])) | ||
| self.relative_losses = flow_system.fit_to_model_coords(f'{base}|relative_losses', self.relative_losses) | ||
| self.absolute_losses = flow_system.fit_to_model_coords(f'{base}|absolute_losses', self.absolute_losses) | ||
|
|
||
|
|
||
| class TransmissionModel(ComponentModel): | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,7 +16,7 @@ | |
| import numpy as np | ||
| import xarray as xr | ||
|
|
||
| from .core import NonTemporalDataUser, Scalar, TemporalData, TemporalDataUser | ||
| from .features import ShareAllocationModel | ||
| from .structure import Element, ElementModel, FlowSystemModel, Submodel, register_class_for_io | ||
|
|
||
|
|
@@ -174,41 +174,42 @@ def __init__( | |
| self.minimum_total = minimum_total | ||
| self.maximum_total = maximum_total | ||
|
|
||
| def transform_data(self, flow_system: FlowSystem, name_prefix: str = '') -> None: | ||
| base = '|'.join(filter(None, [name_prefix, self.label_full])) | ||
| self.minimum_operation_per_hour = flow_system.fit_to_model_coords( | ||
| f'{base}|minimum_operation_per_hour', self.minimum_operation_per_hour | ||
| ) | ||
|
|
||
| self.maximum_operation_per_hour = flow_system.fit_to_model_coords( | ||
| f'{base}|maximum_operation_per_hour', self.maximum_operation_per_hour | ||
| ) | ||
|
|
||
| self.specific_share_to_other_effects_operation = flow_system.fit_effects_to_model_coords( | ||
| f'{base}|operation->', self.specific_share_to_other_effects_operation, 'operation' | ||
| ) | ||
|
|
||
| self.minimum_operation = flow_system.fit_to_model_coords( | ||
| f'{base}|minimum_operation', self.minimum_operation, dims=['year', 'scenario'] | ||
| ) | ||
| self.maximum_operation = flow_system.fit_to_model_coords( | ||
| f'{base}|maximum_operation', self.maximum_operation, dims=['year', 'scenario'] | ||
| ) | ||
| self.minimum_invest = flow_system.fit_to_model_coords( | ||
| f'{base}|minimum_invest', self.minimum_invest, dims=['year', 'scenario'] | ||
| ) | ||
| self.maximum_invest = flow_system.fit_to_model_coords( | ||
| f'{base}|maximum_invest', self.maximum_invest, dims=['year', 'scenario'] | ||
| ) | ||
| self.minimum_total = flow_system.fit_to_model_coords( | ||
| f'{base}|minimum_total', | ||
| self.minimum_total, | ||
| dims=['year', 'scenario'], | ||
| ) | ||
| self.maximum_total = flow_system.fit_to_model_coords( | ||
| f'{base}|maximum_total', self.maximum_total, dims=['year', 'scenario'] | ||
| ) | ||
| self.specific_share_to_other_effects_invest = flow_system.fit_effects_to_model_coords( | ||
| f'{base}|invest->', | ||
| self.specific_share_to_other_effects_invest, | ||
| 'invest', | ||
| dims=['year', 'scenario'], | ||
|
|
@@ -275,7 +276,7 @@ def _do_modeling(self): | |
| TemporalEffectsUser = TemporalDataUser | dict[str, TemporalDataUser] # User-specified Shares to Effects | ||
| """ This datatype is used to define a temporal share to an effect by a certain attribute. """ | ||
|
|
||
| NonTemporalEffectsUser = NonTemporalDataUser | dict[str, NonTemporalDataUser] # User-specified Shares to Effects | ||
| """ This datatype is used to define a scalar share to an effect by a certain attribute. """ | ||
|
|
||
| TemporalEffects = dict[str, TemporalData] # User-specified Shares to Effects | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧹 Nitpick
Fix heading levels (MD001): use h3 under h2.
Change the three h4 section headers to h3 to avoid heading‑increment violations.
Apply this diff:
Also applies to: 42-42, 55-55
🧰 Tools
🪛 markdownlint-cli2 (0.18.1)
38-38: Heading levels should only increment by one level at a time
Expected: h3; Actual: h4
(MD001, heading-increment)
🤖 Prompt for AI Agents