diff --git a/README.md b/README.md index bc6a6e8..0cb8716 100644 --- a/README.md +++ b/README.md @@ -13,16 +13,21 @@ the free and open-source solver [GLPK](https://www.gnu.org/software/glpk/) ```bash # Install the OSeMOSYS toolkit -pip install otoole>=1.0.0 +pip install "otoole>=1.0.0" # Download the dataset. On Linux or OSX use wget, otherwise download and unzip -wget https://zenodo.org/record/7736670/files/OSeMOSYS/simplicity-v1.0.zip?download=1 +wget https://zenodo.org/record/7736836/files/OSeMOSYS/simplicity-v1.1.zip?download=1 +unzip simplicity-v1.1.zip?download=1 -d simplicity -unzip simplicity-v1.0 -d simplicity +# Move the data to a new directory called simplicity/ +mv simplicity/OSeMOSYS-simplicity-74b9610/* simplicity +rm -R simplicity/OSeMOSYS-simplicity-74b9610/ + +# Change working directory to the new simplicity folder +cd simplicity # Create the GNUMathProg data file with otoole -mv simplicity/OSeMOSYS-simplicity-f0d3e83/* simplicity -otoole convert csv datafile simplicity/data ./simplicity.txt simplicity/config.yaml +otoole convert csv datafile data/ ./simplicity.txt config.yaml # Solve the model glpsol -m OSeMOSYS.txt -d simplicity.txt diff --git a/data/DiscountRate.csv b/data/DiscountRate.csv index 5d021eb..31aaff2 100644 --- a/data/DiscountRate.csv +++ b/data/DiscountRate.csv @@ -1,2 +1,2 @@ -REGION,TECHNOLOGY,VALUE +REGION,VALUE diff --git a/data/default_values.csv b/data/default_values.csv deleted file mode 100644 index cf899bc..0000000 --- a/data/default_values.csv +++ /dev/null @@ -1,54 +0,0 @@ -name,default_value -AccumulatedAnnualDemand,0 -AnnualEmissionLimit,-1 -AnnualExogenousEmission,0 -AvailabilityFactor,1 -CapacityFactor,1 -CapacityOfOneTechnologyUnit,0 -CapacityToActivityUnit,1 -CapitalCost,0 -CapitalCostStorage,0 -Conversionld,0 -Conversionlh,0 -Conversionls,0 -DaysInDayType,7 -DaySplit,0.00137 -DepreciationMethod,1 -DiscountRate,0.05 -DiscountRateStorage,0.05 -EmissionActivityRatio,0 -EmissionsPenalty,0 -FixedCost,0 -InputActivityRatio,0 -MinStorageCharge,0 -ModelPeriodEmissionLimit,-1 -ModelPeriodExogenousEmission,0 -OperationalLife,1 -OperationalLifeStorage,0 -OutputActivityRatio,0 -REMinProductionTarget,0 -ReserveMargin,1 -ReserveMarginTagFuel,0 -ReserveMarginTagTechnology,0 -ResidualCapacity,0 -ResidualStorageCapacity,999 -RETagFuel,0 -RETagTechnology,0 -SpecifiedAnnualDemand,0 -SpecifiedDemandProfile,0 -StorageLevelStart,0 -StorageMaxChargeRate,0 -StorageMaxDischargeRate,0 -TechnologyFromStorage,0 -TechnologyToStorage,0 -TotalAnnualMaxCapacity,-1 -TotalAnnualMaxCapacityInvestment,-1 -TotalAnnualMinCapacity,0 -TotalAnnualMinCapacityInvestment,0 -TotalTechnologyAnnualActivityLowerLimit,0 -TotalTechnologyAnnualActivityUpperLimit,-1 -TotalTechnologyModelPeriodActivityLowerLimit,0 -TotalTechnologyModelPeriodActivityUpperLimit,-1 -TradeRoute,0 -VariableCost,0 -YearSplit,0