From 4f288834b25881bded5747285fda25f8dff79a9f Mon Sep 17 00:00:00 2001 From: lisazeyen Date: Fri, 18 Mar 2022 13:46:09 +0100 Subject: [PATCH] update overrides align with PyPSA version>=0.18 --- data/override_component_attrs/generators.csv | 5 +++-- data/override_component_attrs/links.csv | 16 ++++++++-------- data/override_component_attrs/stores.csv | 4 ++-- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/data/override_component_attrs/generators.csv b/data/override_component_attrs/generators.csv index bd3925fc..4f214396 100644 --- a/data/override_component_attrs/generators.csv +++ b/data/override_component_attrs/generators.csv @@ -1,3 +1,4 @@ attribute,type,unit,default,description,status -build_year,integer,year,n/a,build year,Input (optional) -lifetime,float,years,n/a,lifetime,Input (optional) +carrier,string,n/a,n/a,carrier,Input (optional) +lifetime,float,years,inf,lifetime,Input (optional) +build_year,int,year ,0,build year,Input (optional) diff --git a/data/override_component_attrs/links.csv b/data/override_component_attrs/links.csv index 709a9211..0fc2747a 100644 --- a/data/override_component_attrs/links.csv +++ b/data/override_component_attrs/links.csv @@ -2,12 +2,12 @@ attribute,type,unit,default,description,status bus2,string,n/a,n/a,2nd bus,Input (optional) bus3,string,n/a,n/a,3rd bus,Input (optional) bus4,string,n/a,n/a,4th bus,Input (optional) -efficiency2,static or series,per unit,1.,2nd bus efficiency,Input (optional) -efficiency3,static or series,per unit,1.,3rd bus efficiency,Input (optional) -efficiency4,static or series,per unit,1.,4th bus efficiency,Input (optional) -p2,series,MW,0.,2nd bus output,Output -p3,series,MW,0.,3rd bus output,Output -p4,series,MW,0.,4th bus output,Output -build_year,integer,year,n/a,build year,Input (optional) -lifetime,float,years,n/a,lifetime,Input (optional) +efficiency2,static or series,per unit,1,2nd bus efficiency,Input (optional) +efficiency3,static or series,per unit,1,3rd bus efficiency,Input (optional) +efficiency4,static or series,per unit,1,4th bus efficiency,Input (optional) +p2,series,MW,0,2nd bus output,Output +p3,series,MW,0,3rd bus output,Output +p4,series,MW,0,4th bus output,Output carrier,string,n/a,n/a,carrier,Input (optional) +lifetime,float,years,inf,lifetime,Input (optional) +build_year,int,year ,0,build year,Input (optional) diff --git a/data/override_component_attrs/stores.csv b/data/override_component_attrs/stores.csv index 1228fea9..4f214396 100644 --- a/data/override_component_attrs/stores.csv +++ b/data/override_component_attrs/stores.csv @@ -1,4 +1,4 @@ attribute,type,unit,default,description,status -build_year,integer,year,n/a,build year,Input (optional) -lifetime,float,years,n/a,lifetime,Input (optional) carrier,string,n/a,n/a,carrier,Input (optional) +lifetime,float,years,inf,lifetime,Input (optional) +build_year,int,year ,0,build year,Input (optional)