Skip to content
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.

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

Jp/genx inputs #15

Merged
merged 70 commits into from
Sep 18, 2024
Merged
Show file tree
Hide file tree
Changes from 67 commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
d540d9e
add fields
jerrypotts Jul 11, 2024
55522e9
add electrolyzer and flexible demand structs
jerrypotts Jul 16, 2024
95b3522
typo
jerrypotts Jul 22, 2024
f13d3fc
update IS dependency
jerrypotts Jul 23, 2024
add5332
add colocated resources, retireable and retofittable techs
jerrypotts Jul 23, 2024
cea1291
add reserves to SupplyTechnology
jerrypotts Jul 23, 2024
b31e265
fix SupplyTechnology
jerrypotts Jul 23, 2024
7b7a692
update storage structs
jerrypotts Jul 24, 2024
362e219
update TransportTechnology
jerrypotts Jul 24, 2024
376c715
update Demand Requirements
jerrypotts Jul 25, 2024
a347530
additional inputs for TransportTechnology
jerrypotts Jul 29, 2024
b852d32
updating naming convention, data types, and adding CurtailableDemandS…
jerrypotts Aug 1, 2024
8f9b0bc
add co2 to SupplyTechnology
jerrypotts Aug 1, 2024
b7fc4d8
typo
jerrypotts Aug 1, 2024
82acc1f
export retrofit and retire structs
jerrypotts Aug 1, 2024
ccc2ccd
add name field to retrofits and retirements
jerrypotts Aug 5, 2024
8d0de2c
export get_technology
jerrypotts Aug 5, 2024
0a30283
add requirements
jerrypotts Aug 5, 2024
9a795be
make parametric an optional field for schema
jerrypotts Aug 5, 2024
872270c
add policy requirements
jerrypotts Aug 5, 2024
645453c
change requirements to subset of Service
jerrypotts Aug 5, 2024
91f3fcc
add utility functions for requirements
jerrypotts Aug 5, 2024
c823c76
change Requirements to IS System Component
jerrypotts Aug 6, 2024
6999958
add pricecap field
jerrypotts Aug 6, 2024
c9e9979
update exports
jerrypotts Aug 6, 2024
3953c62
empty function for blobs
jerrypotts Aug 6, 2024
9f4eb9a
change slack to pricecap
jerrypotts Aug 7, 2024
023e14e
add dependencies for database pipeline
jerrypotts Aug 7, 2024
c12675f
initialize empty functions and added transmission to db pipeline
jerrypotts Aug 7, 2024
245f60a
fixed empty transmission line vector
jerrypotts Aug 7, 2024
679c31a
add power_systems_type back to structs
jerrypotts Aug 7, 2024
366bfd3
fix imports
jerrypotts Aug 7, 2024
1481602
add pre existing generation units
jerrypotts Aug 7, 2024
513c270
added storage to portfolio
jerrypotts Aug 7, 2024
9c1899a
add existing capacity to StorageTechnology
jerrypotts Aug 7, 2024
db4d367
formatting
jerrypotts Aug 7, 2024
81c5096
add parsers for blobs
jerrypotts Aug 7, 2024
e17d16a
add demand timeseries
jerrypotts Aug 7, 2024
05387fc
add system to portfolio
jerrypotts Aug 8, 2024
fbee511
change json to json3 in parsers
jerrypotts Aug 8, 2024
7d11e38
add dates and timeseries
jerrypotts Aug 8, 2024
0c0bde3
change supply curve parser to produce tuple of XY_COORDS
jerrypotts Aug 8, 2024
d584afe
remove empty functions
jerrypotts Aug 8, 2024
c9a1953
update investment cost to supply curve
jerrypotts Aug 8, 2024
d4c8212
add supplemental attributes
jerrypotts Aug 22, 2024
79bb714
add zone struct
jerrypotts Aug 28, 2024
f571f3b
add Region abstract type
jerrypotts Aug 28, 2024
83d1422
generalize supplemental_attribute functions
jerrypotts Aug 28, 2024
c2612cb
updaet include
jerrypotts Aug 28, 2024
f43645d
change retrofits and retirements to supplemental attributes
jerrypotts Aug 28, 2024
ca01ca5
name change
jerrypotts Aug 28, 2024
e7e4810
add existing capacity supplemental attribute
jerrypotts Aug 28, 2024
fdb1d5b
typos
jerrypotts Aug 28, 2024
b721340
updating data types and exports for zones
jerrypotts Aug 29, 2024
bc5505f
remove Revise
jerrypotts Sep 3, 2024
37a0f08
update retirements and retrofits to match structure of existingcapacity
jerrypotts Sep 3, 2024
bbf33c7
add aggregated versions of retirements and retrofits
jerrypotts Sep 3, 2024
0d5c338
cahnge dictionary to vector in existingcapacity
jerrypotts Sep 3, 2024
5013ed6
merged electrolyzers with DemandsideTechnology
jerrypotts Sep 3, 2024
3316833
update field names
jerrypotts Sep 17, 2024
378a3f8
update includes
jerrypotts Sep 17, 2024
d6b0c58
update names and remove unecessary fields
jerrypotts Sep 17, 2024
c2fd4d6
formatter
jerrypotts Sep 17, 2024
8826d53
make Zone optional for SupplyTechnology
jerrypotts Sep 17, 2024
099874c
remove region
jerrypotts Sep 17, 2024
8a7061b
add defaults for storage
jerrypotts Sep 17, 2024
776b1e2
remove region from DemandRequirement
jerrypotts Sep 17, 2024
92ded9d
renaming file name to fix typo (#14)
sourabhdalvi Sep 13, 2024
69df149
Merge branch 'main' into jp/genx_inputs
rodrigomha Sep 18, 2024
cf1b343
remove extra show
rodrigomha Sep 18, 2024
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
3 changes: 3 additions & 0 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@ authors = ["Jose Daniel Lara"]
version = "0.1.0"

[deps]
DBInterface = "a10d1c49-ce27-4219-8d33-6db1a4562965"
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
InfrastructureSystems = "2cd47ed4-ca9b-11e9-27f2-ab636a7671f1"
JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
JSONSchema = "7d188eb4-7ad8-530c-ae41-71a32a6d4692"
PowerSystems = "bcd98974-b02a-5e2f-9ee0-a103f5c450dd"
PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"
SQLite = "0aa819cd-b072-5ff4-a722-6bc24af294d9"
TimeSeries = "9e3dc215-6440-5c97-bce1-76c03772f85e"

[compat]
DocStringExtensions = "~0.9"
Expand Down
34 changes: 34 additions & 0 deletions src/PowerSystemsInvestmentsPortfolios.jl
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,58 @@ import InfrastructureSystems:
get_time_series_array,
get_time_series_timestamps,
get_time_series_values,
supports_time_series,
InfrastructureSystemsInternal,
CompressionSettings,
CompressionTypes,
MultiLogger,
LogEventTracker,
StructField,
CostCurve,
LinearCurve,
InfrastructureSystemsComponent

import PowerSystems
import PowerSystems: StorageCost, ThermalGenerationCost

import JSONSchema
import JSON3
import PrettyTables
import SQLite
import DataFrames
import DBInterface
import TimeSeries
import Dates

# Temporary, imports not working properly for some reason?
using DataFrames
using PowerSystems
using Dates
using TimeSeries

export Portfolio
export Technology
export Requirements
export SupplyTechnology
export TransportTechnology
export StorageTechnology
export DemandRequirement
export DemandsideTechnology
export FlexibleDemandTechnology
export Electrolyzers
export CurtailableDemandSideTechnology
export RetireableCapacity
export RetrofitCapacity
export ExistingCapacity
export CarbonCaps
export MinimumCapacityRequirements
export Region
export Zone

export get_technologies
export get_technology
export get_requirements
export get_ext
export add_technology!
export add_technologies!
export read_json_data
Expand All @@ -43,6 +72,9 @@ export db_to_dataframes
export map_prime_mover
export dataframe_to_structs
export db_to_portfolio_parser
export add_supplemental_attribute!
export remove_supplemental_attribute!
export get_supplemental_attribute

const PSY = PowerSystems
const IS = InfrastructureSystems
Expand All @@ -59,6 +91,8 @@ export PrimeMovers
export StorageTech

include("models/technologies.jl")
include("models/regions.jl")
include("models/requirements.jl")
include("models/generated/includes.jl")
include("portfolio.jl")
include("serialization.jl")
Expand Down
Loading