From 56e9e4081a821711d414ceacf9f3760a72386c22 Mon Sep 17 00:00:00 2001 From: ClaraBuettner Date: Mon, 20 Nov 2017 10:51:18 +0100 Subject: [PATCH 01/12] Add extension tables --- egoio/db_tables/model_draft.py | 218 +++++++++++++++++++++++++++++++++ 1 file changed, 218 insertions(+) diff --git a/egoio/db_tables/model_draft.py b/egoio/db_tables/model_draft.py index b882acf..2852755 100644 --- a/egoio/db_tables/model_draft.py +++ b/egoio/db_tables/model_draft.py @@ -11,6 +11,8 @@ metadata = Base.metadata + + class BkgVg250201501011Sta(Base): __tablename__ = 'bkg_vg250_20150101_1_sta' __table_args__ = {'schema': 'model_draft'} @@ -2276,7 +2278,223 @@ class EgoGridPfHvLine(Base): terrain_factor = Column(Float(53), server_default=text("1")) geom = Column(Geometry('MULTILINESTRING', 4326)) topo = Column(Geometry('LINESTRING', 4326)) + +class EgoGridPfHvLink(Base): + __tablename__ = 'ego_grid_pf_hv_link' + __table_args__ = {'schema': 'model_draft'} + scn_name = Column(String, primary_key=True, nullable=False, server_default=text("'Status Quo'::character varying")) + link_id = Column(BigInteger, primary_key=True, nullable=False) + bus0 = Column(BigInteger) + bus1 = Column(BigInteger) + efficiency = Column(Float(53)) + marginal_cost = Column(Float(53), server_default=text("0")) + p_nom = Column(Numeric, server_default=text("0")) + p_nom_extendable = Column(Boolean, server_default=text("false")) + p_nom_min = Column(Float(53), server_default=text("0")) + p_nom_max = Column(Float(53)) + capital_cost = Column(Float(53)) + length = Column(Float(53)) + terrain_factor = Column(Float(53), server_default=text("1")) + geom = Column(Geometry('MULTILINESTRING', 4326)) + topo = Column(Geometry('LINESTRING', 4326)) + + +class EgoGridPfHvExtensionBus(Base): + __tablename__ = 'ego_grid_pf_hv_extension_bus' + __table_args__ = {'schema': 'model_draft'} + + scn_name = Column(String, primary_key=True, nullable=False, server_default=text("'NEP'::character varying")) + bus_id = Column(BigInteger, primary_key=True, nullable=False) + v_nom = Column(Float(53)) + current_type = Column(Text, server_default=text("'AC'::text")) + v_mag_pu_min = Column(Float(53), server_default=text("0")) + v_mag_pu_max = Column(Float(53)) + geom = Column(Geometry('POINT', 4326)) + + +class EgoGridPfHvExtensionGenerator(Base): + __tablename__ = 'ego_grid_pf_hv_extension_generator' + __table_args__ = {'schema': 'model_draft'} + + scn_name = Column(String, primary_key=True, nullable=False, server_default=text("'Status Quo'::character varying")) + generator_id = Column(BigInteger, primary_key=True, nullable=False) + bus = Column(BigInteger) + dispatch = Column(Text, server_default=text("'flexible'::text")) + control = Column(Text, server_default=text("'PQ'::text")) + p_nom = Column(Float(53), server_default=text("0")) + p_nom_extendable = Column(Boolean, server_default=text("false")) + p_nom_min = Column(Float(53), server_default=text("0")) + p_nom_max = Column(Float(53)) + p_min_pu_fixed = Column(Float(53), server_default=text("0")) + p_max_pu_fixed = Column(Float(53), server_default=text("1")) + sign = Column(Float(53), server_default=text("1")) + source = Column(ForeignKey('model_draft.ego_grid_pf_hv_source.source_id'), index=True) + marginal_cost = Column(Float(53)) + capital_cost = Column(Float(53)) + efficiency = Column(Float(53)) + + ego_grid_pf_hv_source = relationship('EgoGridPfHvSource') + +class EgoGridPfHvExtensionGeneratorPqSet(Base): + __tablename__ = 'ego_grid_pf_hv_extension_generator_pq_set' + __table_args__ = {'schema': 'model_draft'} + + scn_name = Column(String, primary_key=True, nullable=False, server_default=text("'NEP'::character varying")) + generator_id = Column(BigInteger, primary_key=True, nullable=False) + temp_id = Column(ForeignKey('model_draft.ego_grid_pf_hv_temp_resolution.temp_id'), primary_key=True, nullable=False) + p_set = Column(ARRAY(DOUBLE_PRECISION(precision=53))) + q_set = Column(ARRAY(DOUBLE_PRECISION(precision=53))) + p_min_pu = Column(ARRAY(DOUBLE_PRECISION(precision=53))) + p_max_pu = Column(ARRAY(DOUBLE_PRECISION(precision=53))) + + temp = relationship('EgoGridPfHvTempResolution') + +class EgoGridPfHvExtensionLine(Base): + __tablename__ = 'ego_grid_pf_hv_extension_line' + __table_args__ = {'schema': 'model_draft'} + + scn_name = Column(String, primary_key=True, nullable=False, server_default=text("'NEP'::character varying")) + line_id = Column(BigInteger, primary_key=True, nullable=False) + bus0 = Column(BigInteger) + bus1 = Column(BigInteger) + x = Column(Numeric, server_default=text("0")) + r = Column(Numeric, server_default=text("0")) + g = Column(Numeric, server_default=text("0")) + b = Column(Numeric, server_default=text("0")) + s_nom = Column(Numeric, server_default=text("0")) + s_nom_extendable = Column(Boolean, server_default=text("false")) + s_nom_min = Column(Float(53), server_default=text("0")) + s_nom_max = Column(Float(53)) + capital_cost = Column(Float(53)) + length = Column(Float(53)) + cables = Column(Integer) + frequency = Column(Numeric) + terrain_factor = Column(Float(53), server_default=text("1")) + geom = Column(Geometry('MULTILINESTRING', 4326)) + topo = Column(Geometry('LINESTRING', 4326)) + + +class EgoGridPfHvExtensionLink(Base): + __tablename__ = 'ego_grid_pf_hv_extension_link' + __table_args__ = {'schema': 'model_draft'} + + scn_name = Column(String, primary_key=True, nullable=False, server_default=text("'NEP'::character varying")) + link_id = Column(BigInteger, primary_key=True, nullable=False) + bus0 = Column(BigInteger) + bus1 = Column(BigInteger) + efficiency = Column(Float(53)) + p_nom = Column(Numeric, server_default=text("0")) + p_nom_extendable = Column(Boolean, server_default=text("false")) + p_nom_min = Column(Float(53), server_default=text("0")) + p_nom_max = Column(Float(53)) + capital_cost = Column(Float(53)) + length = Column(Float(53)) + terrain_factor = Column(Float(53), server_default=text("1")) + geom = Column(Geometry('MULTILINESTRING', 4326)) + topo = Column(Geometry('LINESTRING', 4326)) + + +class EgoGridPfHvExtensionLoad(Base): + __tablename__ = 'ego_grid_pf_hv_extension_load' + __table_args__ = {'schema': 'model_draft'} + + scn_name = Column(String, primary_key=True, nullable=False, server_default=text("'NEP'::character varying")) + load_id = Column(BigInteger, primary_key=True, nullable=False) + bus = Column(BigInteger) + sign = Column(Float(53), server_default=text("'-1'::integer")) + e_annual = Column(Float(53)) + +class EgoGridPfHvExtensionLoadPqSet(Base): + __tablename__ = 'ego_grid_pf_hv_extension_load_pq_set' + __table_args__ = {'schema': 'model_draft'} + + scn_name = Column(String, primary_key=True, nullable=False, server_default=text("'NEP'::character varying")) + load_id = Column(BigInteger, primary_key=True, nullable=False) + temp_id = Column(ForeignKey('model_draft.ego_grid_pf_hv_temp_resolution.temp_id'), primary_key=True, nullable=False) + p_set = Column(ARRAY(DOUBLE_PRECISION(precision=53))) + q_set = Column(ARRAY(DOUBLE_PRECISION(precision=53))) + + temp = relationship('EgoGridPfHvTempResolution') + +class EgoGridPfHvExtensionSource(Base): + __tablename__ = 'ego_grid_pf_hv_extension_source' + __table_args__ = {'schema': 'model_draft'} + + source_id = Column(BigInteger, primary_key=True) + name = Column(Text) + co2_emissions = Column(Float(53)) + commentary = Column(Text) + + +class EgoGridPfHvExtensionStorage(Base): + __tablename__ = 'ego_grid_pf_hv_extension_storage' + __table_args__ = {'schema': 'model_draft'} + + scn_name = Column(String, primary_key=True, nullable=False, server_default=text("'NEP'::character varying")) + storage_id = Column(BigInteger, primary_key=True, nullable=False) + bus = Column(BigInteger) + dispatch = Column(Text, server_default=text("'flexible'::text")) + control = Column(Text, server_default=text("'PQ'::text")) + p_nom = Column(Float(53), server_default=text("0")) + p_nom_extendable = Column(Boolean, server_default=text("false")) + p_nom_min = Column(Float(53), server_default=text("0")) + p_nom_max = Column(Float(53)) + p_min_pu_fixed = Column(Float(53), server_default=text("0")) + p_max_pu_fixed = Column(Float(53), server_default=text("1")) + sign = Column(Float(53), server_default=text("1")) + source = Column(ForeignKey('model_draft.ego_grid_pf_hv_source.source_id'), index=True) + marginal_cost = Column(Float(53)) + capital_cost = Column(Float(53)) + efficiency = Column(Float(53)) + soc_initial = Column(Float(53)) + soc_cyclic = Column(Boolean, server_default=text("false")) + max_hours = Column(Float(53)) + efficiency_store = Column(Float(53)) + efficiency_dispatch = Column(Float(53)) + standing_loss = Column(Float(53)) + + ego_grid_pf_hv_source = relationship('EgoGridPfHvSource') + +class EgoGridPfHvExtensionStoragePqSet(Base): + __tablename__ = 'ego_grid_pf_hv_extension_storage_pq_set' + __table_args__ = {'schema': 'model_draft'} + + scn_name = Column(String, primary_key=True, nullable=False, server_default=text("'NEP'::character varying")) + storage_id = Column(BigInteger, primary_key=True, nullable=False) + temp_id = Column(ForeignKey('model_draft.ego_grid_pf_hv_temp_resolution.temp_id'), primary_key=True, nullable=False) + p_set = Column(ARRAY(DOUBLE_PRECISION(precision=53))) + q_set = Column(ARRAY(DOUBLE_PRECISION(precision=53))) + p_min_pu = Column(ARRAY(DOUBLE_PRECISION(precision=53))) + p_max_pu = Column(ARRAY(DOUBLE_PRECISION(precision=53))) + soc_set = Column(ARRAY(DOUBLE_PRECISION(precision=53))) + inflow = Column(ARRAY(DOUBLE_PRECISION(precision=53))) + + temp = relationship('EgoGridPfHvTempResolution') + + +class EgoGridPfHvExtensionTrafo(Base): + __tablename__ = 'ego_grid_pf_hv_extension_trafo' + __table_args__ = {'schema': 'model_draft'} + + scn_name = Column(String, primary_key=True, nullable=False, server_default=text("'NEP'::character varying")) + trafo_id = Column(BigInteger, primary_key=True, nullable=False) + bus0 = Column(BigInteger, index=True) + bus1 = Column(BigInteger, index=True) + x = Column(Numeric, server_default=text("0")) + r = Column(Numeric, server_default=text("0")) + g = Column(Numeric, server_default=text("0")) + b = Column(Numeric, server_default=text("0")) + s_nom = Column(Float(53), server_default=text("0")) + s_nom_extendable = Column(Boolean, server_default=text("false")) + s_nom_min = Column(Float(53), server_default=text("0")) + s_nom_max = Column(Float(53)) + tap_ratio = Column(Float(53)) + phase_shift = Column(Float(53)) + capital_cost = Column(Float(53), server_default=text("0")) + geom = Column(Geometry('MULTILINESTRING', 4326)) + topo = Column(Geometry('LINESTRING', 4326)) + class EgoGridPfHvLoad(Base): __tablename__ = 'ego_grid_pf_hv_load' From 967d8cec5892a519b6f907ac82dbab1ee5bb534f Mon Sep 17 00:00:00 2001 From: Martin Glauer Date: Wed, 13 Dec 2017 11:39:57 +0100 Subject: [PATCH 02/12] Remove double quotes This seems to be a bug in sqlacodegen --- egoio/db_tables/reference.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/egoio/db_tables/reference.py b/egoio/db_tables/reference.py index e41b5ca..a5363cf 100644 --- a/egoio/db_tables/reference.py +++ b/egoio/db_tables/reference.py @@ -164,7 +164,7 @@ class ReferenceToEntry(Base): ref_data_json = Column(JSON) schema_name = Column(String, nullable=False) tbl_name = Column(String, nullable=False) - changed_by = Column(String(20), server_default=text(""current_user"()")) + changed_by = Column(String(20), server_default=text("current_user()")) lastmodified = Column(DateTime, server_default=text("now()")) From 9710f59eef5ee8b48fefed5987f8bff5fb324fe6 Mon Sep 17 00:00:00 2001 From: gplessm Date: Wed, 17 Jan 2018 21:28:12 +0100 Subject: [PATCH 03/12] Update version to next one --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f71d447..36a5917 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ author='NEXT ENERGY, Reiner Lemoine Institut gGmbH, ZNES', author_email='ulf.p.mueller@hs-flensburg.de', description='ego input/output repository', - version='0.3.0', + version='0.3.1', url='https://github.com/openego/ego.io', packages=find_packages(), license='GNU Affero General Public License v3.0', From 23e895d1a6ffd6c3a369d2ba143f4b1280bd7e6c Mon Sep 17 00:00:00 2001 From: ClaraBuettner Date: Mon, 22 Jan 2018 09:13:46 +0100 Subject: [PATCH 04/12] Add Link-Table to grid schema Add ExtensionTemResolution to model_draft schema --- egoio/db_tables/grid.py | 19 +++++++++++++++++++ egoio/db_tables/model_draft.py | 13 +++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/egoio/db_tables/grid.py b/egoio/db_tables/grid.py index 56e076f..61b9165 100644 --- a/egoio/db_tables/grid.py +++ b/egoio/db_tables/grid.py @@ -341,7 +341,26 @@ class EgoPfHvLine(Base): geom = Column(Geometry('MULTILINESTRING', 4326)) topo = Column(Geometry('LINESTRING', 4326)) +class EgoPfHvLink(Base): + __tablename__ = 'ego_pf_hv_link' + __table_args__ = {'schema': 'grid'} + version = version = Column(Text, primary_key=True, nullable=False) + scn_name = Column(String, primary_key=True, nullable=False, server_default=text("'NEP'::character varying")) + link_id = Column(BigInteger, primary_key=True, nullable=False) + bus0 = Column(BigInteger) + bus1 = Column(BigInteger) + efficiency = Column(Float(53)) + p_nom = Column(Numeric, server_default=text("0")) + p_nom_extendable = Column(Boolean, server_default=text("false")) + p_nom_min = Column(Float(53), server_default=text("0")) + p_nom_max = Column(Float(53)) + capital_cost = Column(Float(53)) + length = Column(Float(53)) + terrain_factor = Column(Float(53), server_default=text("1")) + geom = Column(Geometry('MULTILINESTRING', 4326)) + topo = Column(Geometry('LINESTRING', 4326)) + class EgoPfHvLoad(Base): __tablename__ = 'ego_pf_hv_load' __table_args__ = {'schema': 'grid'} diff --git a/egoio/db_tables/model_draft.py b/egoio/db_tables/model_draft.py index 2852755..f9c5156 100644 --- a/egoio/db_tables/model_draft.py +++ b/egoio/db_tables/model_draft.py @@ -2472,9 +2472,18 @@ class EgoGridPfHvExtensionStoragePqSet(Base): temp = relationship('EgoGridPfHvTempResolution') +class EgoGridPfHvExtensionTempResolution(Base): + __tablename__ = 'ego_grid_pf_hv_extension_temp_resolution' + __table_args__ = {'schema': 'model_draft'} + + temp_id = Column(BigInteger, primary_key=True) + timesteps = Column(BigInteger, nullable=False) + resolution = Column(Text) + start_time = Column(DateTime) + -class EgoGridPfHvExtensionTrafo(Base): - __tablename__ = 'ego_grid_pf_hv_extension_trafo' +class EgoGridPfHvExtensionTransformer(Base): + __tablename__ = 'ego_grid_pf_hv_extension_transformer' __table_args__ = {'schema': 'model_draft'} scn_name = Column(String, primary_key=True, nullable=False, server_default=text("'NEP'::character varying")) From 32d869f152528ac9f8e750620ef73a030162232c Mon Sep 17 00:00:00 2001 From: ClaraBuettner Date: Thu, 8 Feb 2018 12:03:22 +0100 Subject: [PATCH 05/12] Add project column --- egoio/db_tables/model_draft.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/egoio/db_tables/model_draft.py b/egoio/db_tables/model_draft.py index f9c5156..860ac91 100644 --- a/egoio/db_tables/model_draft.py +++ b/egoio/db_tables/model_draft.py @@ -2373,6 +2373,9 @@ class EgoGridPfHvExtensionLine(Base): terrain_factor = Column(Float(53), server_default=text("1")) geom = Column(Geometry('MULTILINESTRING', 4326)) topo = Column(Geometry('LINESTRING', 4326)) + v_nom = Column(BigInteger) + project = Column(String) + project_id = Column(BigInteger) class EgoGridPfHvExtensionLink(Base): @@ -2503,6 +2506,7 @@ class EgoGridPfHvExtensionTransformer(Base): capital_cost = Column(Float(53), server_default=text("0")) geom = Column(Geometry('MULTILINESTRING', 4326)) topo = Column(Geometry('LINESTRING', 4326)) + project = Column(String) class EgoGridPfHvLoad(Base): From 8d56b92bd2c7f4bbb474aa9df76880927f0c42bf Mon Sep 17 00:00:00 2001 From: maltesc Date: Sat, 10 Feb 2018 12:56:08 +0100 Subject: [PATCH 06/12] model_draft adapted to materialized view on generator single subset (for specs performance) --- egoio/db_tables/model_draft.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/egoio/db_tables/model_draft.py b/egoio/db_tables/model_draft.py index fbbaaca..33b4f15 100644 --- a/egoio/db_tables/model_draft.py +++ b/egoio/db_tables/model_draft.py @@ -4189,6 +4189,15 @@ class EgoSupplyPfGeneratorSingle(Base): ego_grid_pf_hv_source = relationship('EgoGridPfHvSource') +class EgoSupplyAggrWeather(Base): + __tablename__ = 'ego_supply_aggr_weather_mview' + __table_args__ = {'schema': 'model_draft'} + + row_number = Column(Integer, primary_key=True) + w_id = Column(BigInteger) + aggr_id = Column(BigInteger) + scn_name = Column(String) + bus = Column(BigInteger) class EgoSupplyPfStorageSingle(Base): __tablename__ = 'ego_supply_pf_storage_single' From 3bf27552de06b23a2428ea98ded841cfa041e3c8 Mon Sep 17 00:00:00 2001 From: maltesc Date: Tue, 13 Mar 2018 13:28:16 +0100 Subject: [PATCH 07/12] Adjustment of materialized view mapping --- egoio/db_tables/model_draft.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/egoio/db_tables/model_draft.py b/egoio/db_tables/model_draft.py index 33b4f15..5e067ed 100644 --- a/egoio/db_tables/model_draft.py +++ b/egoio/db_tables/model_draft.py @@ -4189,15 +4189,15 @@ class EgoSupplyPfGeneratorSingle(Base): ego_grid_pf_hv_source = relationship('EgoGridPfHvSource') -class EgoSupplyAggrWeather(Base): - __tablename__ = 'ego_supply_aggr_weather_mview' - __table_args__ = {'schema': 'model_draft'} - - row_number = Column(Integer, primary_key=True) - w_id = Column(BigInteger) - aggr_id = Column(BigInteger) - scn_name = Column(String) - bus = Column(BigInteger) +ego_supply_aggr_weather_mview = Table( + 'ego_supply_aggr_weather_mview', metadata, + Column('row_number', Integer, primary_key=True), + Column('w_id', BigInteger), + Column('aggr_id', BigInteger), + Column('scn_name', String), + Column('bus', BigInteger), + schema='model_draft' +) class EgoSupplyPfStorageSingle(Base): __tablename__ = 'ego_supply_pf_storage_single' From 961ed460caa44462c14ad3ff1c96bee85940634a Mon Sep 17 00:00:00 2001 From: maltesc Date: Wed, 14 Mar 2018 12:13:04 +0100 Subject: [PATCH 08/12] removed pk on mview --- egoio/db_tables/model_draft.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/egoio/db_tables/model_draft.py b/egoio/db_tables/model_draft.py index 5e067ed..e0fc17e 100644 --- a/egoio/db_tables/model_draft.py +++ b/egoio/db_tables/model_draft.py @@ -4191,7 +4191,7 @@ class EgoSupplyPfGeneratorSingle(Base): ego_supply_aggr_weather_mview = Table( 'ego_supply_aggr_weather_mview', metadata, - Column('row_number', Integer, primary_key=True), + Column('row_number', Integer), Column('w_id', BigInteger), Column('aggr_id', BigInteger), Column('scn_name', String), From 195234f5802a9542bc0bc28f72e71fe33678e21a Mon Sep 17 00:00:00 2001 From: boltbeard Date: Mon, 19 Mar 2018 18:42:26 +0100 Subject: [PATCH 09/12] Added the class definition for ego_renewable_feeding --- egoio/db_tables/model_draft.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/egoio/db_tables/model_draft.py b/egoio/db_tables/model_draft.py index e0fc17e..e294371 100644 --- a/egoio/db_tables/model_draft.py +++ b/egoio/db_tables/model_draft.py @@ -3704,6 +3704,16 @@ class EgoPoliticalBoundaryHvmvSubstPerGem3Nn(Base): schema='model_draft' ) +class EgoRenewableFeedin(Base): + __tablename__ = 'ego_renewable_feedin' + __table_args__ = {'schema': 'model_draft'} + + weather_scenario_id = Column(Integer, primary_key=True, nullable=False) + w_id = Column(Integer, primary_key=True, nullable=False) + source = Column(Text, primary_key=True, nullable=False) + weather_year = Column(Integer, primary_key=True, nullable=False) + feedin = Column(ARRAY(DOUBLE_PRECISION(precision=53))) + scenario = Column(Text, primary_key=True, nullable=False) class EgoScenario(Base): __tablename__ = 'ego_scenario' From 267092e7c3c83ca6062cab7f41775382ffee634f Mon Sep 17 00:00:00 2001 From: ingaloeser Date: Thu, 29 Mar 2018 13:31:54 +0200 Subject: [PATCH 10/12] added classes of Ding0 export --- egoio/db_tables/model_draft.py | 217 +++++++++++++++++++++++++++++++++ 1 file changed, 217 insertions(+) diff --git a/egoio/db_tables/model_draft.py b/egoio/db_tables/model_draft.py index 192a182..421e867 100644 --- a/egoio/db_tables/model_draft.py +++ b/egoio/db_tables/model_draft.py @@ -4374,6 +4374,222 @@ class EgoWeatherMeasurementPoint(Base): ) +class EgoGridLvBranchtee(Base): + __tablename__ = 'ego_grid_lv_branchtee' + __table_args__ = {'schema': 'model_draft'} + + id = Column(Integer, primary_key=True, + server_default=text("nextval('model_draft.ego_grid_lv_branchtee_id_seq'::regclass)")) + run_id = Column(BigInteger) + id_db = Column(String(36)) + geom = Column(Geometry('POINT', 4326)) + lv_grid_id_db = Column(String(22)) + + +class EgoGridLvGrid(Base): + __tablename__ = 'ego_grid_lv_grid' + __table_args__ = {'schema': 'model_draft'} + + id = Column(Integer, primary_key=True, + server_default=text("nextval('model_draft.ego_grid_lv_grid_id_seq'::regclass)")) + run_id = Column(BigInteger) + id_db = Column(String(22)) + geom = Column(Geometry('MULTIPOLYGON', 4326)) #Todo: check if right srid? + lv_grid_id = Column(BigInteger) + population = Column(BigInteger) + voltage_nom = Column(Float(10)) #Todo: Check Datatypes + + +class EgoGridLvGenerator(Base): + __tablename__ = 'ego_grid_lv_generator' + __table_args__ = {'schema': 'model_draft'} + + id = Column(Integer, primary_key=True, + server_default=text("nextval('model_draft.ego_grid_lv_generator_id_seq'::regclass)")) + run_id = Column(BigInteger) + id_db = Column(String(34)) + geom = Column(Geometry('POINT', 4326)) + lv_grid_id_db = Column(String(22)) + type = Column(String(22)) + subtype = Column(String(22)) + v_level = Column(Integer) + nominal_capacity = Column(Float(10)) + + +class EgoGridLvLoad(Base): + __tablename__ = 'ego_grid_lv_load' + __table_args__ = {'schema': 'model_draft'} + + id = Column(Integer, primary_key=True, + server_default=text("nextval('model_draft.ego_grid_lv_load_id_seq'::regclass)")) + run_id = Column(BigInteger) + id_db = Column(String(26)) + geom = Column(Geometry('POINT', 4326)) + lv_grid_id_db = Column(String(22)) + consumption = Column(String(22)) + + +class EgoGridLvmvStation(Base): + __tablename__ = 'ego_grid_lvmv_station' + __table_args__ = {'schema': 'model_draft'} + + id = Column(Integer, primary_key=True, + server_default=text("nextval('model_draft.ego_grid_lvmv_station_id_seq'::regclass)")) + run_id = Column(BigInteger) + id_db = Column(String(27)) + geom = Column(Geometry('POINT', 4326)) + lv_grid_id_db = Column(String(22)) + + +class EgoGridLvTransformer(Base): + __tablename__ = 'ego_grid_lv_transformer' + __table_args__ = {'schema': 'model_draft'} + + id = Column(Integer, primary_key=True, + server_default=text("nextval('model_draft.ego_grid_lv_transformer_id_seq'::regclass)")) + run_id = Column(BigInteger) + id_db = Column(String(29)) + geom = Column(Geometry('POINT', 4326)) + lv_grid_id_db = Column(String(22)) + voltage_op = Column(Float(10)) + S_nom = Column(Float(10)) + X = Column(Float(10)) + R = Column(Float(10)) + + +class EgoGridLvmvMapping(Base): + __tablename__ = 'ego_grid_lvmv_mapping' + __table_args__ = {'schema': 'model_draft'} + + id = Column(Integer, primary_key=True, + server_default=text("nextval('model_draft.ego_grid_lvmv_mapping_id_seq'::regclass)")) + run_id = Column(BigInteger) + lv_grid_id = Column(Integer) + lv_grid_id_db = Column(String(30)) + mv_grid_id = Column(Integer) + mv_grid_id_db = Column(String(30)) + + +class EgoGridLine(Base): + __tablename__ = 'ego_grid_line' + __table_args__ = {'schema': 'model_draft'} + + id = Column(Integer, primary_key=True, + server_default=text("nextval('model_draft.ego_grid_line_id_seq'::regclass)")) + run_id = Column(BigInteger) + edge_name = Column(String(20)) + grid_id_db = Column(String(30)) + node1 = Column(String(40)) + node2 = Column(String(40)) + type_kind = Column(String(20)) + type_name = Column(String(30)) + length = Column(Float(10)) + U_n = Column(Float(10)) + C = Column(Float(10)) + L = Column(Float(10)) + R = Column(Float(10)) + I_max_th = Column(Float(10)) + + +class EgoGridMvCircuitbreaker(Base): + __tablename__ = 'ego_grid_mv_circuitbreaker' + __table_args__ = {'schema': 'model_draft'} + + id = Column(Integer, primary_key=True, + server_default=text("nextval('model_draft.ego_grid_mv_circuitbreaker_id_seq'::regclass)")) + run_id = Column(BigInteger) + id_db = Column(String(36)) + geom = Column(Geometry('POINT', 4326)) + mv_grid_id_db = Column(String(30)) + mv_grid_id = Column(Integer) + status = Column(String(6)) + + +class EgoGridMvBranchtee(Base): + __tablename__ = 'ego_grid_mv_branchtee' + __table_args__ = {'schema': 'model_draft'} + + id = Column(Integer, primary_key=True, + server_default=text("nextval('model_draft.ego_grid_mv_branchtee_id_seq'::regclass)")) + run_id = Column(BigInteger) + id_db = Column(String(36)) + geom = Column(Geometry('POINT', 4326)) + mv_grid_id_db = Column(String(22)) + + +class EgoGridMvGrid(Base): + __tablename__ = 'ego_grid_mv_grid' + __table_args__ = {'schema': 'model_draft'} + + id = Column(Integer, primary_key=True, + server_default=text("nextval('model_draft.ego_grid_mv_grid_id_seq'::regclass)")) + run_id = Column(BigInteger) + id_db = Column(String(22)) + geom = Column(Geometry('MULTIPOLYGON', 4326)) #Todo: check if right srid? + mv_grid_id = Column(BigInteger) + population = Column(BigInteger) + voltage_nom = Column(Float(10)) #Todo: Check Datatypes + + +class EgoGridMvGenerator(Base): + __tablename__ = 'ego_grid_mv_generator' + __table_args__ = {'schema': 'model_draft'} + + id = Column(Integer, primary_key=True, + server_default=text("nextval('model_draft.ego_grid_mv_generator_id_seq'::regclass)")) + run_id = Column(BigInteger) + id_db = Column(String(34)) + geom = Column(Geometry('POINT', 4326)) + mv_grid_id_db = Column(String(22)) + type = Column(String(22)) + subtype = Column(String(22)) + v_level = Column(Integer) + nominal_capacity = Column(Float(10)) + + +class EgoGridMvLoad(Base): + __tablename__ = 'ego_grid_mv_load' + __table_args__ = {'schema': 'model_draft'} + + id = Column(Integer, primary_key=True, + server_default=text("nextval('model_draft.ego_grid_mv_load_id_seq'::regclass)")) + run_id = Column(BigInteger) + id_db = Column(String(26)) + geom = Column(Geometry('POINT', 4326)) + mv_grid_id_db = Column(String(22)) + consumption = Column(String(22)) + + +class EgoGridMvhvStation(Base): + __tablename__ = 'ego_grid_mvhv_station' + __table_args__ = {'schema': 'model_draft'} + + id = Column(Integer, primary_key=True, + server_default=text("nextval('model_draft.ego_grid_mvhv_station_id_seq'::regclass)")) + run_id = Column(BigInteger) + id_db = Column(String(27)) + geom = Column(Geometry('POINT', 4326)) + mv_grid_id_db = Column(String(22)) + lv_grid_id_db = Column(String(22)) + + +class EgoGridMvTransformer(Base): + __tablename__ = 'ego_grid_mv_transformer' + __table_args__ = {'schema': 'model_draft'} + + id = Column(Integer, primary_key=True, + server_default=text("nextval('model_draft.ego_grid_mv_transformer_id_seq'::regclass)")) + run_id = Column(BigInteger) + id_db = Column(String(29)) + geom = Column(Geometry('POINT', 4326)) + mv_grid_id_db = Column(String(22)) + voltage_op = Column(Float(10)) + S_nom = Column(Float(10)) + X = Column(Float(10)) + R = Column(Float(10)) + lv_grid_id_db = Column(String(2)) + + class ExampleApiTableWolf(Base): __tablename__ = 'example_api_table_wolf' __table_args__ = {'schema': 'model_draft'} @@ -4662,3 +4878,4 @@ class TestTable(Base): Column('geom', Geometry), schema='model_draft' ) + From b79ecd66f7ee1b24bf15188d03875a8b47c1e76e Mon Sep 17 00:00:00 2001 From: gplessm Date: Fri, 27 Apr 2018 10:26:54 +0200 Subject: [PATCH 11/12] Add w_id to ORM classes of RES powerplant --- egoio/db_tables/model_draft.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/egoio/db_tables/model_draft.py b/egoio/db_tables/model_draft.py index 160efce..e3b7806 100644 --- a/egoio/db_tables/model_draft.py +++ b/egoio/db_tables/model_draft.py @@ -5138,6 +5138,7 @@ class EgoSupplyResPowerplant(Base): un_id = Column(BigInteger) voltage_level = Column(SmallInteger) la_id = Column(Integer) + w_id = Column(Integer) mvlv_subst_id = Column(Integer) rea_sort = Column(Integer) rea_flag = Column(String) @@ -5181,6 +5182,7 @@ class EgoSupplyResPowerplant(Base): Column('flag', String), Column('nuts', String), Column('la_id', Integer), + Column('w_id', Integer), Column('mvlv_subst_id', Integer), Column('rea_sort', Integer), Column('rea_flag', String), @@ -5226,6 +5228,7 @@ class EgoSupplyResPowerplant(Base): Column('flag', String), Column('nuts', String), Column('la_id', Integer), + Column('w_id', Integer), Column('mvlv_subst_id', Integer), Column('rea_sort', Integer), Column('rea_flag', String), @@ -5357,6 +5360,7 @@ class EgoSupplyResPowerplant(Base): Column('flag', String), Column('nuts', String), Column('la_id', Integer), + Column('w_id', Integer), Column('mvlv_subst_id', Integer), Column('rea_sort', Integer), Column('rea_flag', String), From 62b33a7c788fb0542c2feab74e359ee52f4e7038 Mon Sep 17 00:00:00 2001 From: Bharadwaj Narasimhan Date: Tue, 15 May 2018 11:28:57 +0200 Subject: [PATCH 12/12] include definitions for model_draft.ego_renewable_feedin_v031 instead of model_draft.ego_renewable_feedin --- egoio/db_tables/model_draft.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/egoio/db_tables/model_draft.py b/egoio/db_tables/model_draft.py index e294371..e3a1fe7 100644 --- a/egoio/db_tables/model_draft.py +++ b/egoio/db_tables/model_draft.py @@ -3705,13 +3705,14 @@ class EgoPoliticalBoundaryHvmvSubstPerGem3Nn(Base): ) class EgoRenewableFeedin(Base): - __tablename__ = 'ego_renewable_feedin' + __tablename__ = 'ego_renewable_feedin_v031' __table_args__ = {'schema': 'model_draft'} weather_scenario_id = Column(Integer, primary_key=True, nullable=False) w_id = Column(Integer, primary_key=True, nullable=False) source = Column(Text, primary_key=True, nullable=False) weather_year = Column(Integer, primary_key=True, nullable=False) + power_class = Column(Integer, primary_key=True, nullable=False) feedin = Column(ARRAY(DOUBLE_PRECISION(precision=53))) scenario = Column(Text, primary_key=True, nullable=False)