Merge branch 'dev'

openego · May 15, 2018 · 174c9cd · 174c9cd
2 parents 19f95e6 + 33bccb5
commit 174c9cd
Show file tree

Hide file tree

Showing 4 changed files with 483 additions and 28 deletions.
diff --git 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'}