Merge pull request #999 from EnergySystemsModellingLab/flexible_capacity_assets

tsmbland · web-flow · commit ce38d1ca990c · 2025-11-21T15:00:42.000Z
Dispatch with flexible capacity (and partial implementation for cycles)
diff --git a/examples/circularity/README.txt b/examples/circularity/README.txt
@@ -0,0 +1,4 @@
+This model extends "two_outputs" to showcase circular commodity flows, adding a hydrogen loop that
+turns electricity into hydrogen and back again.
+
+Note: this model is currently experimental and only included for development purposes.
diff --git a/examples/circularity/agent_commodity_portions.csv b/examples/circularity/agent_commodity_portions.csv
@@ -0,0 +1,12 @@
+agent_id,commodity_id,years,commodity_portion
+A0_OAG,OILCRD,all,1
+A0_OAG,GASPRD,all,1
+A0_OAG,GASNAT,all,1
+A0_REF,GASOLI,all,1
+A0_REF,DIESEL,all,1
+A0_BPD,BIOPRD,all,1
+A0_BPL,BIOPEL,all,1
+A0_ELC,ELCTRI,all,1
+A0_ELC,H2YPRD,all,1
+A0_RES,RSHEAT,all,1
+A0_TRA,TPASKM,all,1
diff --git a/examples/circularity/agent_cost_limits.csv b/examples/circularity/agent_cost_limits.csv
@@ -0,0 +1,8 @@
+agent_id,years,capex_limit,annual_cost_limit
+A0_OAG,all,,
+A0_ELC,all,,
+A0_RES,all,,
+A0_TRA,all,,
+A0_BPD,all,,
+A0_BPL,all,,
+A0_REF,all,,
diff --git a/examples/circularity/agent_objectives.csv b/examples/circularity/agent_objectives.csv
@@ -0,0 +1,8 @@
+agent_id,years,objective_type,decision_weight,decision_lexico_order
+A0_OAG,all,lcox,,
+A0_ELC,all,lcox,,
+A0_RES,all,lcox,,
+A0_TRA,all,lcox,,
+A0_BPD,all,lcox,,
+A0_BPL,all,lcox,,
+A0_REF,all,lcox,,
diff --git a/examples/circularity/agent_search_space.csv b/examples/circularity/agent_search_space.csv
@@ -0,0 +1 @@
+agent_id,commodity_id,years,search_space
diff --git a/examples/circularity/agents.csv b/examples/circularity/agents.csv
@@ -0,0 +1,8 @@
+id,description,regions,decision_rule,decision_lexico_tolerance
+A0_OAG,Oil and gas IOC,all,single,
+A0_ELC,Electricity generators,all,single,
+A0_RES,Residential consumer,all,single,
+A0_TRA,Consumer who drives,all,single,
+A0_BPD,Biomass producer,all,single,
+A0_BPL,Biomass pelletiser,all,single,
+A0_REF,Refiners,all,single,
diff --git a/examples/circularity/assets.csv b/examples/circularity/assets.csv
@@ -0,0 +1,16 @@
+process_id,region_id,agent_id,capacity,commission_year
+GASDRV,GBR,A0_OAG,4010.2,2020
+OAGRSV,GBR,A0_OAG,1738.05,2020
+GASPRC,GBR,A0_OAG,3789.64,2020
+OILREF,GBR,A0_OAG,716.5,2020
+OILRF2,GBR,A0_OAG,573.9,2020
+WNDFRM,GBR,A0_ELC,3.964844,2020
+GASCGT,GBR,A0_ELC,2.999,2020
+H2YGEN,GBR,A0_ELC,1.0,2020
+H2YPRO,GBR,A0_ELC,31.54,2020
+TPETCR,GBR,A0_TRA,451.91,2020
+TDIECR,GBR,A0_TRA,176.58,2020
+TELCCR,GBR,A0_TRA,20.99,2020
+THYBCR,GBR,A0_TRA,15.0,2020
+RGASBR,GBR,A0_RES,2900,2020
+RELCHP,GBR,A0_RES,399.98,2020
diff --git a/examples/circularity/commodities.csv b/examples/circularity/commodities.csv
@@ -0,0 +1,13 @@
+id,description,type,time_slice_level
+OILCRD,Crude oil,sed,season
+GASPRD,Gas produced,sed,season
+GASOLI,Gasoline,sed,season
+DIESEL,Diesel,sed,season
+GASNAT,Natural gas,sed,season
+ELCTRI,Electricity,sed,daynight
+H2YPRD,Hydrogen,sed,season
+TPASKM,Passenger kms,svd,daynight
+RSHEAT,Residential heating,svd,daynight
+CO2EMT,CO2 emitted,oth,annual
+BIOPRD,Biomass produced,sed,season
+BIOPEL,Biomass pellets,sed,season
diff --git a/examples/circularity/commodity_levies.csv b/examples/circularity/commodity_levies.csv
@@ -0,0 +1,2 @@
+commodity_id,regions,years,time_slice,balance_type,value
+CO2EMT,all,all,annual,net,0.04
diff --git a/examples/circularity/demand.csv b/examples/circularity/demand.csv
@@ -0,0 +1,7 @@
+commodity_id,region_id,year,demand
+RSHEAT,GBR,2020,927.38
+RSHEAT,GBR,2030,1027.38
+RSHEAT,GBR,2040,1127.38
+TPASKM,GBR,2020,473.2593
+TPASKM,GBR,2030,573.2593
+TPASKM,GBR,2040,673.2593
diff --git a/examples/circularity/demand_slicing.csv b/examples/circularity/demand_slicing.csv
@@ -0,0 +1,33 @@
+commodity_id,region_id,time_slice,fraction
+RSHEAT,GBR,winter.night,0.065498087
+RSHEAT,GBR,winter.day,0.226148097
+RSHEAT,GBR,winter.peak,0.111199678
+RSHEAT,GBR,winter.evening,0.076688397
+RSHEAT,GBR,peak.night,0.045882959
+RSHEAT,GBR,peak.day,0.121987853
+RSHEAT,GBR,peak.peak,0.068135438
+RSHEAT,GBR,peak.evening,0.041334529
+RSHEAT,GBR,summer.night,0.005698366
+RSHEAT,GBR,summer.day,0.009494171
+RSHEAT,GBR,summer.peak,0.003126411
+RSHEAT,GBR,summer.evening,0.002327863
+RSHEAT,GBR,autumn.night,0.037269058
+RSHEAT,GBR,autumn.day,0.098086985
+RSHEAT,GBR,autumn.peak,0.054500569
+RSHEAT,GBR,autumn.evening,0.032621538
+TPASKM,GBR,winter.peak,0.042372881
+TPASKM,GBR,winter.night,0.009887006
+TPASKM,GBR,winter.evening,0.056497175
+TPASKM,GBR,winter.day,0.141242938
+TPASKM,GBR,summer.peak,0.042372881
+TPASKM,GBR,summer.night,0.009887006
+TPASKM,GBR,summer.evening,0.056497175
+TPASKM,GBR,summer.day,0.141242938
+TPASKM,GBR,peak.peak,0.042372881
+TPASKM,GBR,peak.night,0.009887006
+TPASKM,GBR,peak.evening,0.056497175
+TPASKM,GBR,peak.day,0.141242938
+TPASKM,GBR,autumn.peak,0.042372881
+TPASKM,GBR,autumn.night,0.009887006
+TPASKM,GBR,autumn.evening,0.056497175
+TPASKM,GBR,autumn.day,0.141242938
diff --git a/examples/circularity/model.toml b/examples/circularity/model.toml
@@ -0,0 +1,2 @@
+milestone_years = [2020, 2030, 2040]
+please_give_me_broken_results = true
diff --git a/examples/circularity/process_availabilities.csv b/examples/circularity/process_availabilities.csv
@@ -0,0 +1,34 @@
+process_id,regions,commission_years,time_slice,limit_type,value
+GASDRV,all,all,annual,up,0.9
+OAGRSV,all,all,annual,up,0.9
+GASPRC,all,all,annual,up,0.9
+OILREF,all,all,annual,up,0.9
+OILRF2,all,all,annual,up,0.9
+GASCGT,all,all,annual,up,0.9
+TPETCR,all,all,annual,up,1
+TDIECR,all,all,annual,up,1
+TELCCR,all,all,annual,up,1
+THYBCR,all,all,annual,up,1
+RGASBR,all,all,annual,up,1
+RELCHP,all,all,annual,up,1
+WNDFRM,all,all,winter.night,up,0.486418015
+WNDFRM,all,all,winter.day,up,0.543166784
+WNDFRM,all,all,winter.peak,up,0.504433498
+WNDFRM,all,all,winter.evening,up,0.493173821
+WNDFRM,all,all,peak.night,up,0.312697296
+WNDFRM,all,all,peak.day,up,0.489120338
+WNDFRM,all,all,peak.peak,up,0.454890922
+WNDFRM,all,all,peak.evening,up,0.331034483
+WNDFRM,all,all,summer.night,up,0.17951141
+WNDFRM,all,all,summer.day,up,0.349950739
+WNDFRM,all,all,summer.peak,up,0.342294159
+WNDFRM,all,all,summer.evening,up,0.202674173
+WNDFRM,all,all,autumn.night,up,0.3513019
+WNDFRM,all,all,autumn.day,up,0.460745954
+WNDFRM,all,all,autumn.peak,up,0.396340605
+WNDFRM,all,all,autumn.evening,up,0.364813512
+H2YGEN,all,all,annual,up,1
+H2YPRO,all,all,annual,up,1
+BIOPRO,all,all,annual,up,1.0
+BIOPLL,all,all,annual,up,0.95
+RBIOBL,all,all,annual,up,1.0
diff --git a/examples/circularity/process_flows.csv b/examples/circularity/process_flows.csv
@@ -0,0 +1,45 @@
+process_id,commodity_id,regions,commission_years,coeff,type,cost
+GASDRV,GASPRD,all,all,1,fixed,
+OAGRSV,OILCRD,all,all,1,fixed,
+OAGRSV,GASPRD,all,all,0.1,fixed,
+GASPRC,GASPRD,all,all,-1.05,fixed,
+GASPRC,GASNAT,all,all,1,fixed,
+OILREF,OILCRD,all,all,-1.3,fixed,
+OILREF,GASOLI,all,all,0.5,fixed,
+OILREF,DIESEL,all,all,0.5,fixed,
+OILRF2,OILCRD,all,all,-1.31,fixed,
+OILRF2,GASOLI,all,all,1,fixed,
+WNDFRM,ELCTRI,all,all,1,fixed,
+GASCGT,GASNAT,all,all,-1.5,fixed,
+GASCGT,ELCTRI,all,all,1,fixed,
+H2YGEN,H2YPRD,all,all,-1.5,fixed,
+H2YGEN,ELCTRI,all,all,1,fixed,
+H2YPRO,ELCTRI,all,all,-1.333,fixed,
+H2YPRO,H2YPRD,all,all,1,fixed,
+TPETCR,GASOLI,all,all,-2.702702703,fixed,
+TPETCR,TPASKM,all,all,1,fixed,
+TDIECR,DIESEL,all,all,-2.222222222,fixed,
+TDIECR,TPASKM,all,all,1,fixed,
+TELCCR,ELCTRI,all,all,-1.754385965,fixed,
+TELCCR,TPASKM,all,all,1,fixed,
+THYBCR,ELCTRI,all,all,-0.854385965,fixed,
+THYBCR,GASOLI,all,all,-1.0,fixed,
+THYBCR,TPASKM,all,all,1,fixed,
+RGASBR,GASNAT,all,all,-1.15,fixed,
+RGASBR,RSHEAT,all,all,1,fixed,
+RELCHP,ELCTRI,all,all,-0.33,fixed,
+RELCHP,RSHEAT,all,all,1,fixed,
+GASDRV,CO2EMT,all,all,5.113,fixed,
+OAGRSV,CO2EMT,all,all,7.333,fixed,
+GASPRC,CO2EMT,all,all,2.5565,fixed,
+OILREF,CO2EMT,all,all,21.999,fixed,
+OILRF2,CO2EMT,all,all,22,fixed,
+GASCGT,CO2EMT,all,all,76.695,fixed,
+TPETCR,CO2EMT,all,all,179.7297297,fixed,
+TDIECR,CO2EMT,all,all,154.0222222,fixed,
+RGASBR,CO2EMT,all,all,58.7995,fixed,
+BIOPRO,BIOPRD,all,all,1.0,fixed,
+BIOPLL,BIOPRD,all,all,-1.05,fixed,
+BIOPLL,BIOPEL,all,all,1.0,fixed,
+RBIOBL,BIOPEL,all,all,-1.2,fixed,
+RBIOBL,RSHEAT,all,all,1,fixed,
diff --git a/examples/circularity/process_parameters.csv b/examples/circularity/process_parameters.csv
@@ -0,0 +1,19 @@
+process_id,regions,commission_years,capital_cost,fixed_operating_cost,variable_operating_cost,lifetime,discount_rate
+GASDRV,GBR,all,10,0.3,2,25,0.1
+OAGRSV,GBR,all,15,0.45,3,25,0.1
+GASPRC,GBR,all,7,0.21,0.5,25,0.1
+OILREF,GBR,all,9,0.27,0.66,25,0.1
+OILRF2,GBR,all,9.1,0.3,0.68,25,0.1
+WNDFRM,GBR,all,1000,30,0.4,25,0.1
+GASCGT,GBR,all,700,21,0.55,30,0.1
+H2YGEN,GBR,all,1200,1,0.6,30,0.1
+H2YPRO,GBR,all,15,0.9,0.6,20,0.1
+TPETCR,GBR,all,2,0.06,0.2,10,0.1
+TDIECR,GBR,all,2.1,0.063,0.18,10,0.1
+TELCCR,GBR,all,6,0.18,0.15,10,0.1
+THYBCR,GBR,all,5,0.17,0.17,10,0.1
+RGASBR,GBR,all,55.56,1.6668,0.16,15,0.1
+RELCHP,GBR,all,138.9,4.167,0.17,15,0.1
+BIOPRO,all,all,1,0.2,0.25,20,0.09
+BIOPLL,all,all,2,0.22,0.26,20,0.1
+RBIOBL,all,all,60,1.05,0.2,20,0.1
diff --git a/examples/circularity/processes.csv b/examples/circularity/processes.csv
@@ -0,0 +1,19 @@
+id,description,regions,primary_output,start_year,end_year,capacity_to_activity
+GASDRV,Dry gas extraction,GBR,GASPRD,2020,,1.0
+OAGRSV,Oil and associated gas extraction,GBR,OILCRD,2020,,1.0
+GASPRC,Gas processing,GBR,GASNAT,2020,,1.0
+OILREF,Oil refinery,GBR,DIESEL,2020,,1.0
+OILRF2,O2G refinery,GBR,GASOLI,2020,,1.0
+WNDFRM,Wind farm,GBR,ELCTRI,2020,,31.54
+GASCGT,Gas combined cycle turbine,GBR,ELCTRI,2020,,31.54
+H2YGEN,H2 turbine,GBR,ELCTRI,2020,,31.54
+H2YPRO,H2 electrolyer,GBR,H2YPRD,2020,,1.0
+TPETCR,Petrol car,GBR,TPASKM,2020,,1.0
+TDIECR,Diesel car,GBR,TPASKM,2020,,1.0
+TELCCR,Electric car,GBR,TPASKM,2020,,1.0
+THYBCR,Plug-in hybrid car,GBR,TPASKM,2020,,1.0
+RGASBR,Gas boiler,GBR,RSHEAT,2020,,1.0
+RELCHP,Heat pump,GBR,RSHEAT,2020,,1.0
+BIOPRO,Biomass production,all,BIOPRD,2020,,1.0
+BIOPLL,Biomass pelletiser,all,BIOPEL,2020,,1.0
+RBIOBL,Biomass boiler,all,RSHEAT,2020,,1.0
diff --git a/examples/circularity/regions.csv b/examples/circularity/regions.csv
@@ -0,0 +1,2 @@
+id,description
+GBR,United Kingdom
diff --git a/examples/circularity/time_slices.csv b/examples/circularity/time_slices.csv
@@ -0,0 +1,17 @@
+season,time_of_day,fraction
+winter,night,0.072916667
+winter,day,0.104166667
+winter,peak,0.03125
+winter,evening,0.041666667
+peak,night,0.072916667
+peak,day,0.104166667
+peak,peak,0.03125
+peak,evening,0.041666667
+summer,night,0.072916667
+summer,day,0.104166667
+summer,peak,0.03125
+summer,evening,0.041666667
+autumn,night,0.072916667
+autumn,day,0.104166667
+autumn,peak,0.03125
+autumn,evening,0.041666667
diff --git a/schemas/input/model.yaml b/schemas/input/model.yaml
@@ -47,6 +47,10 @@ properties:
     type: number
     description: The relative tolerance for price convergence in the ironing out loop
     default: 1e-6
