Skip to content

Add is_primary_output column to process_flows.csv #657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexdewar merged 1 commit into from
Jun 24, 2025
Merged

Add is_primary_output column to process_flows.csv #657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions examples/simple/process_flows.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
process_id,commodity_id,regions,years,coeff,type,cost
GASDRV,GASPRD,all,all,1.0,fixed,
GASPRC,GASPRD,all,all,-1.05,fixed,
GASPRC,GASNAT,all,all,1.0,fixed,
WNDFRM,ELCTRI,all,all,1.0,fixed,
GASCGT,GASNAT,all,all,-1.5,fixed,
GASCGT,ELCTRI,all,all,1.0,fixed,
RGASBR,GASNAT,all,all,-1.15,fixed,
RGASBR,RSHEAT,all,all,1.0,fixed,
RELCHP,ELCTRI,all,all,-0.33,fixed,
RELCHP,RSHEAT,all,all,1.0,fixed,
GASDRV,CO2EMT,all,all,5.113,fixed,
GASPRC,CO2EMT,all,all,2.5565,fixed,
GASCGT,CO2EMT,all,all,76.695,fixed,
RGASBR,CO2EMT,all,all,58.7995,fixed,
process_id,commodity_id,regions,years,coeff,type,cost,is_primary_output
GASDRV,GASPRD,all,all,1.0,fixed,,true
GASPRC,GASPRD,all,all,-1.05,fixed,,
GASPRC,GASNAT,all,all,1.0,fixed,,true
WNDFRM,ELCTRI,all,all,1.0,fixed,,
GASCGT,GASNAT,all,all,-1.5,fixed,,
GASCGT,ELCTRI,all,all,1.0,fixed,,true
RGASBR,GASNAT,all,all,-1.15,fixed,,
RGASBR,RSHEAT,all,all,1.0,fixed,,true
RELCHP,ELCTRI,all,all,-0.33,fixed,,
RELCHP,RSHEAT,all,all,1.0,fixed,,
GASDRV,CO2EMT,all,all,5.113,fixed,,
GASPRC,CO2EMT,all,all,2.5565,fixed,,
GASCGT,CO2EMT,all,all,76.695,fixed,,
RGASBR,CO2EMT,all,all,58.7995,fixed,,
40 changes: 20 additions & 20 deletions examples/simple_mc/process_flows.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
process_id,commodity_id,regions,years,coeff,type,cost
GASDRV,GASPRD,all,all,1.0,fixed,
GASPRC,GASPRD,all,all,-1.05,fixed,
GASPRC,GASNAT,all,all,1.0,fixed,
BIOPRO,BIOPRD,all,all,1.0,fixed,
BIOPLL,BIOPRD,all,all,-1.05,fixed,
BIOPLL,BIOPEL,all,all,1.0,fixed,
WNDFRM,ELCTRI,all,all,1.0,fixed,
GASCGT,GASNAT,all,all,-1.5,fixed,
GASCGT,ELCTRI,all,all,1.0,fixed,
RGASBR,GASNAT,all,all,-1.15,fixed,
RGASBR,RSHEAT,all,all,1.0,fixed,
RELCHP,ELCTRI,all,all,-0.33,fixed,
RELCHP,RSHEAT,all,all,1.0,fixed,
GASDRV,CO2EMT,all,all,5.113,fixed,
GASPRC,CO2EMT,all,all,2.5565,fixed,
GASCGT,CO2EMT,all,all,76.695,fixed,
RGASBR,CO2EMT,all,all,58.7995,fixed,
RBIOBL,BIOPEL,all,all,-1.2,fixed,
RBIOBL,RSHEAT,all,all,1,fixed,
process_id,commodity_id,regions,years,coeff,type,cost,is_primary_output
GASDRV,GASPRD,all,all,1.0,fixed,,true
GASPRC,GASPRD,all,all,-1.05,fixed,,
GASPRC,GASNAT,all,all,1.0,fixed,,true
BIOPRO,BIOPRD,all,all,1.0,fixed,,
BIOPLL,BIOPRD,all,all,-1.05,fixed,,
BIOPLL,BIOPEL,all,all,1.0,fixed,,
WNDFRM,ELCTRI,all,all,1.0,fixed,,
GASCGT,GASNAT,all,all,-1.5,fixed,,
GASCGT,ELCTRI,all,all,1.0,fixed,,true
RGASBR,GASNAT,all,all,-1.15,fixed,,
RGASBR,RSHEAT,all,all,1.0,fixed,,true
RELCHP,ELCTRI,all,all,-0.33,fixed,,
RELCHP,RSHEAT,all,all,1.0,fixed,,
GASDRV,CO2EMT,all,all,5.113,fixed,,
GASPRC,CO2EMT,all,all,2.5565,fixed,,
GASCGT,CO2EMT,all,all,76.695,fixed,,
RGASBR,CO2EMT,all,all,58.7995,fixed,,
RBIOBL,BIOPEL,all,all,-1.2,fixed,,
RBIOBL,RSHEAT,all,all,1,fixed,,
12 changes: 9 additions & 3 deletions src/input/process.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ mod tests {
coeff: EnergyPerActivity(-10.0),
kind: FlowType::Fixed,
cost: MoneyPerEnergy(1.0),
is_primary_output: false,
}},
)])
}
Expand All @@ -354,6 +355,7 @@ mod tests {
coeff: EnergyPerActivity(10.0),
kind: FlowType::Fixed,
cost: MoneyPerEnergy(1.0),
is_primary_output: false,
}},
)])
}
Expand Down Expand Up @@ -421,6 +423,7 @@ mod tests {
coeff: EnergyPerActivity(10.0),
kind: FlowType::Fixed,
cost: MoneyPerEnergy(1.0),
is_primary_output: false,
}},
)]),
)])
Expand Down Expand Up @@ -504,7 +507,8 @@ mod tests {
commodity: commodity_other.into(),
coeff: EnergyPerActivity(10.0),
kind: FlowType::Fixed,
cost: MoneyPerEnergy(1.0)
cost: MoneyPerEnergy(1.0),
is_primary_output: false,
}},
)])
}
Expand All @@ -517,7 +521,8 @@ mod tests {
commodity: commodity_other.into(),
coeff: EnergyPerActivity(-10.0),
kind: FlowType::Fixed,
cost: MoneyPerEnergy(1.0)
cost: MoneyPerEnergy(1.0),
is_primary_output: false,
}},
)])
}
Expand Down Expand Up @@ -593,7 +598,8 @@ mod tests {
commodity: Rc::clone(&commodity_svd),
coeff: EnergyPerActivity(-10.0),
kind: FlowType::Fixed,
cost: MoneyPerEnergy(1.0)
cost: MoneyPerEnergy(1.0),
is_primary_output: false,
}},
)]),
)));
Expand Down
Loading