remove old otoole data

OSeMOSYS · Oct 6, 2024 · c675182 · c675182
1 parent 1e0b5b2
commit c675182
Show file tree

Hide file tree

Showing 67 changed files with 2 additions and 66 deletions.
diff --git a/resources/otoole/config.yaml → resources/otoole.yaml b/resources/otoole/config.yaml → resources/otoole.yaml
diff --git a/resources/otoole/data/AccumulatedAnnualDemand.csv b/resources/otoole/data/AccumulatedAnnualDemand.csv
diff --git a/resources/otoole/data/AnnualEmissionLimit.csv b/resources/otoole/data/AnnualEmissionLimit.csv
diff --git a/resources/otoole/data/AnnualExogenousEmission.csv b/resources/otoole/data/AnnualExogenousEmission.csv
diff --git a/resources/otoole/data/AvailabilityFactor.csv b/resources/otoole/data/AvailabilityFactor.csv
diff --git a/resources/otoole/data/CapacityFactor.csv b/resources/otoole/data/CapacityFactor.csv
diff --git a/resources/otoole/data/CapacityOfOneTechnologyUnit.csv b/resources/otoole/data/CapacityOfOneTechnologyUnit.csv
diff --git a/resources/otoole/data/CapacityToActivityUnit.csv b/resources/otoole/data/CapacityToActivityUnit.csv
diff --git a/resources/otoole/data/CapitalCost.csv b/resources/otoole/data/CapitalCost.csv
diff --git a/resources/otoole/data/CapitalCostStorage.csv b/resources/otoole/data/CapitalCostStorage.csv
diff --git a/resources/otoole/data/Conversionld.csv b/resources/otoole/data/Conversionld.csv
diff --git a/resources/otoole/data/Conversionlh.csv b/resources/otoole/data/Conversionlh.csv
diff --git a/resources/otoole/data/Conversionls.csv b/resources/otoole/data/Conversionls.csv
diff --git a/resources/otoole/data/DAILYTIMEBRACKET.csv b/resources/otoole/data/DAILYTIMEBRACKET.csv
diff --git a/resources/otoole/data/DAYTYPE.csv b/resources/otoole/data/DAYTYPE.csv
diff --git a/resources/otoole/data/DaySplit.csv b/resources/otoole/data/DaySplit.csv
diff --git a/resources/otoole/data/DaysInDayType.csv b/resources/otoole/data/DaysInDayType.csv
diff --git a/resources/otoole/data/DepreciationMethod.csv b/resources/otoole/data/DepreciationMethod.csv
diff --git a/resources/otoole/data/DiscountRate.csv b/resources/otoole/data/DiscountRate.csv
diff --git a/resources/otoole/data/DiscountRateStorage.csv b/resources/otoole/data/DiscountRateStorage.csv
diff --git a/resources/otoole/data/EMISSION.csv b/resources/otoole/data/EMISSION.csv
diff --git a/resources/otoole/data/EmissionActivityRatio.csv b/resources/otoole/data/EmissionActivityRatio.csv
diff --git a/resources/otoole/data/EmissionsPenalty.csv b/resources/otoole/data/EmissionsPenalty.csv
diff --git a/resources/otoole/data/FUEL.csv b/resources/otoole/data/FUEL.csv
diff --git a/resources/otoole/data/FixedCost.csv b/resources/otoole/data/FixedCost.csv
diff --git a/resources/otoole/data/InputActivityRatio.csv b/resources/otoole/data/InputActivityRatio.csv
diff --git a/resources/otoole/data/MODE_OF_OPERATION.csv b/resources/otoole/data/MODE_OF_OPERATION.csv
diff --git a/resources/otoole/data/MinStorageCharge.csv b/resources/otoole/data/MinStorageCharge.csv
diff --git a/resources/otoole/data/ModelPeriodEmissionLimit.csv b/resources/otoole/data/ModelPeriodEmissionLimit.csv
diff --git a/resources/otoole/data/ModelPeriodExogenousEmission.csv b/resources/otoole/data/ModelPeriodExogenousEmission.csv
diff --git a/resources/otoole/data/OperationalLife.csv b/resources/otoole/data/OperationalLife.csv
diff --git a/resources/otoole/data/OperationalLifeStorage.csv b/resources/otoole/data/OperationalLifeStorage.csv
diff --git a/resources/otoole/data/OutputActivityRatio.csv b/resources/otoole/data/OutputActivityRatio.csv
diff --git a/resources/otoole/data/REGION.csv b/resources/otoole/data/REGION.csv
diff --git a/resources/otoole/data/REMinProductionTarget.csv b/resources/otoole/data/REMinProductionTarget.csv
diff --git a/resources/otoole/data/RETagFuel.csv b/resources/otoole/data/RETagFuel.csv
diff --git a/resources/otoole/data/RETagTechnology.csv b/resources/otoole/data/RETagTechnology.csv
diff --git a/resources/otoole/data/ReserveMargin.csv b/resources/otoole/data/ReserveMargin.csv
diff --git a/resources/otoole/data/ReserveMarginTagFuel.csv b/resources/otoole/data/ReserveMarginTagFuel.csv
diff --git a/resources/otoole/data/ReserveMarginTagTechnology.csv b/resources/otoole/data/ReserveMarginTagTechnology.csv
diff --git a/resources/otoole/data/ResidualCapacity.csv b/resources/otoole/data/ResidualCapacity.csv
diff --git a/resources/otoole/data/ResidualStorageCapacity.csv b/resources/otoole/data/ResidualStorageCapacity.csv
diff --git a/resources/otoole/data/SEASON.csv b/resources/otoole/data/SEASON.csv
diff --git a/resources/otoole/data/STORAGE.csv b/resources/otoole/data/STORAGE.csv
diff --git a/resources/otoole/data/SpecifiedAnnualDemand.csv b/resources/otoole/data/SpecifiedAnnualDemand.csv
diff --git a/resources/otoole/data/SpecifiedDemandProfile.csv b/resources/otoole/data/SpecifiedDemandProfile.csv
diff --git a/resources/otoole/data/StorageLevelStart.csv b/resources/otoole/data/StorageLevelStart.csv
diff --git a/resources/otoole/data/StorageMaxChargeRate.csv b/resources/otoole/data/StorageMaxChargeRate.csv
diff --git a/resources/otoole/data/StorageMaxDischargeRate.csv b/resources/otoole/data/StorageMaxDischargeRate.csv
diff --git a/resources/otoole/data/TECHNOLOGY.csv b/resources/otoole/data/TECHNOLOGY.csv
diff --git a/resources/otoole/data/TIMESLICE.csv b/resources/otoole/data/TIMESLICE.csv
diff --git a/resources/otoole/data/TechnologyFromStorage.csv b/resources/otoole/data/TechnologyFromStorage.csv
diff --git a/resources/otoole/data/TechnologyToStorage.csv b/resources/otoole/data/TechnologyToStorage.csv
diff --git a/resources/otoole/data/TotalAnnualMaxCapacity.csv b/resources/otoole/data/TotalAnnualMaxCapacity.csv
diff --git a/resources/otoole/data/TotalAnnualMaxCapacityInvestment.csv b/resources/otoole/data/TotalAnnualMaxCapacityInvestment.csv
diff --git a/resources/otoole/data/TotalAnnualMinCapacity.csv b/resources/otoole/data/TotalAnnualMinCapacity.csv
diff --git a/resources/otoole/data/TotalAnnualMinCapacityInvestment.csv b/resources/otoole/data/TotalAnnualMinCapacityInvestment.csv
diff --git a/resources/otoole/data/TotalTechnologyAnnualActivityLowerLimit.csv b/resources/otoole/data/TotalTechnologyAnnualActivityLowerLimit.csv
diff --git a/resources/otoole/data/TotalTechnologyAnnualActivityUpperLimit.csv b/resources/otoole/data/TotalTechnologyAnnualActivityUpperLimit.csv
diff --git a/resources/otoole/data/TotalTechnologyModelPeriodActivityLowerLimit.csv b/resources/otoole/data/TotalTechnologyModelPeriodActivityLowerLimit.csv
diff --git a/resources/otoole/data/TotalTechnologyModelPeriodActivityUpperLimit.csv b/resources/otoole/data/TotalTechnologyModelPeriodActivityUpperLimit.csv
diff --git a/resources/otoole/data/TradeRoute.csv b/resources/otoole/data/TradeRoute.csv
diff --git a/resources/otoole/data/VariableCost.csv b/resources/otoole/data/VariableCost.csv
diff --git a/resources/otoole/data/YEAR.csv b/resources/otoole/data/YEAR.csv
diff --git a/resources/otoole/data/YearSplit.csv b/resources/otoole/data/YearSplit.csv
diff --git 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
@@ -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")