Merge pull request #205 from OSeMOSYS/issue-194

Link Snakemake to otoole config file
OSeMOSYS · Oct 6, 2024 · 822f272 · 822f272
2 parents 67c5160 + c675182
commit 822f272
Show file tree

Hide file tree

Showing 71 changed files with 155 additions and 220 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
@@ -1,25 +1,17 @@
 import os
 import shutil
 
-# REQUIRED 
-
-configfile: 'config/config.yaml'
-
-# OUTPUT FILES 
-
-osemosys_files = os.listdir('resources/otoole/data')
-
 # RULES
 
 rule geographic_filter:
     message:
         'Applying geographic filter...'
     input: 
-        csv_files = expand('results/data/{osemosys_file}', osemosys_file = osemosys_files),
+        csv_files = expand('results/data/{csv}.csv', csv = OTOOLE_PARAMS),
     params:
         geographic_scope = config['geographic_scope']
     output:
-        csv_files = expand('results/{{scenario}}/data/{osemosys_file}', osemosys_file = osemosys_files),
+        csv_files = expand('results/{{scenario}}/data/{csv}.csv', csv = OTOOLE_PARAMS),
     # conda:
     #     '../envs/data_processing.yaml'
     log:
@@ -31,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:
@@ -54,7 +46,7 @@ rule otoole_convert:
         csv_dir = 'results/{scenario}/data/'
     input:
         otoole_config = 'results/{scenario}/otoole.yaml',
-        csv_files = expand('results/{{scenario}}/data/{osemosys_file}', osemosys_file = osemosys_files),
+        csv_files = expand('results/{{scenario}}/data/{csv}.csv', csv = OTOOLE_PARAMS),
     output:
         data_file = 'results/{scenario}/{scenario}.txt'
     log:

diff --git a/workflow/rules/postprocess.smk b/workflow/rules/postprocess.smk
@@ -1,36 +1,7 @@
 import os
 
-# REQUIRED 
-
-configfile: 'config/config.yaml'
-
 # OUTPUT FILES 
 
-result_files = [
-    'AccumulatedNewCapacity.csv',
-    'AnnualEmissions.csv',
-    'AnnualFixedOperatingCost.csv',
-    'AnnualTechnologyEmission.csv',
-    'AnnualTechnologyEmissionByMode.csv',
-    'AnnualVariableOperatingCost.csv',
-    # 'CapitalInvestment.csv',
-    'Demand.csv',
-    'DiscountedTechnologyEmissionsPenalty.csv',
-    'NewCapacity.csv',
-    'ProductionByTechnology.csv',
-    'ProductionByTechnologyAnnual.csv',
-    'RateOfActivity.csv',
-    'RateOfProductionByTechnology.csv',
-    'RateOfProductionByTechnologyByMode.csv',
-    'RateOfUseByTechnology.csv',
-    'RateOfUseByTechnologyByMode.csv',
-    'TotalAnnualTechnologyActivityByMode.csv',
-    'TotalCapacityAnnual.csv',
-    'TotalTechnologyAnnualActivity.csv',
-    'TotalTechnologyModelPeriodActivity.csv',
-    'UseByTechnology.csv'
-]
-
 result_figures = [
     'TotalCapacityAnnual', 
     'GenerationAnnual',
@@ -50,7 +21,7 @@ rule otoole_results:
         datafile = 'results/{scenario}/{scenario}.txt',
         otoole_config = 'results/{scenario}/otoole.yaml',
     output:
-        expand('results/{{scenario}}/results/{result_file}', result_file = result_files),
+        expand('results/{{scenario}}/results/{result_file}.csv', result_file = OTOOLE_RESULTS),
     # conda:
     #     '../envs/otoole.yaml'
     log:
@@ -68,7 +39,7 @@ rule visualisation:
     message:
         'Generating result figures...'
     input:
-        csv_files = expand('results/{{scenario}}/results/{result_file}', result_file = result_files),
+        csv_files = expand('results/{{scenario}}/results/{result_file}.csv', result_file = OTOOLE_RESULTS),
     params:
         input_data = "results/{scenario}/data/",
         result_data = "results/{scenario}/results/",
@@ -88,7 +59,7 @@ rule summarise_results:
     message:
         'Generating summary of results...'
     input:
-        csv_files = expand('results/{{scenario}}/results/{result_file}', result_file = result_files),
+        csv_files = expand('results/{{scenario}}/results/{result_file}.csv', result_file = OTOOLE_RESULTS),
     params:
         start_year = config['startYear'],
         end_year = config['endYear'],