Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "GenX"
uuid = "5d317b1e-30ec-4ed6-a8ce-8d2d88d7cfac"
authors = ["Bonaldo, Luca", "Chakrabarti, Sambuddha", "Cheng, Fangwei", "Ding, Yifu", "Jenkins, Jesse D.", "Luo, Qian", "Macdonald, Ruaridh", "Mallapragada, Dharik", "Manocha, Aneesha", "Mantegna, Gabe ", "Morris, Jack", "Patankar, Neha", "Pecci, Filippo", "Schwartz, Aaron", "Schwartz, Jacob", "Schivley, Greg", "Sepulveda, Nestor", "Xu, Qingyu", "Zhou, Justin"]
version = "0.4.6"
version = "0.4.4"

[deps]
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
Expand All @@ -16,7 +16,6 @@ JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
NearestNeighbors = "b8a86587-4115-5ab1-83bc-aa920d37bbce"
PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
Expand All @@ -36,7 +35,6 @@ HiGHS = "1.1.4"
JuMP = "1.1.1"
LinearAlgebra = "1"
MathOptInterface = "1.6.1"
NearestNeighbors = "0.4.0 - 0.4.22"
PrecompileTools = "1"
RecursiveArrayTools = "2.31.2, 3"
Statistics = "1.4.0"
Expand Down
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
[![CI](https://github.com/GenXProject/GenX/actions/workflows/ci.yml/badge.svg)](https://github.com/GenXProject/GenX/actions/workflows/ci.yml) [![SciML Code Style](https://img.shields.io/static/v1?label=code%20style&message=SciML&color=9558b2&labelColor=389826)](https://github.com/SciML/SciMLStyle) [![ColPrac: Contributor's Guide on Collaborative Practices for Community Packages](https://img.shields.io/badge/ColPrac-Contributor's%20Guide-blueviolet)](https://github.com/SciML/ColPrac)

## Overview
***
Private branch made by me, Erik Seeger Bjørnerem, during my PhD work at NTNU to expand the hydropower formulation to include cascaded hydropower. All other credit is to be given to the developers of the GenX model.
***

GenX is a highly-configurable, [open source](https://github.com/GenXProject/GenX/blob/main/LICENSE) electricity resource capacity expansion model
that incorporates several state-of-the-art practices in electricity system planning to offer improved decision support for a changing electricity landscape.

Expand Down Expand Up @@ -40,7 +44,7 @@ The 'main' branch is the current master branch of GenX. The various subdirectori

## Requirements

GenX (v0.4.6) runs on Julia v1.6 through v1.9, with a minimum version of the package JuMP v1.1.1. Julia v1.10 and v1.11 are also supported. However, we recently noticed a decline in performance with Julia v1.10, which is currently under investigation. Therefore, **we recommend using Julia v1.9**, particularly for very large cases.
GenX (v0.4.4) runs on Julia v1.6 through v1.9, with a minimum version of the package JuMP v1.1.1. Julia v1.10 and v1.11 are also supported. However, we recently noticed a decline in performance with Julia v1.10, which is currently under investigation. Therefore, **we recommend using Julia v1.9**, particularly for very large cases.
We recommend the users to either stick to a particular version of Julia to run GenX. If however, the users decide to switch between versions, it's very important to delete the old `Manifest.toml` file and do a fresh build of GenX when switching between Julia versions.

There is also an older version of GenX, which is also currently maintained and runs on Julia 1.3.x and 1.4.x series.
Expand Down
1 change: 0 additions & 1 deletion docs/make.jl
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ pages = OrderedDict(
"Scheduled maintenance for Thermal Commit" => "Model_Reference/Resources/maintenance.md",
"Fusion" => "Model_Reference/Resources/fusion.md"
],
"Allam Cycle" => "Model_Reference/Resources/allam_cycle.md",
"Hydrogen Electrolyzers" => "Model_Reference/Resources/electrolyzers.md",
"Resource types" => "Model_Reference/Resources/resource.md"
],
Expand Down
70 changes: 35 additions & 35 deletions docs/src/Model_Concept_Overview/model_notation.md

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions docs/src/Model_Reference/write_outputs.md
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,3 @@ GenX.write_angles
```@docs
GenX.write_settings_file
```

## Write Allam Cycle LOX
```@docs
GenX.write_allam_capacity
GenX.write_allam_output
```
1 change: 0 additions & 1 deletion docs/src/Public_API/public_api.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,5 @@ GenX.mga
GenX.configure_settings_multistage
GenX.configure_multi_stage_inputs
GenX.run_ddp
GenX.run_myopic_multistage
GenX.write_multi_stage_outputs
```

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/src/Tutorials/Tutorial_8_outputs.md
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ StatsPlots.scatter!(xnames,netrevenue[!,"Revenue"],label="Revenue",color="black"

### Emissions

The file `emmissions.csv` gives the total CO2 emmissions per zone for each hour GenX runs. The first three rows give the marginal CO2 abatement cost in USD/ton CO2.
The file `emmissions.csv` gives the total CO2 emmissions per zone for each hour GenX runs. The first three rows give the marginal CO2 abatement cost in $/ton CO2.


```julia
Expand Down
5 changes: 1 addition & 4 deletions docs/src/User_Guide/model_configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ The following tables summarize the model settings parameters and their default/p
||1 = constraints account for energy lost. |
|TimeDomainReduction | 1 = Use time domain reduced inputs available in the folder with the name defined by settings parameter `TimeDomainReductionFolder`. If such a folder does not exist or it is empty, time domain reduction will reduce the input data and save the results there.|
||0 = Use the data in the main case folder; do not perform clustering.|
|VirtualChargeDischargeCost | Hypothetical cost of charging and discharging storage resources (in USD/MWh).|
|VirtualChargeDischargeCost | Hypothetical cost of charging and discharging storage resources (in $/MWh).|
|StorageVirtualDischarge | Flag to enable contributions that a storage device makes to the capacity reserve margin without generating power.|
||1 = activate the virtual discharge of storage resources.|
||0 = do not activate the virtual discharge of storage resources.|
Expand Down Expand Up @@ -129,9 +129,6 @@ The following tables summarize the model settings parameters and their default/p
|**Parameter** | **Description**|
| :------------ | :-----------|
|Solver | OPTIONAL name of solver. Default is "HiGHS" effectively. It is necessary to set `Solver: "Gurobi"` when [reusing the same gurobi environment for multiple solves](https://github.com/jump-dev/Gurobi.jl?tab=readme-ov-file#reusing-the-same-gurobi-environment-for-multiple-solves).
|EnableJuMPDirectModel | Flag to enable/disable JuMP `direct_model` to improve the performance. Solvers "HiGHS", "Gurobi", "CPLEX" and "SCIP" support direct model, but "Clp" and "Cbc" do not support it.|
||1 = enable JuMP `direct_model`.|
||0 = disable JuMP `direct_model`, use `Model` instead.|
|EnableJuMPStringNames | Flag to enable/disable JuMP string names to improve the performance.|
||1 = enable JuMP string names.|
||0 = disable JuMP string names.|
Expand Down
Loading