Merge PACs stuff with flows for processes

examples/simple/process_flows.csv

@@ -1,15 +1,15 @@
-process_id,commodity_id,flow,flow_type,flow_cost
-GASDRV,GASPRD,1.0,fixed,
-GASPRC,GASPRD,-1.05,fixed,
-GASPRC,GASNAT,1.0,fixed,
-WNDFRM,ELCTRI,1.0,fixed,
-GASCGT,GASNAT,-1.5,fixed,
-GASCGT,ELCTRI,1.0,fixed,
-RGASBR,GASNAT,-1.15,fixed,
-RGASBR,RSHEAT,1.0,fixed,
-RELCHP,ELCTRI,-0.33,fixed,
-RELCHP,RSHEAT,1.0,fixed,
-GASDRV,CO2EMT,5.113,fixed,
-GASPRC,CO2EMT,2.5565,fixed,
-GASCGT,CO2EMT,76.695,fixed,
-RGASBR,CO2EMT,58.7995,fixed,
+process_id,commodity_id,flow,flow_type,flow_cost,is_pac
+GASDRV,GASPRD,1.0,fixed,,true
+GASPRC,GASPRD,-1.05,fixed,,false
+GASPRC,GASNAT,1.0,fixed,,true
+WNDFRM,ELCTRI,1.0,fixed,,true
+GASCGT,GASNAT,-1.5,fixed,,false
+GASCGT,ELCTRI,1.0,fixed,,true
+RGASBR,GASNAT,-1.15,fixed,,false
+RGASBR,RSHEAT,1.0,fixed,,true
+RELCHP,ELCTRI,-0.33,fixed,,true
+RELCHP,RSHEAT,1.0,fixed,,false
+GASDRV,CO2EMT,5.113,fixed,,false
+GASPRC,CO2EMT,2.5565,fixed,,false
+GASCGT,CO2EMT,76.695,fixed,,false
+RGASBR,CO2EMT,58.7995,fixed,,false

src/input/asset.rs

@@ -114,7 +114,6 @@ mod tests {
             description: "Description".into(),
             availabilities: vec![],
             flows: vec![],
-            pacs: vec![],
             parameter: process_param.clone(),
             regions: RegionSelection::All,
         });
@@ -190,7 +189,6 @@ mod tests {
             description: "Description".into(),
             availabilities: vec![],
             flows: vec![],
-            pacs: vec![],
             parameter: process_param,
             regions: RegionSelection::Some(["GBR".into()].into_iter().collect()),
         });

src/input/process.rs

@@ -14,8 +14,6 @@ pub mod availability;
 use availability::read_process_availabilities;
 pub mod flow;
 use flow::read_process_flows;
-pub mod pac;
-use pac::read_process_pacs;
 pub mod parameter;
 use parameter::read_process_parameters;
 pub mod region;
@@ -70,15 +68,13 @@ pub fn read_processes(
 
     let availabilities = read_process_availabilities(model_dir, &process_ids, time_slice_info)?;
     let flows = read_process_flows(model_dir, &process_ids, commodities)?;
-    let pacs = read_process_pacs(model_dir, &process_ids, commodities, &flows)?;
     let parameters = read_process_parameters(model_dir, &process_ids, year_range)?;
     let regions = read_process_regions(model_dir, &process_ids, region_ids)?;
 
     create_process_map(
         descriptions.into_values(),
         availabilities,
         flows,
-        pacs,
         parameters,
         regions,
     )
@@ -88,7 +84,6 @@ fn create_process_map<I>(
     descriptions: I,
     availabilities: GroupedMap<ProcessAvailability>,
     flows: GroupedMap<ProcessFlow>,
-    pacs: GroupedMap<Rc<Commodity>>,
     parameters: HashMap<Rc<str>, ProcessParameter>,
     regions: HashMap<Rc<str>, RegionSelection>,
 ) -> Result<HashMap<Rc<str>, Rc<Process>>>
@@ -98,7 +93,6 @@ where
     // Need to be mutable as we remove elements as we go along
     let mut availabilities = availabilities;
     let mut flows = flows;
-    let mut pacs = pacs;
     let mut parameters = parameters;
     let mut regions = regions;
 
@@ -111,9 +105,6 @@ where
             let flows = flows
                 .remove(id)
                 .with_context(|| format!("No commodity flows defined for process {id}"))?;
-            let pacs = pacs
-                .remove(id)
-                .with_context(|| format!("No PACs defined for process {id}"))?;
             let parameter = parameters
                 .remove(id)
                 .with_context(|| format!("No parameters defined for process {id}"))?;
@@ -126,7 +117,6 @@ where
                 description: description.description,
                 availabilities,
                 flows,
-                pacs,
                 parameter,
                 regions,
             };
@@ -144,7 +134,6 @@ mod tests {
         descriptions: Vec<ProcessDescription>,
         availabilities: GroupedMap<ProcessAvailability>,
         flows: GroupedMap<ProcessFlow>,
-        pacs: GroupedMap<Rc<Commodity>>,
         parameters: HashMap<Rc<str>, ProcessParameter>,
         regions: HashMap<Rc<str>, RegionSelection>,
     }
@@ -172,11 +161,6 @@ mod tests {
             .map(|id| (id.into(), vec![]))
             .collect();
 
-        let pacs = ["process1", "process2"]
-            .into_iter()
-            .map(|id| (id.into(), vec![]))
-            .collect();
-
         let parameters = ["process1", "process2"]
             .into_iter()
             .map(|id| {
@@ -204,7 +188,6 @@ mod tests {
             descriptions,
             availabilities,
             flows,
-            pacs,
             parameters,
             regions,
         }
@@ -217,7 +200,6 @@ mod tests {
             data.descriptions.into_iter(),
             data.availabilities,
             data.flows,
-            data.pacs,
             data.parameters,
             data.regions,
         )
@@ -238,7 +220,6 @@ mod tests {
                 data.descriptions.into_iter(),
                 data.availabilities,
                 data.flows,
-                data.pacs,
                 data.parameters,
                 data.regions,
             );
@@ -251,11 +232,6 @@ mod tests {
         test_missing!(availabilities);
     }
 
-    #[test]
-    fn test_create_process_map_missing_pacs() {
-        test_missing!(pacs);
-    }
-
     #[test]
     fn test_create_process_map_missing_flows() {
         test_missing!(flows);