Merge branch 'master' into demand-refactor

OSeMOSYS · Sep 21, 2024 · efa9f5b · efa9f5b
2 parents 7f10390 + 5b1ca0b
commit efa9f5b
Show file tree

Hide file tree

Showing 31 changed files with 21 additions and 1,042,870 deletions.
diff --git a/resources/data/CMO-April-2020-forecasts copy.xlsx b/resources/data/CMO-April-2020-forecasts copy.xlsx
diff --git a/resources/data/Data requirements OSeMOSYS-PLEXOS Soft-Link.xlsx b/resources/data/Data requirements OSeMOSYS-PLEXOS Soft-Link.xlsx
diff --git a/resources/data/OPG_memberships_01-06-2020.csv b/resources/data/OPG_memberships_01-06-2020.csv
diff --git a/resources/data/OPG_memberships_07-08-2020.csv b/resources/data/OPG_memberships_07-08-2020.csv
diff --git a/resources/data/OPG_memberships_19-03-2020.csv b/resources/data/OPG_memberships_19-03-2020.csv
diff --git a/resources/data/OPG_powerplant_data_01-06-2020.csv b/resources/data/OPG_powerplant_data_01-06-2020.csv
diff --git a/resources/data/OPG_powerplant_data_07-08-2020.csv b/resources/data/OPG_powerplant_data_07-08-2020.csv
diff --git a/resources/data/OPG_powerplant_data_19-03-2020.csv b/resources/data/OPG_powerplant_data_19-03-2020.csv