correct otoole config

OSeMOSYS · Nov 13, 2024 · f4d0425 · f4d0425
1 parent 5b2f89e
commit f4d0425
Showing 1 changed file with 46 additions and 10 deletions.
diff --git a/resources/otoole.yaml b/resources/otoole.yaml
@@ -322,6 +322,12 @@ AnnualTechnologyEmission:
     type: result
     dtype: float
     default: 0
+AnnualTechnologyEmissionsPenalty:
+    indices: [REGION, TECHNOLOGY, YEAR]
+    type: result
+    dtype: float
+    default: 0
+    short_name: AnnualTechEmissionsPenalty
 AnnualTechnologyEmissionByMode:
     indices: [REGION, TECHNOLOGY, EMISSION, MODE_OF_OPERATION, YEAR]
     type: result
@@ -332,13 +338,13 @@ AnnualVariableOperatingCost:
     type: result
     dtype: float
     default: 0
-CapitalInvestmentStorage:
-    indices: [REGION, STORAGE, YEAR]
+CapitalInvestment:
+    indices: [REGION, TECHNOLOGY, YEAR]
     type: result
     dtype: float
     default: 0
-CapitalInvestment:
-    indices: [REGION, TECHNOLOGY, YEAR]
+CapitalInvestmentStorage:
+    indices: [REGION, STORAGE, YEAR]
     type: result
     dtype: float
     default: 0
@@ -347,14 +353,14 @@ Demand:
     type: result
     dtype: float
     default: 0
-DiscountedCapitalInvestmentStorage:
-    short_name: DiscountedCapitalInvestStorage
-    indices: [REGION, STORAGE, YEAR]
+DiscountedCapitalInvestment:
+    indices: [REGION, TECHNOLOGY, YEAR]
     type: result
     dtype: float
     default: 0
-DiscountedCapitalInvestment:
-    indices: [REGION, TECHNOLOGY, YEAR]
+DiscountedCapitalInvestmentStorage:
+    short_name: DiscountedCapitalInvestStorage
+    indices: [REGION, STORAGE, YEAR]
     type: result
     dtype: float
     default: 0
@@ -368,7 +374,7 @@ DiscountedCostByTechnology:
     type: result
     dtype: float
     default: 0
-DiscountedOperationalCost:
+DiscountedOperatingCost:
     indices: [REGION, TECHNOLOGY, YEAR]
     type: result
     dtype: float
@@ -389,6 +395,21 @@ DiscountedTechnologyEmissionsPenalty:
     type: result
     dtype: float
     default: 0
+ModelPeriodEmissions:
+    indices: [REGION, EMISSION]
+    type: result
+    dtype: float
+    default: 0
+NetChargeWithinDay:
+    indices: [REGION, STORAGE, SEASON, DAYTYPE, DAILYTIMEBRACKET, YEAR]
+    type: result
+    dtype: float
+    default: 0
+NetChargeWithinYear:
+    indices: [REGION, STORAGE, SEASON, DAYTYPE, DAILYTIMEBRACKET, YEAR]
+    type: result
+    dtype: float
+    default: 0
 NewCapacity:
     indices: [REGION, TECHNOLOGY, YEAR]
     type: result
@@ -404,6 +425,11 @@ NumberOfNewTechnologyUnits:
     type: result
     dtype: float
     default: 0
+OperatingCost: 
+    indices: [REGION, TECHNOLOGY, YEAR]
+    type: result
+    dtype: float
+    default: 0
 ProductionByTechnology:
     indices: [REGION, TIMESLICE, TECHNOLOGY, FUEL, YEAR]
     type: result
@@ -475,6 +501,16 @@ StorageLevelYearFinish:
     type: result
     dtype: float
     default: 0
+StorageLowerLimit:
+    indices: [REGION, STORAGE, YEAR]
+    type: result
+    dtype: float
+    default: 0
+StorageUpperLimit:
+    indices: [REGION, STORAGE, YEAR]
+    type: result
+    dtype: float
+    default: 0
 TotalAnnualTechnologyActivityByMode:
     short_name: TotalAnnualTechActivityByMode
     indices: [REGION, TECHNOLOGY, MODE_OF_OPERATION, YEAR]