Some miscellaneous refactoring/tidy up

Signed-off-by: Davey Elder <iandavidelder@gmail.com>

Author: idelder

docs/source/database_schema.mmd

@@ -275,33 +275,6 @@ limit_capacity_share {
    TEXT notes
    REAL share
 }
-limit_degrowth_capacity {
- TEXT operator PK
-   TEXT region PK
-   TEXT tech_or_group PK
-   TEXT notes
-   REAL rate
-   REAL seed
-   TEXT seed_units
-}
-limit_degrowth_new_capacity {
- TEXT operator PK
-   TEXT region PK
-   TEXT tech_or_group PK
-   TEXT notes
-   REAL rate
-   REAL seed
-   TEXT seed_units
-}
-limit_degrowth_new_capacity_delta {
- TEXT operator PK
-   TEXT region PK
-   TEXT tech_or_group PK
-   TEXT notes
-   REAL rate
-   REAL seed
-   TEXT seed_units
-}
 limit_emission {
  TEXT emis_comm PK
    TEXT operator PK
@@ -311,33 +284,6 @@ limit_emission {
    TEXT units
    REAL value
 }
-limit_growth_capacity {
- TEXT operator PK
-   TEXT region PK
-   TEXT tech_or_group PK
-   TEXT notes
-   REAL rate
-   REAL seed
-   TEXT seed_units
-}
-limit_growth_new_capacity {
- TEXT operator PK
-   TEXT region PK
-   TEXT tech_or_group PK
-   TEXT notes
-   REAL rate
-   REAL seed
-   TEXT seed_units
-}
-limit_growth_new_capacity_delta {
- TEXT operator PK
-   TEXT region PK
-   TEXT tech_or_group PK
-   TEXT notes
-   REAL rate
-   REAL seed
-   TEXT seed_units
-}
 limit_new_capacity {
  TEXT operator PK
    INTEGER period PK

temoa/_internal/table_data_puller.py

@@ -20,7 +20,6 @@
 from temoa._internal.exchange_tech_cost_ledger import CostType, ExchangeTechCostLedger
 from temoa.components import costs
 from temoa.components.utils import get_variable_efficiency
-from temoa.extensions.economies_of_scale.core import data_puller as eos
 from temoa.types.model_types import EI, FI, SLI, CapData, FlowType
 
 if TYPE_CHECKING:
@@ -491,14 +490,10 @@ def poll_cost_results(
                 }
             )
 
-    # Get nonlinear costs from the EOS extension, if active
-    eos.poll_costs(
-        model=model,
-        exchange_costs=exchange_costs,
-        entries=entries,
-        p_0=p_0_true,
-        epsilon=epsilon,
-    )
+    if 'eos' in model.enabled_extensions:
+        import temoa.extensions.economies_of_scale.core.data_puller as eos
+
+        eos.poll_costs(model, exchange_costs, entries, p_0_true, epsilon)
 
     exchange_entries = exchange_costs.get_entries()
     return entries, exchange_entries

temoa/core/model.py

@@ -39,9 +39,6 @@
     technology,
     time,
 )
-from temoa.extensions.economies_of_scale.core.model import (
-    register_early_eos_components,
-)
 from temoa.extensions.framework import apply_model_extension_hooks, resolve_extension_specs
 from temoa.model_checking.validators import (
     no_slash_or_pipe,
@@ -570,7 +567,10 @@ def __init__(
         self.cost_invest = Param(self.cost_invest_rtv)
 
         # Inject cost_invest_eos extension components prior to loan params, if active
-        register_early_eos_components(self)
+        if 'eos' in self.enabled_extensions:
+            import temoa.extensions.economies_of_scale.core.model as eos
+
+            eos.register_early_eos_components(self)
 
         self.default_loan_rate = Param(domain=NonNegativeReals)
         self.loan_rate = Param(
@@ -687,9 +687,13 @@ def __init__(
         self.seasonal_storage_constraints_rpsdtv = Set(
             dimen=6, initialize=storage.seasonal_storage_constraint_indices
         )
-        self.limit_storage_fraction_param_rsdt = (
-            Set()
-        )  # populated by hybrid_loader with (r, s, d, t, op) keys
+        self.limit_storage_fraction_param_rsdt = Set(
+            within=self.regional_global_indices
+            * (self.time_season | self.time_season_sequential)
+            * self.time_of_day
+            * self.tech_storage
+            * self.operator
+        )
         self.limit_storage_fraction = Param(
             self.limit_storage_fraction_param_rsdt, validate=validate_0to1
         )

temoa/extensions/economies_of_scale/core/data_puller.py

@@ -33,8 +33,6 @@ def poll_costs(
     Poll the fixed and variable costs for all EOS clusters in the planning horizon
     and add them to the cost entries for the model.
     """
-    if 'eos' not in model.enabled_extensions:
-        return
     model = cast('EOSModel', model)
 
     global_discount_rate = value(model.global_discount_rate)

temoa/extensions/economies_of_scale/core/model.py

@@ -82,8 +82,6 @@ class EOSModel(TemoaModel):
 
 def register_early_eos_components(model: TemoaModel) -> None:
     """Build cost_invest_eos components that must be instantiated before loan parameters."""
-    if 'eos' not in model.enabled_extensions:
-        return
     m = cast('EOSModel', model)
 
     m.cost_invest_eos_rtn = Set(