Skip to content

Commit

Permalink
Adding new fuel variables
Browse files Browse the repository at this point in the history
  • Loading branch information
@romainsacchi
romainsacchi committed Dec 8, 2023
1 parent bff33a0 commit 6e2c79d
Show file tree
Hide file tree
Showing 2 changed files with 221 additions and 1 deletion.
52 changes: 52 additions & 0 deletions premise/data/utils/logging/logconfig.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@ handlers:
formatter: simple
mode: w

file_biomass:
class: logging.FileHandler
level: INFO
filename: "export/logs/premise_biomass.log"
encoding: utf8
formatter: simple
mode: w

file_electricity:
class: logging.FileHandler
level: INFO
Expand All @@ -32,6 +40,14 @@ handlers:
formatter: simple
mode: w

file_metal:
class: logging.FileHandler
level: INFO
filename: "export/logs/premise_metal.log"
encoding: utf8
formatter: simple
mode: w

file_cement:
class: logging.FileHandler
level: INFO
Expand All @@ -48,6 +64,14 @@ handlers:
formatter: simple
mode: w

file_heat:
class: logging.FileHandler
level: INFO
filename: "export/logs/premise_heat.log"
encoding: utf8
formatter: simple
mode: w

file_emissions:
class: logging.FileHandler
level: INFO
Expand All @@ -64,12 +88,25 @@ handlers:
formatter: simple
mode: w

file_validation:
class: logging.FileHandler
level: INFO
filename: "export/logs/premise_validation.log"
encoding: utf8
formatter: simple
mode: w

loggers:
dac:
level: INFO
handlers: [file_dac]
propagate: False

biomass:
level: INFO
handlers: [ file_biomass ]
propagate: False

electricity:
level: INFO
handlers: [ file_electricity ]
Expand All @@ -80,6 +117,11 @@ loggers:
handlers: [ file_steel ]
propagate: False

metal:
level: INFO
handlers: [ file_metal ]
propagate: False

cement:
level: INFO
handlers: [ file_cement ]
Expand All @@ -90,6 +132,11 @@ loggers:
handlers: [ file_fuel ]
propagate: False

heat:
level: INFO
handlers: [ file_heat ]
propagate: False

emissions:
level: INFO
handlers: [ file_emissions ]
Expand All @@ -99,3 +146,8 @@ loggers:
level: INFO
handlers: [ file_external ]
propagate: False

validation:
level: INFO
handlers: [ file_validation ]
propagate: False
170 changes: 169 additions & 1 deletion premise/data/utils/logging/reporting.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,42 @@ premise_dac:
unit: MJ/kg
tab: Direct Air Capture

premise_biomass:
columns:
timestamp:
name: timestamp
description: Timestamp of the log entry
module:
name: module
description: Module name
level:
name: level
description: Log level
status:
name: status
description: Status of the dataset
model:
name: model
description: IAM model name
pathway:
name: pathway
description: Pathway name
year:
name: year
description: Year
dataset:
name: dataset
description: Dataset name
region:
name: region
description: Region name
biomass share:
name: Biomass share
description: Share of biomass from forestry residues vs. purpose-grown biomass
unit: 0-1

tab: Biomass

premise_electricity:
columns:
timestamp:
Expand Down Expand Up @@ -186,6 +222,53 @@ premise_steel:
unit: 0-1
tab: Steel

premise_metal:
columns:
timestamp:
name: timestamp
description: Timestamp of the log entry
module:
name: module
description: Module name
level:
name: level
description: Log level
status:
name: status
description: Status of the dataset
model:
name: model
description: IAM model name
pathway:
name: pathway
description: Pathway name
year:
name: year
description: Year
dataset:
name: dataset
description: Dataset name
product:
name: reference product
description: Product
region:
name: region
description: Region name
post-allocation correction:
name: Post-allocation correction
description: Correction factor applied to the initial amount of metal produced
unit: kilogram
old amount:
name: Old amount
description: Amount of metal used before adjustment
unit: kilogram
new amount:
name: New amount
description: Amount of metal used after adjustment
unit: kilogram

tab: Metal

premise_cement:
columns:
timestamp:
Expand Down Expand Up @@ -355,6 +438,54 @@ premise_fuel:
description: Average lower heating value of the fuel blend (MJ/kg)
unit: MJ/kg
tab: Fuel

premise_heat:
columns:
timestamp:
name: timestamp
description: Timestamp of the log entry
module:
name: module
description: Module name
level:
name: level
description: Log level
status:
name: status
description: Status of the dataset
model:
name: model
description: IAM model name
pathway:
name: pathway
description: Pathway name
year:
name: year
description: Year
dataset:
name: dataset
description: Dataset name
region:
name: region
description: Region name
initial amount of fossil CO2:
name: Initial amount of fossil CO2
description: Amount of fossil CO2 emitted per unit of activity before adjustment
unit: kg CO2/reference flow
new amount of fossil CO2:
name: New amount of fossil CO2
description: Amount of fossil CO2 emitted per unit of activity after adjustment
unit: kg CO2/reference flow
initial amount of biogenic CO2:
name: Initial amount of biogenic CO2
description: Amount of biogenic CO2 emitted per unit of activity before adjustment
unit: kg CO2/reference flow
new amount of biogenic CO2:
name: New amount of biogenic CO2
description: Amount of biogenic CO2 emitted per unit of activity after adjustment
unit: kg CO2/reference flow
tab: Heat

premise_emissions:
columns:
timestamp:
Expand Down Expand Up @@ -461,4 +592,41 @@ premise_external_scenarios:
region:
name: region
description: Region name
tab: External scenarios
tab: External scenarios

premise_validation:
columns:
timestamp:
name: timestamp
description: Timestamp of the log entry
module:
name: module
description: Module name
level:
name: level
description: Log level
model:
name: model
description: IAM model name
pathway:
name: pathway
description: Pathway name
year:
name: year
description: Year
name:
name: name
description: Name of the dataset
reference product:
name: reference product
description: Reference product
location:
name: location
description: Location
reason:
name: reason
description: Reason for anomaly
message:
name: message
description: Message
tab: Validation

0 comments on commit 6e2c79d

Please sign in to comment.