Merge branch 'release/0.4.0' into Scaler

GenXProject · Apr 3, 2024 · c83155b · c83155b
2 parents bfa485c + 782f6ab
commit c83155b
Show file tree

Hide file tree

Showing 57 changed files with 65 additions and 398 deletions.
diff --git a/.zenodo.json b/.zenodo.json
@@ -87,6 +87,10 @@
             "name": "Xu, Qingyu",
             "affiliation": "Tsinghua University",
             "orcid": "0000-0003-2692-5135"
+        },
+        {
+            "name": "Zhou, Justin",
+            "affiliation": "Massachusetts Institute of Technology"
         }
     ]
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -82,8 +82,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - The settings parameter `Reserves` has been renamed to `OperationalReserves`, `Reserves.csv` to
   `Operational_reserves.csv`, and the `.jl` files contain the word `reserves` have been renamed to
   `operational_reserves` (#641).
-- New folder structure for a GenX case. The input files are now organized in the following folders: `settings`,
-  `policies`, `resources` and `system`. The examples and tests have been updated to reflect this change.
+- New folder structure for a GenX case. The input files are now organized in the following folders: `settings`, 
+  `policies`, `resources` and `system`. The examples and tests have been updated to reflect this change. 
+- New folder structure implemented for `example_system`. This folder now consists of nine separate folders each pertaining to a different case study example,
+  ranging from the ISONE three zones, with singlestage, multistage, electrolyzers, all the way to the 9 bus IEEE case for running DC-OPF.
 
 ### Deprecated
 - The above `load` keys, which generally refer to electrical demand, are being deprecated.

diff --git a/CITATION.cff b/CITATION.cff
@@ -1,30 +1,60 @@
 cff-version: 1.2.0
 message: "If you use this software, please cite it as below."
 authors:
+- family-names: "Bonaldo"
+  given-names: "Luca"
+  orcid: "https://orcid.org/0009-0000-0650-0266"
+- family-names: "Chakrabarti"
+  given-names: "Sambuddha"
+  orcid: "https://orcid.org/0000-0002-8916-5076"
+- family-names: "Cheng"
+  given-names: "Fangwei"
+  orcid: "https://orcid.org/0000-0001-6589-2749"
+- family-names: "Ding"
+  given-names: "Yifu"
+  orcid: "https://orcid.org/0000-0001-7128-8847"
 - family-names: "Jenkins"
   given-names: "Jesse"
-- family-names: "Sepulveda"
-  given-names: "Nestor"
+  orcid: "https://orcid.org/0000-0002-9670-7793"
+- family-names: "Luo"
+  given-names: "Qian"
+  orcid: "https://orcid.org/0000-0003-3894-4093"
+- family-names: "Macdonald"
+  given-names: "Ruaridh"
+  orcid: "https://orcid.org/0000-0001-9034-6635"
 - family-names: "Mallapragada"
   given-names: "Dharik"
+  orcid: "https://orcid.org/0000-0002-0330-0063"
+- family-names: "Manocha"
+  given-names: "Aneesha"
+  orcid: "https://orcid.org/0000-0002-7190-4782"
+- family-names: "Mantegna"
+  given-names: "Gabe"
+  orcid: "https://orcid.org/0000-0002-7707-0221"
+- family-names: "Morris"
+  given-names: "Jack"
 - family-names: "Patankar"
   given-names: "Neha"
+  orcid: "https://orcid.org/0000-0001-7288-0391"
+- family-names: "Pecci"
+  given-names: "Filippo"
+  orcid: "https://orcid.org/0000-0003-3200-0892"
 - family-names: "Schwartz"
   given-names: "Aaron"
 - family-names: "Schwartz"
   given-names: "Jacob"
   orcid: "https://orcid.org/0000-0001-9636-8181"
-- family-names: "Chakrabarti"
-  given-names: "Sambuddha"
-  orcid: "https://orcid.org/0000-0002-8916-5076"
-- family-names: "Xu"
-  given-names: "Qingyu"
-- family-names: "Morris"
-  given-names: "Jack"
+- family-names: "Schivley"
+  given-names: "Greg"
+  orcid: "https://orcid.org/0000-0002-8947-694X"
 - family-names: "Sepulveda"
   given-names: "Nestor"
+  orcid: "https://orcid.org/0000-0003-2735-8769"
+- family-names: "Xu"
+  given-names: "Qingyu"
+  orcid: "https://orcid.org/0000-0003-2692-5135"
 title: "GenX"
-version: 0.3.0
-doi: 10.5281/zenodo.6229425
-date-released: 2022-04-26
-url: "https://github.com/GenXProject/GenX"
+version: 0.4.0
+doi: 10.5281/zenodo.10846070
+date-released: 2024-04-26
+url: "https://github.com/GenXProject/GenX.jl"
diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 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"]
+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.0"
 
 [deps]

diff --git a/...tems/3_three_zone_w_co2_capture/README.md → ...ems/3_three_zones_w_co2_capture/README.md b/...tems/3_three_zone_w_co2_capture/README.md → ...ems/3_three_zones_w_co2_capture/README.md
diff --git a/...systems/3_three_zone_w_co2_capture/Run.jl → ...ystems/3_three_zones_w_co2_capture/Run.jl b/...systems/3_three_zone_w_co2_capture/Run.jl → ...ystems/3_three_zones_w_co2_capture/Run.jl
diff --git a/...e_zone_w_co2_capture/policies/CO2_cap.csv → ..._zones_w_co2_capture/policies/CO2_cap.csv b/...e_zone_w_co2_capture/policies/CO2_cap.csv → ..._zones_w_co2_capture/policies/CO2_cap.csv
diff --git a/...policies/Minimum_capacity_requirement.csv → ...policies/Minimum_capacity_requirement.csv b/...policies/Minimum_capacity_requirement.csv → ...policies/Minimum_capacity_requirement.csv
diff --git a/..._zone_w_co2_capture/resources/Storage.csv → ...zones_w_co2_capture/resources/Storage.csv b/..._zone_w_co2_capture/resources/Storage.csv → ...zones_w_co2_capture/resources/Storage.csv
diff --git a/..._zone_w_co2_capture/resources/Thermal.csv → ...zones_w_co2_capture/resources/Thermal.csv b/..._zone_w_co2_capture/resources/Thermal.csv → ...zones_w_co2_capture/resources/Thermal.csv
diff --git a/...hree_zone_w_co2_capture/resources/Vre.csv → ...ree_zones_w_co2_capture/resources/Vre.csv b/...hree_zone_w_co2_capture/resources/Vre.csv → ...ree_zones_w_co2_capture/resources/Vre.csv
diff --git a/...Resource_minimum_capacity_requirement.csv → ...Resource_minimum_capacity_requirement.csv b/...Resource_minimum_capacity_requirement.csv → ...Resource_minimum_capacity_requirement.csv
diff --git a/...e_w_co2_capture/settings/clp_settings.yml → ...s_w_co2_capture/settings/clp_settings.yml b/...e_w_co2_capture/settings/clp_settings.yml → ...s_w_co2_capture/settings/clp_settings.yml
diff --git a/...w_co2_capture/settings/cplex_settings.yml → ...w_co2_capture/settings/cplex_settings.yml b/...w_co2_capture/settings/cplex_settings.yml → ...w_co2_capture/settings/cplex_settings.yml
diff --git a/..._w_co2_capture/settings/genx_settings.yml → ..._w_co2_capture/settings/genx_settings.yml b/..._w_co2_capture/settings/genx_settings.yml → ..._w_co2_capture/settings/genx_settings.yml
diff --git a/..._co2_capture/settings/gurobi_settings.yml → ..._co2_capture/settings/gurobi_settings.yml b/..._co2_capture/settings/gurobi_settings.yml → ..._co2_capture/settings/gurobi_settings.yml
diff --git a/...w_co2_capture/settings/highs_settings.yml → ...w_co2_capture/settings/highs_settings.yml b/...w_co2_capture/settings/highs_settings.yml → ...w_co2_capture/settings/highs_settings.yml
diff --git a/...ttings/time_domain_reduction_settings.yml → ...ttings/time_domain_reduction_settings.yml b/...ttings/time_domain_reduction_settings.yml → ...ttings/time_domain_reduction_settings.yml
diff --git a/...zone_w_co2_capture/system/Demand_data.csv → ...ones_w_co2_capture/system/Demand_data.csv b/...zone_w_co2_capture/system/Demand_data.csv → ...ones_w_co2_capture/system/Demand_data.csv
diff --git a/..._zone_w_co2_capture/system/Fuels_data.csv → ...zones_w_co2_capture/system/Fuels_data.csv b/..._zone_w_co2_capture/system/Fuels_data.csv → ...zones_w_co2_capture/system/Fuels_data.csv
diff --git a/...capture/system/Generators_variability.csv → ...capture/system/Generators_variability.csv b/...capture/system/Generators_variability.csv → ...capture/system/Generators_variability.csv
diff --git a/...ree_zone_w_co2_capture/system/Network.csv → ...ee_zones_w_co2_capture/system/Network.csv b/...ree_zone_w_co2_capture/system/Network.csv → ...ee_zones_w_co2_capture/system/Network.csv
diff --git a/...systems/8_three_zone_w_retrofit/README.md → ...ystems/8_three_zones_w_retrofit/README.md b/...systems/8_three_zone_w_retrofit/README.md → ...ystems/8_three_zones_w_retrofit/README.md
diff --git a/...le_systems/8_three_zone_w_retrofit/Run.jl → ...e_systems/8_three_zones_w_retrofit/Run.jl b/...le_systems/8_three_zone_w_retrofit/Run.jl → ...e_systems/8_three_zones_w_retrofit/Run.jl
diff --git a/...hree_zone_w_retrofit/policies/CO2_cap.csv → ...ree_zones_w_retrofit/policies/CO2_cap.csv b/...hree_zone_w_retrofit/policies/CO2_cap.csv → ...ree_zones_w_retrofit/policies/CO2_cap.csv
diff --git a/...ofit/policies/Capacity_reserve_margin.csv → ...ofit/policies/Capacity_reserve_margin.csv b/...ofit/policies/Capacity_reserve_margin.csv → ...ofit/policies/Capacity_reserve_margin.csv
diff --git a/...fit/policies/Energy_share_requirement.csv → ...fit/policies/Energy_share_requirement.csv b/...fit/policies/Energy_share_requirement.csv → ...fit/policies/Energy_share_requirement.csv
diff --git a/...policies/Minimum_capacity_requirement.csv → ...policies/Minimum_capacity_requirement.csv b/...policies/Minimum_capacity_requirement.csv → ...policies/Minimum_capacity_requirement.csv
diff --git a/...ree_zone_w_retrofit/resources/Storage.csv → ...ee_zones_w_retrofit/resources/Storage.csv b/...ree_zone_w_retrofit/resources/Storage.csv → ...ee_zones_w_retrofit/resources/Storage.csv
diff --git a/...ree_zone_w_retrofit/resources/Thermal.csv → ...ee_zones_w_retrofit/resources/Thermal.csv b/...ree_zone_w_retrofit/resources/Thermal.csv → ...ee_zones_w_retrofit/resources/Thermal.csv
diff --git a/...8_three_zone_w_retrofit/resources/Vre.csv → ..._three_zones_w_retrofit/resources/Vre.csv b/...8_three_zone_w_retrofit/resources/Vre.csv → ..._three_zones_w_retrofit/resources/Vre.csv
diff --git a/...Resource_minimum_capacity_requirement.csv → ...Resource_minimum_capacity_requirement.csv b/...Resource_minimum_capacity_requirement.csv → ...Resource_minimum_capacity_requirement.csv
diff --git a/...zone_w_retrofit/settings/clp_settings.yml → ...ones_w_retrofit/settings/clp_settings.yml b/...zone_w_retrofit/settings/clp_settings.yml → ...ones_w_retrofit/settings/clp_settings.yml
diff --git a/...ne_w_retrofit/settings/cplex_settings.yml → ...es_w_retrofit/settings/cplex_settings.yml b/...ne_w_retrofit/settings/cplex_settings.yml → ...es_w_retrofit/settings/cplex_settings.yml
diff --git a/...one_w_retrofit/settings/genx_settings.yml → ...nes_w_retrofit/settings/genx_settings.yml b/...one_w_retrofit/settings/genx_settings.yml → ...nes_w_retrofit/settings/genx_settings.yml
diff --git a/...e_w_retrofit/settings/gurobi_settings.yml → ...s_w_retrofit/settings/gurobi_settings.yml b/...e_w_retrofit/settings/gurobi_settings.yml → ...s_w_retrofit/settings/gurobi_settings.yml
diff --git a/...ne_w_retrofit/settings/highs_settings.yml → ...es_w_retrofit/settings/highs_settings.yml b/...ne_w_retrofit/settings/highs_settings.yml → ...es_w_retrofit/settings/highs_settings.yml
diff --git a/...ttings/time_domain_reduction_settings.yml → ...ttings/time_domain_reduction_settings.yml b/...ttings/time_domain_reduction_settings.yml → ...ttings/time_domain_reduction_settings.yml
diff --git a/...ee_zone_w_retrofit/system/Demand_data.csv → ...e_zones_w_retrofit/system/Demand_data.csv b/...ee_zone_w_retrofit/system/Demand_data.csv → ...e_zones_w_retrofit/system/Demand_data.csv
diff --git a/...ree_zone_w_retrofit/system/Fuels_data.csv → ...ee_zones_w_retrofit/system/Fuels_data.csv b/...ree_zone_w_retrofit/system/Fuels_data.csv → ...ee_zones_w_retrofit/system/Fuels_data.csv
diff --git a/...etrofit/system/Generators_variability.csv → ...etrofit/system/Generators_variability.csv b/...etrofit/system/Generators_variability.csv → ...etrofit/system/Generators_variability.csv
diff --git a/..._three_zone_w_retrofit/system/Network.csv → ...three_zones_w_retrofit/system/Network.csv b/..._three_zone_w_retrofit/system/Network.csv → ...three_zones_w_retrofit/system/Network.csv
diff --git a/example_systems/IEEE_9_bus_DC_OPF/README.md → ...ple_systems/9_IEEE_9_bus_DC_OPF/README.md b/example_systems/IEEE_9_bus_DC_OPF/README.md → ...ple_systems/9_IEEE_9_bus_DC_OPF/README.md
diff --git a/example_systems/IEEE_9_bus_DC_OPF/Run.jl → example_systems/9_IEEE_9_bus_DC_OPF/Run.jl b/example_systems/IEEE_9_bus_DC_OPF/Run.jl → example_systems/9_IEEE_9_bus_DC_OPF/Run.jl
diff --git a/...s/IEEE_9_bus_DC_OPF/resources/Thermal.csv → ...9_IEEE_9_bus_DC_OPF/resources/Thermal.csv b/...s/IEEE_9_bus_DC_OPF/resources/Thermal.csv → ...9_IEEE_9_bus_DC_OPF/resources/Thermal.csv
diff --git a/..._9_bus_DC_OPF/settings/cplex_settings.yml → ..._9_bus_DC_OPF/settings/cplex_settings.yml b/..._9_bus_DC_OPF/settings/cplex_settings.yml → ..._9_bus_DC_OPF/settings/cplex_settings.yml
diff --git a/...E_9_bus_DC_OPF/settings/genx_settings.yml → ...E_9_bus_DC_OPF/settings/genx_settings.yml b/...E_9_bus_DC_OPF/settings/genx_settings.yml → ...E_9_bus_DC_OPF/settings/genx_settings.yml
diff --git a/...9_bus_DC_OPF/settings/gurobi_settings.yml → ...9_bus_DC_OPF/settings/gurobi_settings.yml b/...9_bus_DC_OPF/settings/gurobi_settings.yml → ...9_bus_DC_OPF/settings/gurobi_settings.yml
diff --git a/..._9_bus_DC_OPF/settings/highs_settings.yml → ..._9_bus_DC_OPF/settings/highs_settings.yml b/..._9_bus_DC_OPF/settings/highs_settings.yml → ..._9_bus_DC_OPF/settings/highs_settings.yml
diff --git a/...ttings/time_domain_reduction_settings.yml → ...ttings/time_domain_reduction_settings.yml b/...ttings/time_domain_reduction_settings.yml → ...ttings/time_domain_reduction_settings.yml
diff --git a/.../IEEE_9_bus_DC_OPF/system/Demand_data.csv → ..._IEEE_9_bus_DC_OPF/system/Demand_data.csv b/.../IEEE_9_bus_DC_OPF/system/Demand_data.csv → ..._IEEE_9_bus_DC_OPF/system/Demand_data.csv
diff --git a/...s/IEEE_9_bus_DC_OPF/system/Fuels_data.csv → ...9_IEEE_9_bus_DC_OPF/system/Fuels_data.csv b/...s/IEEE_9_bus_DC_OPF/system/Fuels_data.csv → ...9_IEEE_9_bus_DC_OPF/system/Fuels_data.csv
diff --git a/..._DC_OPF/system/Generators_variability.csv → ..._DC_OPF/system/Generators_variability.csv b/..._DC_OPF/system/Generators_variability.csv → ..._DC_OPF/system/Generators_variability.csv
diff --git a/...tems/IEEE_9_bus_DC_OPF/system/Network.csv → ...ms/9_IEEE_9_bus_DC_OPF/system/Network.csv b/...tems/IEEE_9_bus_DC_OPF/system/Network.csv → ...ms/9_IEEE_9_bus_DC_OPF/system/Network.csv