From c6751828298ebd967df65afa2961cb8d5b975cb7 Mon Sep 17 00:00:00 2001 From: trevorb1 Date: Sat, 5 Oct 2024 20:00:17 -0700 Subject: [PATCH] remove old otoole data --- resources/{otoole/config.yaml => otoole.yaml} | 0 resources/otoole/data/AccumulatedAnnualDemand.csv | 1 - resources/otoole/data/AnnualEmissionLimit.csv | 1 - resources/otoole/data/AnnualExogenousEmission.csv | 1 - resources/otoole/data/AvailabilityFactor.csv | 1 - resources/otoole/data/CapacityFactor.csv | 1 - resources/otoole/data/CapacityOfOneTechnologyUnit.csv | 1 - resources/otoole/data/CapacityToActivityUnit.csv | 1 - resources/otoole/data/CapitalCost.csv | 1 - resources/otoole/data/CapitalCostStorage.csv | 1 - resources/otoole/data/Conversionld.csv | 1 - resources/otoole/data/Conversionlh.csv | 1 - resources/otoole/data/Conversionls.csv | 1 - resources/otoole/data/DAILYTIMEBRACKET.csv | 1 - resources/otoole/data/DAYTYPE.csv | 1 - resources/otoole/data/DaySplit.csv | 1 - resources/otoole/data/DaysInDayType.csv | 1 - resources/otoole/data/DepreciationMethod.csv | 1 - resources/otoole/data/DiscountRate.csv | 1 - resources/otoole/data/DiscountRateStorage.csv | 1 - resources/otoole/data/EMISSION.csv | 1 - resources/otoole/data/EmissionActivityRatio.csv | 1 - resources/otoole/data/EmissionsPenalty.csv | 1 - resources/otoole/data/FUEL.csv | 1 - resources/otoole/data/FixedCost.csv | 1 - resources/otoole/data/InputActivityRatio.csv | 1 - resources/otoole/data/MODE_OF_OPERATION.csv | 1 - resources/otoole/data/MinStorageCharge.csv | 1 - resources/otoole/data/ModelPeriodEmissionLimit.csv | 1 - resources/otoole/data/ModelPeriodExogenousEmission.csv | 1 - resources/otoole/data/OperationalLife.csv | 1 - resources/otoole/data/OperationalLifeStorage.csv | 1 - resources/otoole/data/OutputActivityRatio.csv | 1 - resources/otoole/data/REGION.csv | 1 - resources/otoole/data/REMinProductionTarget.csv | 1 - resources/otoole/data/RETagFuel.csv | 1 - resources/otoole/data/RETagTechnology.csv | 1 - resources/otoole/data/ReserveMargin.csv | 1 - resources/otoole/data/ReserveMarginTagFuel.csv | 1 - resources/otoole/data/ReserveMarginTagTechnology.csv | 1 - resources/otoole/data/ResidualCapacity.csv | 1 - resources/otoole/data/ResidualStorageCapacity.csv | 1 - resources/otoole/data/SEASON.csv | 1 - resources/otoole/data/STORAGE.csv | 1 - resources/otoole/data/SpecifiedAnnualDemand.csv | 1 - resources/otoole/data/SpecifiedDemandProfile.csv | 1 - resources/otoole/data/StorageLevelStart.csv | 1 - resources/otoole/data/StorageMaxChargeRate.csv | 1 - resources/otoole/data/StorageMaxDischargeRate.csv | 1 - resources/otoole/data/TECHNOLOGY.csv | 1 - resources/otoole/data/TIMESLICE.csv | 1 - resources/otoole/data/TechnologyFromStorage.csv | 1 - resources/otoole/data/TechnologyToStorage.csv | 1 - resources/otoole/data/TotalAnnualMaxCapacity.csv | 1 - resources/otoole/data/TotalAnnualMaxCapacityInvestment.csv | 1 - resources/otoole/data/TotalAnnualMinCapacity.csv | 1 - resources/otoole/data/TotalAnnualMinCapacityInvestment.csv | 1 - .../otoole/data/TotalTechnologyAnnualActivityLowerLimit.csv | 1 - .../otoole/data/TotalTechnologyAnnualActivityUpperLimit.csv | 1 - .../data/TotalTechnologyModelPeriodActivityLowerLimit.csv | 1 - .../data/TotalTechnologyModelPeriodActivityUpperLimit.csv | 1 - resources/otoole/data/TradeRoute.csv | 1 - resources/otoole/data/VariableCost.csv | 1 - resources/otoole/data/YEAR.csv | 1 - resources/otoole/data/YearSplit.csv | 1 - workflow/rules/model.smk | 2 +- workflow/snakefile | 2 +- 67 files changed, 2 insertions(+), 66 deletions(-) rename resources/{otoole/config.yaml => otoole.yaml} (100%) delete mode 100644 resources/otoole/data/AccumulatedAnnualDemand.csv delete mode 100644 resources/otoole/data/AnnualEmissionLimit.csv delete mode 100644 resources/otoole/data/AnnualExogenousEmission.csv delete mode 100644 resources/otoole/data/AvailabilityFactor.csv delete mode 100644 resources/otoole/data/CapacityFactor.csv delete mode 100644 resources/otoole/data/CapacityOfOneTechnologyUnit.csv delete mode 100644 resources/otoole/data/CapacityToActivityUnit.csv delete mode 100644 resources/otoole/data/CapitalCost.csv delete mode 100644 resources/otoole/data/CapitalCostStorage.csv delete mode 100644 resources/otoole/data/Conversionld.csv delete mode 100644 resources/otoole/data/Conversionlh.csv delete mode 100644 resources/otoole/data/Conversionls.csv delete mode 100644 resources/otoole/data/DAILYTIMEBRACKET.csv delete mode 100644 resources/otoole/data/DAYTYPE.csv delete mode 100644 resources/otoole/data/DaySplit.csv delete mode 100644 resources/otoole/data/DaysInDayType.csv delete mode 100644 resources/otoole/data/DepreciationMethod.csv delete mode 100644 resources/otoole/data/DiscountRate.csv delete mode 100644 resources/otoole/data/DiscountRateStorage.csv delete mode 100644 resources/otoole/data/EMISSION.csv delete mode 100644 resources/otoole/data/EmissionActivityRatio.csv delete mode 100644 resources/otoole/data/EmissionsPenalty.csv delete mode 100644 resources/otoole/data/FUEL.csv delete mode 100644 resources/otoole/data/FixedCost.csv delete mode 100644 resources/otoole/data/InputActivityRatio.csv delete mode 100644 resources/otoole/data/MODE_OF_OPERATION.csv delete mode 100644 resources/otoole/data/MinStorageCharge.csv delete mode 100644 resources/otoole/data/ModelPeriodEmissionLimit.csv delete mode 100644 resources/otoole/data/ModelPeriodExogenousEmission.csv delete mode 100644 resources/otoole/data/OperationalLife.csv delete mode 100644 resources/otoole/data/OperationalLifeStorage.csv delete mode 100644 resources/otoole/data/OutputActivityRatio.csv delete mode 100644 resources/otoole/data/REGION.csv delete mode 100644 resources/otoole/data/REMinProductionTarget.csv delete mode 100644 resources/otoole/data/RETagFuel.csv delete mode 100644 resources/otoole/data/RETagTechnology.csv delete mode 100644 resources/otoole/data/ReserveMargin.csv delete mode 100644 resources/otoole/data/ReserveMarginTagFuel.csv delete mode 100644 resources/otoole/data/ReserveMarginTagTechnology.csv delete mode 100644 resources/otoole/data/ResidualCapacity.csv delete mode 100644 resources/otoole/data/ResidualStorageCapacity.csv delete mode 100644 resources/otoole/data/SEASON.csv delete mode 100644 resources/otoole/data/STORAGE.csv delete mode 100644 resources/otoole/data/SpecifiedAnnualDemand.csv delete mode 100644 resources/otoole/data/SpecifiedDemandProfile.csv delete mode 100644 resources/otoole/data/StorageLevelStart.csv delete mode 100644 resources/otoole/data/StorageMaxChargeRate.csv delete mode 100644 resources/otoole/data/StorageMaxDischargeRate.csv delete mode 100644 resources/otoole/data/TECHNOLOGY.csv delete mode 100644 resources/otoole/data/TIMESLICE.csv delete mode 100644 resources/otoole/data/TechnologyFromStorage.csv delete mode 100644 resources/otoole/data/TechnologyToStorage.csv delete mode 100644 resources/otoole/data/TotalAnnualMaxCapacity.csv delete mode 100644 resources/otoole/data/TotalAnnualMaxCapacityInvestment.csv delete mode 100644 resources/otoole/data/TotalAnnualMinCapacity.csv delete mode 100644 resources/otoole/data/TotalAnnualMinCapacityInvestment.csv delete mode 100644 resources/otoole/data/TotalTechnologyAnnualActivityLowerLimit.csv delete mode 100644 resources/otoole/data/TotalTechnologyAnnualActivityUpperLimit.csv delete mode 100644 resources/otoole/data/TotalTechnologyModelPeriodActivityLowerLimit.csv delete mode 100644 resources/otoole/data/TotalTechnologyModelPeriodActivityUpperLimit.csv delete mode 100644 resources/otoole/data/TradeRoute.csv delete mode 100644 resources/otoole/data/VariableCost.csv delete mode 100644 resources/otoole/data/YEAR.csv delete mode 100644 resources/otoole/data/YearSplit.csv diff --git a/resources/otoole/config.yaml b/resources/otoole.yaml similarity index 100% rename from resources/otoole/config.yaml rename to resources/otoole.yaml diff --git a/resources/otoole/data/AccumulatedAnnualDemand.csv b/resources/otoole/data/AccumulatedAnnualDemand.csv deleted file mode 100644 index 326b28c6..00000000 --- a/resources/otoole/data/AccumulatedAnnualDemand.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,FUEL,YEAR,VALUE diff --git a/resources/otoole/data/AnnualEmissionLimit.csv b/resources/otoole/data/AnnualEmissionLimit.csv deleted file mode 100644 index 1fa535a0..00000000 --- a/resources/otoole/data/AnnualEmissionLimit.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,EMISSION,YEAR,VALUE diff --git a/resources/otoole/data/AnnualExogenousEmission.csv b/resources/otoole/data/AnnualExogenousEmission.csv deleted file mode 100644 index 1fa535a0..00000000 --- a/resources/otoole/data/AnnualExogenousEmission.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,EMISSION,YEAR,VALUE diff --git a/resources/otoole/data/AvailabilityFactor.csv b/resources/otoole/data/AvailabilityFactor.csv deleted file mode 100644 index 6a91e609..00000000 --- a/resources/otoole/data/AvailabilityFactor.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,TECHNOLOGY,YEAR,VALUE diff --git a/resources/otoole/data/CapacityFactor.csv b/resources/otoole/data/CapacityFactor.csv deleted file mode 100644 index ba3be6ef..00000000 --- a/resources/otoole/data/CapacityFactor.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,TECHNOLOGY,TIMESLICE,YEAR,VALUE diff --git a/resources/otoole/data/CapacityOfOneTechnologyUnit.csv b/resources/otoole/data/CapacityOfOneTechnologyUnit.csv deleted file mode 100644 index 6a91e609..00000000 --- a/resources/otoole/data/CapacityOfOneTechnologyUnit.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,TECHNOLOGY,YEAR,VALUE diff --git a/resources/otoole/data/CapacityToActivityUnit.csv b/resources/otoole/data/CapacityToActivityUnit.csv deleted file mode 100644 index 1ca1a8e9..00000000 --- a/resources/otoole/data/CapacityToActivityUnit.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,TECHNOLOGY,VALUE diff --git a/resources/otoole/data/CapitalCost.csv b/resources/otoole/data/CapitalCost.csv deleted file mode 100644 index 6a91e609..00000000 --- a/resources/otoole/data/CapitalCost.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,TECHNOLOGY,YEAR,VALUE diff --git a/resources/otoole/data/CapitalCostStorage.csv b/resources/otoole/data/CapitalCostStorage.csv deleted file mode 100644 index a7bcbd7f..00000000 --- a/resources/otoole/data/CapitalCostStorage.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,STORAGE,YEAR,VALUE diff --git a/resources/otoole/data/Conversionld.csv b/resources/otoole/data/Conversionld.csv deleted file mode 100644 index 360887ad..00000000 --- a/resources/otoole/data/Conversionld.csv +++ /dev/null @@ -1 +0,0 @@ -TIMESLICE,DAYTYPE,VALUE diff --git a/resources/otoole/data/Conversionlh.csv b/resources/otoole/data/Conversionlh.csv deleted file mode 100644 index 6fc0a297..00000000 --- a/resources/otoole/data/Conversionlh.csv +++ /dev/null @@ -1 +0,0 @@ -TIMESLICE,DAILYTIMEBRACKET,VALUE diff --git a/resources/otoole/data/Conversionls.csv b/resources/otoole/data/Conversionls.csv deleted file mode 100644 index 47b6ebde..00000000 --- a/resources/otoole/data/Conversionls.csv +++ /dev/null @@ -1 +0,0 @@ -TIMESLICE,SEASON,VALUE diff --git a/resources/otoole/data/DAILYTIMEBRACKET.csv b/resources/otoole/data/DAILYTIMEBRACKET.csv deleted file mode 100644 index 2dfe6a37..00000000 --- a/resources/otoole/data/DAILYTIMEBRACKET.csv +++ /dev/null @@ -1 +0,0 @@ -VALUE diff --git a/resources/otoole/data/DAYTYPE.csv b/resources/otoole/data/DAYTYPE.csv deleted file mode 100644 index 2dfe6a37..00000000 --- a/resources/otoole/data/DAYTYPE.csv +++ /dev/null @@ -1 +0,0 @@ -VALUE diff --git a/resources/otoole/data/DaySplit.csv b/resources/otoole/data/DaySplit.csv deleted file mode 100644 index 83dab5c1..00000000 --- a/resources/otoole/data/DaySplit.csv +++ /dev/null @@ -1 +0,0 @@ -DAILYTIMEBRACKET,YEAR,VALUE diff --git a/resources/otoole/data/DaysInDayType.csv b/resources/otoole/data/DaysInDayType.csv deleted file mode 100644 index 7e5dd712..00000000 --- a/resources/otoole/data/DaysInDayType.csv +++ /dev/null @@ -1 +0,0 @@ -SEASON,DAYTYPE,YEAR,VALUE diff --git a/resources/otoole/data/DepreciationMethod.csv b/resources/otoole/data/DepreciationMethod.csv deleted file mode 100644 index 8f1fa36c..00000000 --- a/resources/otoole/data/DepreciationMethod.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,VALUE diff --git a/resources/otoole/data/DiscountRate.csv b/resources/otoole/data/DiscountRate.csv deleted file mode 100644 index 8f1fa36c..00000000 --- a/resources/otoole/data/DiscountRate.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,VALUE diff --git a/resources/otoole/data/DiscountRateStorage.csv b/resources/otoole/data/DiscountRateStorage.csv deleted file mode 100644 index 2176c14c..00000000 --- a/resources/otoole/data/DiscountRateStorage.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,STORAGE,VALUE diff --git a/resources/otoole/data/EMISSION.csv b/resources/otoole/data/EMISSION.csv deleted file mode 100644 index 2dfe6a37..00000000 --- a/resources/otoole/data/EMISSION.csv +++ /dev/null @@ -1 +0,0 @@ -VALUE diff --git a/resources/otoole/data/EmissionActivityRatio.csv b/resources/otoole/data/EmissionActivityRatio.csv deleted file mode 100644 index 7c1c3ffc..00000000 --- a/resources/otoole/data/EmissionActivityRatio.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,TECHNOLOGY,EMISSION,MODE_OF_OPERATION,YEAR,VALUE diff --git a/resources/otoole/data/EmissionsPenalty.csv b/resources/otoole/data/EmissionsPenalty.csv deleted file mode 100644 index 1fa535a0..00000000 --- a/resources/otoole/data/EmissionsPenalty.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,EMISSION,YEAR,VALUE diff --git a/resources/otoole/data/FUEL.csv b/resources/otoole/data/FUEL.csv deleted file mode 100644 index 2dfe6a37..00000000 --- a/resources/otoole/data/FUEL.csv +++ /dev/null @@ -1 +0,0 @@ -VALUE diff --git a/resources/otoole/data/FixedCost.csv b/resources/otoole/data/FixedCost.csv deleted file mode 100644 index 6a91e609..00000000 --- a/resources/otoole/data/FixedCost.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,TECHNOLOGY,YEAR,VALUE diff --git a/resources/otoole/data/InputActivityRatio.csv b/resources/otoole/data/InputActivityRatio.csv deleted file mode 100644 index 7be9802d..00000000 --- a/resources/otoole/data/InputActivityRatio.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,TECHNOLOGY,FUEL,MODE_OF_OPERATION,YEAR,VALUE diff --git a/resources/otoole/data/MODE_OF_OPERATION.csv b/resources/otoole/data/MODE_OF_OPERATION.csv deleted file mode 100644 index 2dfe6a37..00000000 --- a/resources/otoole/data/MODE_OF_OPERATION.csv +++ /dev/null @@ -1 +0,0 @@ -VALUE diff --git a/resources/otoole/data/MinStorageCharge.csv b/resources/otoole/data/MinStorageCharge.csv deleted file mode 100644 index a7bcbd7f..00000000 --- a/resources/otoole/data/MinStorageCharge.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,STORAGE,YEAR,VALUE diff --git a/resources/otoole/data/ModelPeriodEmissionLimit.csv b/resources/otoole/data/ModelPeriodEmissionLimit.csv deleted file mode 100644 index ccd4bcb3..00000000 --- a/resources/otoole/data/ModelPeriodEmissionLimit.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,EMISSION,VALUE diff --git a/resources/otoole/data/ModelPeriodExogenousEmission.csv b/resources/otoole/data/ModelPeriodExogenousEmission.csv deleted file mode 100644 index ccd4bcb3..00000000 --- a/resources/otoole/data/ModelPeriodExogenousEmission.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,EMISSION,VALUE diff --git a/resources/otoole/data/OperationalLife.csv b/resources/otoole/data/OperationalLife.csv deleted file mode 100644 index 1ca1a8e9..00000000 --- a/resources/otoole/data/OperationalLife.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,TECHNOLOGY,VALUE diff --git a/resources/otoole/data/OperationalLifeStorage.csv b/resources/otoole/data/OperationalLifeStorage.csv deleted file mode 100644 index 2176c14c..00000000 --- a/resources/otoole/data/OperationalLifeStorage.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,STORAGE,VALUE diff --git a/resources/otoole/data/OutputActivityRatio.csv b/resources/otoole/data/OutputActivityRatio.csv deleted file mode 100644 index 7be9802d..00000000 --- a/resources/otoole/data/OutputActivityRatio.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,TECHNOLOGY,FUEL,MODE_OF_OPERATION,YEAR,VALUE diff --git a/resources/otoole/data/REGION.csv b/resources/otoole/data/REGION.csv deleted file mode 100644 index 2dfe6a37..00000000 --- a/resources/otoole/data/REGION.csv +++ /dev/null @@ -1 +0,0 @@ -VALUE diff --git a/resources/otoole/data/REMinProductionTarget.csv b/resources/otoole/data/REMinProductionTarget.csv deleted file mode 100644 index b55c2264..00000000 --- a/resources/otoole/data/REMinProductionTarget.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,YEAR,VALUE diff --git a/resources/otoole/data/RETagFuel.csv b/resources/otoole/data/RETagFuel.csv deleted file mode 100644 index 326b28c6..00000000 --- a/resources/otoole/data/RETagFuel.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,FUEL,YEAR,VALUE diff --git a/resources/otoole/data/RETagTechnology.csv b/resources/otoole/data/RETagTechnology.csv deleted file mode 100644 index 6a91e609..00000000 --- a/resources/otoole/data/RETagTechnology.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,TECHNOLOGY,YEAR,VALUE diff --git a/resources/otoole/data/ReserveMargin.csv b/resources/otoole/data/ReserveMargin.csv deleted file mode 100644 index b55c2264..00000000 --- a/resources/otoole/data/ReserveMargin.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,YEAR,VALUE diff --git a/resources/otoole/data/ReserveMarginTagFuel.csv b/resources/otoole/data/ReserveMarginTagFuel.csv deleted file mode 100644 index 326b28c6..00000000 --- a/resources/otoole/data/ReserveMarginTagFuel.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,FUEL,YEAR,VALUE diff --git a/resources/otoole/data/ReserveMarginTagTechnology.csv b/resources/otoole/data/ReserveMarginTagTechnology.csv deleted file mode 100644 index 6a91e609..00000000 --- a/resources/otoole/data/ReserveMarginTagTechnology.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,TECHNOLOGY,YEAR,VALUE diff --git a/resources/otoole/data/ResidualCapacity.csv b/resources/otoole/data/ResidualCapacity.csv deleted file mode 100644 index 6a91e609..00000000 --- a/resources/otoole/data/ResidualCapacity.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,TECHNOLOGY,YEAR,VALUE diff --git a/resources/otoole/data/ResidualStorageCapacity.csv b/resources/otoole/data/ResidualStorageCapacity.csv deleted file mode 100644 index a7bcbd7f..00000000 --- a/resources/otoole/data/ResidualStorageCapacity.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,STORAGE,YEAR,VALUE diff --git a/resources/otoole/data/SEASON.csv b/resources/otoole/data/SEASON.csv deleted file mode 100644 index 2dfe6a37..00000000 --- a/resources/otoole/data/SEASON.csv +++ /dev/null @@ -1 +0,0 @@ -VALUE diff --git a/resources/otoole/data/STORAGE.csv b/resources/otoole/data/STORAGE.csv deleted file mode 100644 index 2dfe6a37..00000000 --- a/resources/otoole/data/STORAGE.csv +++ /dev/null @@ -1 +0,0 @@ -VALUE diff --git a/resources/otoole/data/SpecifiedAnnualDemand.csv b/resources/otoole/data/SpecifiedAnnualDemand.csv deleted file mode 100644 index 326b28c6..00000000 --- a/resources/otoole/data/SpecifiedAnnualDemand.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,FUEL,YEAR,VALUE diff --git a/resources/otoole/data/SpecifiedDemandProfile.csv b/resources/otoole/data/SpecifiedDemandProfile.csv deleted file mode 100644 index 9425f708..00000000 --- a/resources/otoole/data/SpecifiedDemandProfile.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,FUEL,TIMESLICE,YEAR,VALUE diff --git a/resources/otoole/data/StorageLevelStart.csv b/resources/otoole/data/StorageLevelStart.csv deleted file mode 100644 index 2176c14c..00000000 --- a/resources/otoole/data/StorageLevelStart.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,STORAGE,VALUE diff --git a/resources/otoole/data/StorageMaxChargeRate.csv b/resources/otoole/data/StorageMaxChargeRate.csv deleted file mode 100644 index 2176c14c..00000000 --- a/resources/otoole/data/StorageMaxChargeRate.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,STORAGE,VALUE diff --git a/resources/otoole/data/StorageMaxDischargeRate.csv b/resources/otoole/data/StorageMaxDischargeRate.csv deleted file mode 100644 index 2176c14c..00000000 --- a/resources/otoole/data/StorageMaxDischargeRate.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,STORAGE,VALUE diff --git a/resources/otoole/data/TECHNOLOGY.csv b/resources/otoole/data/TECHNOLOGY.csv deleted file mode 100644 index 2dfe6a37..00000000 --- a/resources/otoole/data/TECHNOLOGY.csv +++ /dev/null @@ -1 +0,0 @@ -VALUE diff --git a/resources/otoole/data/TIMESLICE.csv b/resources/otoole/data/TIMESLICE.csv deleted file mode 100644 index 2dfe6a37..00000000 --- a/resources/otoole/data/TIMESLICE.csv +++ /dev/null @@ -1 +0,0 @@ -VALUE diff --git a/resources/otoole/data/TechnologyFromStorage.csv b/resources/otoole/data/TechnologyFromStorage.csv deleted file mode 100644 index 384c871b..00000000 --- a/resources/otoole/data/TechnologyFromStorage.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,TECHNOLOGY,STORAGE,MODE_OF_OPERATION,VALUE diff --git a/resources/otoole/data/TechnologyToStorage.csv b/resources/otoole/data/TechnologyToStorage.csv deleted file mode 100644 index 384c871b..00000000 --- a/resources/otoole/data/TechnologyToStorage.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,TECHNOLOGY,STORAGE,MODE_OF_OPERATION,VALUE diff --git a/resources/otoole/data/TotalAnnualMaxCapacity.csv b/resources/otoole/data/TotalAnnualMaxCapacity.csv deleted file mode 100644 index 6a91e609..00000000 --- a/resources/otoole/data/TotalAnnualMaxCapacity.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,TECHNOLOGY,YEAR,VALUE diff --git a/resources/otoole/data/TotalAnnualMaxCapacityInvestment.csv b/resources/otoole/data/TotalAnnualMaxCapacityInvestment.csv deleted file mode 100644 index 6a91e609..00000000 --- a/resources/otoole/data/TotalAnnualMaxCapacityInvestment.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,TECHNOLOGY,YEAR,VALUE diff --git a/resources/otoole/data/TotalAnnualMinCapacity.csv b/resources/otoole/data/TotalAnnualMinCapacity.csv deleted file mode 100644 index 6a91e609..00000000 --- a/resources/otoole/data/TotalAnnualMinCapacity.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,TECHNOLOGY,YEAR,VALUE diff --git a/resources/otoole/data/TotalAnnualMinCapacityInvestment.csv b/resources/otoole/data/TotalAnnualMinCapacityInvestment.csv deleted file mode 100644 index 6a91e609..00000000 --- a/resources/otoole/data/TotalAnnualMinCapacityInvestment.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,TECHNOLOGY,YEAR,VALUE diff --git a/resources/otoole/data/TotalTechnologyAnnualActivityLowerLimit.csv b/resources/otoole/data/TotalTechnologyAnnualActivityLowerLimit.csv deleted file mode 100644 index 6a91e609..00000000 --- a/resources/otoole/data/TotalTechnologyAnnualActivityLowerLimit.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,TECHNOLOGY,YEAR,VALUE diff --git a/resources/otoole/data/TotalTechnologyAnnualActivityUpperLimit.csv b/resources/otoole/data/TotalTechnologyAnnualActivityUpperLimit.csv deleted file mode 100644 index 6a91e609..00000000 --- a/resources/otoole/data/TotalTechnologyAnnualActivityUpperLimit.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,TECHNOLOGY,YEAR,VALUE diff --git a/resources/otoole/data/TotalTechnologyModelPeriodActivityLowerLimit.csv b/resources/otoole/data/TotalTechnologyModelPeriodActivityLowerLimit.csv deleted file mode 100644 index 1ca1a8e9..00000000 --- a/resources/otoole/data/TotalTechnologyModelPeriodActivityLowerLimit.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,TECHNOLOGY,VALUE diff --git a/resources/otoole/data/TotalTechnologyModelPeriodActivityUpperLimit.csv b/resources/otoole/data/TotalTechnologyModelPeriodActivityUpperLimit.csv deleted file mode 100644 index 1ca1a8e9..00000000 --- a/resources/otoole/data/TotalTechnologyModelPeriodActivityUpperLimit.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,TECHNOLOGY,VALUE diff --git a/resources/otoole/data/TradeRoute.csv b/resources/otoole/data/TradeRoute.csv deleted file mode 100644 index 326b28c6..00000000 --- a/resources/otoole/data/TradeRoute.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,FUEL,YEAR,VALUE diff --git a/resources/otoole/data/VariableCost.csv b/resources/otoole/data/VariableCost.csv deleted file mode 100644 index 85639006..00000000 --- a/resources/otoole/data/VariableCost.csv +++ /dev/null @@ -1 +0,0 @@ -REGION,TECHNOLOGY,MODE_OF_OPERATION,YEAR,VALUE diff --git a/resources/otoole/data/YEAR.csv b/resources/otoole/data/YEAR.csv deleted file mode 100644 index 2dfe6a37..00000000 --- a/resources/otoole/data/YEAR.csv +++ /dev/null @@ -1 +0,0 @@ -VALUE diff --git a/resources/otoole/data/YearSplit.csv b/resources/otoole/data/YearSplit.csv deleted file mode 100644 index 54f1a2ac..00000000 --- a/resources/otoole/data/YearSplit.csv +++ /dev/null @@ -1 +0,0 @@ -TIMESLICE,YEAR,VALUE diff --git a/workflow/rules/model.smk b/workflow/rules/model.smk index 1d4d73cc..a21816ab 100644 --- a/workflow/rules/model.smk +++ b/workflow/rules/model.smk @@ -23,7 +23,7 @@ rule copy_otoole_confg: message: 'Copying otoole configuration file...' input: - config='resources/otoole/config.yaml' + config=OTOOLE_YAML output: config='results/{scenario}/otoole.yaml' run: diff --git a/workflow/snakefile b/workflow/snakefile index def16e6a..aed6d03e 100644 --- a/workflow/snakefile +++ b/workflow/snakefile @@ -41,7 +41,7 @@ def get_otoole_data(otoole_config: str, var: str) -> list[str]: # constants -OTOOLE_YAML = "resources/otoole/config.yaml" +OTOOLE_YAML = "resources/otoole.yaml" OTOOLE_PARAMS = get_otoole_data(OTOOLE_YAML, "param") OTOOLE_RESULTS = get_otoole_data(OTOOLE_YAML, "result")