From 11238c24c94cb35d750b33f64bdbaf0a5043f386 Mon Sep 17 00:00:00 2001 From: Davide Fioriti Date: Fri, 27 Feb 2026 21:58:08 +0100 Subject: [PATCH 1/2] Add NodeName, LineName, and name --- pysmspp/data/blocks/BatteryUnitBlock.csv | 1 + pysmspp/data/blocks/HydroUnitBlock.csv | 1 + pysmspp/data/blocks/IntermittentUnitBlock.csv | 1 + pysmspp/data/blocks/SlackUnitBlock.csv | 1 + pysmspp/data/blocks/ThermalUnitBlock.csv | 1 + pysmspp/data/blocks/UCBlock.csv | 2 ++ 6 files changed, 7 insertions(+) diff --git a/pysmspp/data/blocks/BatteryUnitBlock.csv b/pysmspp/data/blocks/BatteryUnitBlock.csv index 8a8f1e9..d0587c1 100644 --- a/pysmspp/data/blocks/BatteryUnitBlock.csv +++ b/pysmspp/data/blocks/BatteryUnitBlock.csv @@ -1,6 +1,7 @@ block_name,attribute,smspp_object,netcdf_component,netcdf_base_type,dimension,unit,default,status,description BatteryUnitBlock,block_type,Attribute,Attribute,str,-,-,,required,Type of the block BatteryUnitBlock,id,Attribute,Attribute,str,-,-,,optional,Id of the block +BatteryUnitBlock,name,Attribute,Attribute,str,-,-,,optional,Name of the block BatteryUnitBlock,MinPower,Variable,Variable,double,-|TimeHorizon,MW,,optional,Minimum power output of the unit BatteryUnitBlock,MaxPower,Variable,Variable,double,-|TimeHorizon,MW,,optional,Maximum power output of the unit BatteryUnitBlock,InitialPower,Variable,Variable,double,-,MW,,optional,Initial power output of the unit diff --git a/pysmspp/data/blocks/HydroUnitBlock.csv b/pysmspp/data/blocks/HydroUnitBlock.csv index 319d3d3..46f26bc 100644 --- a/pysmspp/data/blocks/HydroUnitBlock.csv +++ b/pysmspp/data/blocks/HydroUnitBlock.csv @@ -1,6 +1,7 @@ block_name,attribute,smspp_object,netcdf_component,netcdf_base_type,dimension,unit,default,status,description HydroUnitBlock,block_type,Attribute,Attribute,str,-,-,,required,Type of the block HydroUnitBlock,id,Attribute,Attribute,str,-,-,,optional,Id of the block +HydroUnitBlock,name,Attribute,Attribute,str,-,-,,optional,Name of the block HydroUnitBlock,NumberReservoirs,Dimension,Dimension,int,-,-,,required,Number of reservoirs HydroUnitBlock,NumberArcs,Dimension,Dimension,int,-,-,,required,Number of arcs HydroUnitBlock,TotalNumberPieces,Dimension,Dimension,int,-,-,,required,Total number of pieces diff --git a/pysmspp/data/blocks/IntermittentUnitBlock.csv b/pysmspp/data/blocks/IntermittentUnitBlock.csv index 2e91aba..fb665db 100644 --- a/pysmspp/data/blocks/IntermittentUnitBlock.csv +++ b/pysmspp/data/blocks/IntermittentUnitBlock.csv @@ -1,6 +1,7 @@ block_name,attribute,smspp_object,netcdf_component,netcdf_base_type,dimension,unit,default,status,description IntermittentUnitBlock,block_type,Attribute,Attribute,str,-,-,,required,Type of the block IntermittentUnitBlock,id,Attribute,Attribute,str,-,-,,optional,Id of the block +IntermittentUnitBlock,name,Attribute,Attribute,str,-,-,,optional,Name of the block IntermittentUnitBlock,MinPower,Variable,Variable,double,-|TimeHorizon,MW,,optional,Minimum power output of the unit IntermittentUnitBlock,MaxPower,Variable,Variable,double,-|TimeHorizon,MW,,optional,Maximum power output of the unit IntermittentUnitBlock,ActivePowerCost,Variable,Variable,double,-|TimeHorizon,-,,required,Active power cost diff --git a/pysmspp/data/blocks/SlackUnitBlock.csv b/pysmspp/data/blocks/SlackUnitBlock.csv index 599f270..c270006 100644 --- a/pysmspp/data/blocks/SlackUnitBlock.csv +++ b/pysmspp/data/blocks/SlackUnitBlock.csv @@ -1,6 +1,7 @@ block_name,attribute,smspp_object,netcdf_component,netcdf_base_type,dimension,unit,default,status,description SlackUnitBlock,block_type,Attribute,Attribute,str,-,-,,required,Type of the block SlackUnitBlock,id,Attribute,Attribute,str,-,-,,optional,Id of the block +SlackUnitBlock,name,Attribute,Attribute,str,-,-,,optional,Name of the block SlackUnitBlock,MaxPower,Variable,Variable,double,-|TimeHorizon,MW,,optional,Maximum power output of the unit SlackUnitBlock,MaxPrimaryPower,Variable,Variable,double,-|TimeHorizon,MW,,optional,Maximum primary power output of the unit SlackUnitBlock,MaxSecondaryPower,Variable,Variable,double,-|TimeHorizon,MW,,optional,Maximum secondary power output of the unit diff --git a/pysmspp/data/blocks/ThermalUnitBlock.csv b/pysmspp/data/blocks/ThermalUnitBlock.csv index 31be722..2cd63a7 100644 --- a/pysmspp/data/blocks/ThermalUnitBlock.csv +++ b/pysmspp/data/blocks/ThermalUnitBlock.csv @@ -1,6 +1,7 @@ block_name,attribute,smspp_object,netcdf_component,netcdf_base_type,dimension,unit,default,status,description ThermalUnitBlock,block_type,Attribute,Attribute,str,-,-,,required,Type of the block ThermalUnitBlock,id,Attribute,Attribute,str,-,-,,optional,Id of the block +ThermalUnitBlock,name,Attribute,Attribute,str,-,-,,optional,Name of the block ThermalUnitBlock,MinPower,Variable,Variable,double,-|TimeHorizon,MW,,optional,Minimum power output of the unit ThermalUnitBlock,MaxPower,Variable,Variable,double,-|TimeHorizon,MW,,optional,Maximum power output of the unit ThermalUnitBlock,StartUpCost,Variable,Variable,double,-|TimeHorizon,USD,,optional,Start-up cost of the unit diff --git a/pysmspp/data/blocks/UCBlock.csv b/pysmspp/data/blocks/UCBlock.csv index 0eaafe4..33dfcb4 100644 --- a/pysmspp/data/blocks/UCBlock.csv +++ b/pysmspp/data/blocks/UCBlock.csv @@ -11,6 +11,8 @@ UCBlock,NumberNetworks,Dimension,Dimension,int,-,-,,optional,"Number of networks UCBlock,NumberArcs,Dimension,Dimension,int,-,-,,optional,Number of arcs UCBlock,NumberReservoirs,Dimension,Dimension,int,-,-,,optional,Number of reservoirs UCBlock,TotalNumberPieces,Dimension,Dimension,int,-,-,,optional,Number of pieces of the power flow function +UCBlock,NodeName,Variable,Variable,str,NumberNodes,str,,optional,Name of the nodes +UCBlock,LineName,Variable,Variable,str,NumberLines,str,,optional,Name of the lines UCBlock,GeneratorNode,Variable,Variable,int,-|NumberElectricalGenerators,-,,optional,List of buses of connection by unit UCBlock,StartLine,Variable,Variable,int,-|NumberLines|NumberBranches,-,,optional,Start buses of lines UCBlock,EndLine,Variable,Variable,int,-|NumberLines|NumberBranches,-,,optional,End buses of lines From 62b26cfac81958d735dd17c701aa9d864a65cac8 Mon Sep 17 00:00:00 2001 From: Davide Fioriti Date: Fri, 27 Feb 2026 22:01:09 +0100 Subject: [PATCH 2/2] add release_note --- docs/release_notes.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/release_notes.md b/docs/release_notes.md index ef661cf..d5dff1f 100644 --- a/docs/release_notes.md +++ b/docs/release_notes.md @@ -21,6 +21,8 @@ ### Minor Changes and Bug Fixes +* [Add NodeName and LineName to UCBlock, name to UnitBlocks PR #81](https://github.com/SPSUnipi/pySMSpp/pull/81) +* [Add show_all to print_tree commit a8127da](https://github.com/SPSUnipi/pySMSpp/commit/a8127da0e056c0a58c872b0f66b2fc4116747530) * [Improve print_tree: add counts and drop brackets when block_type is missing PR #45](https://github.com/SPSUnipi/pySMSpp/pull/45) * [Improve docstrings and package-level documentation PR #47](https://github.com/SPSUnipi/pySMSpp/pull/47) * [Clean smspp tools options PR #48](https://github.com/SPSUnipi/pySMSpp/pull/48)