+  capacity_margin:
+    type: number
+    description: Slack proportion for assets selected during cycle balancing to absorb small demand shifts
+    default: 0.2
   please_give_me_broken_results:
     type: boolean
     description: |
diff --git a/src/asset.rs b/src/asset.rs
@@ -451,11 +451,14 @@ impl Asset {
         self.capacity
     }
 
-    /// Set the capacity for this asset (only for Candidate assets)
+    /// Set the capacity for this asset (only for Candidate or Selected assets)
     pub fn set_capacity(&mut self, capacity: Capacity) {
         assert!(
-            self.state == AssetState::Candidate,
-            "set_capacity can only be called on Candidate assets"
+            matches!(
+                self.state,
+                AssetState::Candidate | AssetState::Selected { .. }
+            ),
+            "set_capacity can only be called on Candidate or Selected assets"
         );
         assert!(capacity >= Capacity(0.0), "Capacity must be >= 0");
         self.capacity = capacity;
diff --git a/src/graph/investment.rs b/src/graph/investment.rs
@@ -347,8 +347,7 @@ fn order_sccs(
             }
         }
 
-        let mut model = problem.optimise(Sense::Minimise);
-        model.make_quiet();
+        let model = problem.optimise(Sense::Minimise);
         let solved = match model.try_solve() {
             Ok(solved) => solved,
             Err(status) => {
diff --git a/src/log.rs b/src/log.rs
@@ -100,6 +100,7 @@ pub fn init(log_level_from_settings: &str, log_file_path: Option<&Path>) -> Resu
 
     // Configure the logger
     let mut dispatch = Dispatch::new()
+        .level_for("highs", LevelFilter::Off) // turn off logging for highs
         .chain(
             // Write non-error messages to stdout
             Dispatch::new()
diff --git a/src/model/parameters.rs b/src/model/parameters.rs
@@ -48,6 +48,7 @@ define_unit_param_default!(default_capacity_limit_factor, Dimensionless, 0.1);
 define_unit_param_default!(default_value_of_lost_load, MoneyPerFlow, 1e9);
 define_unit_param_default!(default_price_tolerance, Dimensionless, 1e-6);
 define_param_default!(default_max_ironing_out_iterations, u32, 10);
+define_param_default!(default_capacity_margin, f64, 0.2);
 
 /// Model parameters as defined in the `model.toml` file.
 ///
@@ -85,6 +86,13 @@ pub struct ModelParameters {
     /// The relative tolerance for price convergence in the ironing out loop
     #[serde(default = "default_price_tolerance")]
     pub price_tolerance: Dimensionless,
+    /// Slack applied during cycle balancing, allowing newly selected assets to flex their capacity
+    /// by this proportion.
+    ///
+    /// Existing assets remain fixed; this gives newly selected assets the wiggle-room to absorb
+    /// small demand changes before we would otherwise need to break for re-investment.
+    #[serde(default = "default_capacity_margin")]
+    pub capacity_margin: f64,
 }
 
 /// The strategy used for calculating commodity prices
@@ -138,6 +146,16 @@ fn check_price_tolerance(value: Dimensionless) -> Result<()> {
     Ok(())
 }
 
+/// Check that the `capacity_margin` parameter is valid
+fn check_capacity_margin(value: f64) -> Result<()> {
+    ensure!(
+        value.is_finite() && value >= 0.0,
+        "capacity_margin must be a finite number greater than or equal to zero"
+    );
+
+    Ok(())
+}
+
 impl ModelParameters {
     /// Read a model file from the specified directory.
     ///
@@ -208,6 +226,9 @@ impl ModelParameters {
         // price_tolerance
         check_price_tolerance(self.price_tolerance)?;
 
+        // capacity_margin
+        check_capacity_margin(self.capacity_margin)?;
+
         Ok(())
     }
 }
@@ -334,4 +355,23 @@ mod tests {
             "price_tolerance must be a finite number greater than or equal to zero",
         );
     }
+
+    #[rstest]
+    #[case(0.0, true)] // Valid minimum value
+    #[case(0.2, true)] // Valid default value
+    #[case(10.0, true)] // Valid large value
+    #[case(-1e-6, false)] // Invalid: negative margin
+    #[case(f64::INFINITY, false)] // Invalid: infinite value
+    #[case(f64::NEG_INFINITY, false)] // Invalid: negative infinite value
+    #[case(f64::NAN, false)] // Invalid: NaN value
+    fn test_check_capacity_margin(#[case] value: f64, #[case] expected_valid: bool) {
+        let result = check_capacity_margin(value);
+
+        assert_validation_result(
+            result,
+            expected_valid,
+            value,
+            "capacity_margin must be a finite number greater than or equal to zero",
+        );
+    }
 }
diff --git a/src/simulation/investment.rs b/src/simulation/investment.rs
diff --git a/src/simulation/optimisation.rs b/src/simulation/optimisation.rs
diff --git a/src/simulation/optimisation/constraints.rs b/src/simulation/optimisation/constraints.rs

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+agent_id,commodity_id,years,search_space`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+commodity_id,regions,years,time_slice,balance_type,value`
	`2`	`+CO2EMT,all,all,annual,net,0.04`