Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

291 industrial wastewater processing #2836

Merged
merged 5 commits into from
Feb 16, 2025
Merged

291 industrial wastewater processing #2836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
df24ad2
added activity
ayeshmcg Feb 11, 2025
d869060
chore: added test, schema and fixed migration
ayeshmcg Feb 12, 2025
7df4af9
chore: removed console
ayeshmcg Feb 13, 2025
fa95da8
chore: fixed errors
ayeshmcg Feb 13, 2025
8555391
chore: fixed methodlogy name
ayeshmcg Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions bc_obps/reporting/json_schemas/2024/industrial_water_processing/activity.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"title": "Industrial wastewater processing",
"type": "object",
"properties": {}
}
31 changes: 31 additions & 0 deletions bc_obps/reporting/json_schemas/2024/industrial_water_processing/oil_water_separators.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"type": "object",
"title": "Oil-water separators",
"default": { "emissions": [{}] },
"properties": {
"emissions": {
"type": "array",
"items": {
"type": "object",
"properties": {
"emission": {
"title": "Emission",
"type": "number",
"minimum": 0
},
"gasType": {
"title": "Gas Type",
"type": "string",
"enum": []
},
"equivalentEmission": {
"title": "Equivalent Emission",
"type": "string",
"readOnly": true,
"default": "Value will be computed upon saving"
}
}
}
}
}
}
31 changes: 31 additions & 0 deletions .../json_schemas/2024/industrial_water_processing/wastewater_processing_using_anaerobic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"type": "object",
"title": "Industrial wastewater process using anaerobic digestion",
"default": { "emissions": [{}] },
"properties": {
"emissions": {
"type": "array",
"items": {
"type": "object",
"properties": {
"emission": {
"title": "Emission",
"type": "number",
"minimum": 0
},
"gasType": {
"title": "Gas Type",
"type": "string",
"enum": []
},
"equivalentEmission": {
"title": "Equivalent Emission",
"type": "string",
"readOnly": true,
"default": "Value will be computed upon saving"
}
}
}
}
}
}
26 changes: 26 additions & 0 deletions bc_obps/reporting/migrations/0008_prod_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,11 @@ def init_methodology_data(apps, schema_monitor):
Methodology(name='Anode Consumption - Soderberg'),
Methodology(name='Anode/Cathode Baking'),
Methodology(name='Green Coke Calcination'),
Methodology(name='Chemical Oxygen Demand'),
Methodology(name='Biochemical Oxygen Demand'),
Methodology(name='Nitrogen in effluent'),
Methodology(name='Default conversion factor'),
Methodology(name='Measured conversion factor'),
]
)

Expand Down Expand Up @@ -616,6 +621,11 @@ def reverse_init_methodology_data(apps, schema_monitor):
'Anode Consumption - Soderberg',
'Anode/Cathode Baking',
'Green Coke Calcination',
'Chemical Oxygen Demand',
'Biochemical Oxygen Demand',
'Nitrogen in effluent',
'Default conversion factor',
'Measured conversion factor',
]
).delete()

Expand Down Expand Up @@ -692,6 +702,18 @@ def init_reporting_field_data(apps, schema_monitor):
ReportingField(
field_name='Unit-Fuel-N2O Measured Emission Factor', field_type='number', field_units='kg/fuel units'
),
ReportingField(
field_name='Average of Quarterly chemical oxygen demand', field_type='number', field_units='kg/m3'
),
ReportingField(
field_name='Average of Quarterly five-day biochemical oxygen demand',
field_type='number',
field_units='kg/m3',
),
ReportingField(
field_name='Average of Quarterly Nitrogen in effluent', field_type='number', field_units='kg/N m3'
),
ReportingField(field_name='Measured conversion factor', field_type='number', field_units='kgCH4/kgNMHC'),
ReportingField(field_name='Annual Weighted Average Carbon Content', field_type='number', field_units=None),
ReportingField(
field_name='Annual Weighted Average Molecular Weight', field_type='number', field_units=None
Expand Down Expand Up @@ -805,6 +827,10 @@ def reverse_init_reporting_field_data(apps, schema_monitor):
'Overvoltage Methodology',
'Overvoltage Emission Factor',
'Last Date of Overvoltage Emission Factor Measurement',
'Average of Quarterly chemical oxygen demand'
'Average of Quarterly five-day biochemical oxygen demand'
'Average of Quarterly Nitrogen in effluent'
'Measured conversion factor',
]
).delete()

Expand Down
392 changes: 392 additions & 0 deletions bc_obps/reporting/migrations/0062_industrial_water_processing.py
View file
Open in desktop

Large diffs are not rendered by default.

129 changes: 129 additions & 0 deletions ...ps/reporting/tests/models/program_configuration_tests/test_electricity_generation_2024.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
from django.test import TestCase
from .base_program_configuration_test import BaseProgramConfigurationTest


class ElectricityGeneration2024Test(BaseProgramConfigurationTest, TestCase):
@classmethod
def setUpTestData(cls):
cls.activity_name = "Electricity generation"
cls.year = 2024
cls.config_element_count = 69
cls.config = {
"Fuel combustion for electricity generation": {
"CO2": {
"Alternative Parameter Measurement Methodology": 0,
"Replacement Methodology": 0,
"CEMS": 0,
"Measured CC and MW": 3,
},
'CH4': {
'Default HHV/Default EF': 2,
'Default EF': 1,
'Measured HHV/Default EF': 2,
'Measured EF': 1,
'Measured Steam/Default EF': 3,
'Heat Input/Default EF': 2,
'Alternative Parameter Measurement Methodology': 1,
'Replacement Methodology': 1,
},
'N2O': {
'Default HHV/Default EF': 2,
'Default EF': 1,
'Measured HHV/Default EF': 2,
'Measured EF': 1,
'Measured Steam/Default EF': 3,
'Heat Input/Default EF': 2,
'Alternative Parameter Measurement Methodology': 1,
'Replacement Methodology': 1,
},
},
"Acid gas scrubbers and acid gas reagents": {
"CO2": {
"Alternative Parameter Measurement Methodology": 1,
"Replacement Methodology": 1,
"Acid gas": 0,
},
},
"Cooling units": {
"HFC-125 (C2HF5)": {
"Alternative Parameter Measurement Methodology": 1,
"Replacement Methodology": 1,
"Mass balance": 0,
},
"HFC-134a (C2H2F4)": {
"Alternative Parameter Measurement Methodology": 1,
"Replacement Methodology": 1,
"Mass balance": 0,
},
"HFC-134 (C2H2F4)": {
"Alternative Parameter Measurement Methodology": 1,
"Replacement Methodology": 1,
"Mass balance": 0,
},
"HFC-143a (C2H3F3)": {
"Alternative Parameter Measurement Methodology": 1,
"Replacement Methodology": 1,
"Mass balance": 0,
},
"HFC-143 (C2H3F3)": {
"Alternative Parameter Measurement Methodology": 1,
"Replacement Methodology": 1,
"Mass balance": 0,
},
"HFC-152a (C2H4F2)": {
"Alternative Parameter Measurement Methodology": 1,
"Replacement Methodology": 1,
"Mass balance": 0,
},
"HFC-227ea (C3HF7)": {
"Alternative Parameter Measurement Methodology": 1,
"Replacement Methodology": 1,
"Mass balance": 0,
},
"HFC-236fa (C3H2F6)": {
"Alternative Parameter Measurement Methodology": 1,
"Replacement Methodology": 1,
"Mass balance": 0,
},
"HFC-23 (CHF3)": {
"Alternative Parameter Measurement Methodology": 1,
"Replacement Methodology": 1,
"Mass balance": 0,
},
"HFC-245ca (C3H3F5)": {
"Alternative Parameter Measurement Methodology": 1,
"Replacement Methodology": 1,
"Mass balance": 0,
},
"HFC-32 (CH2F2)": {
"Alternative Parameter Measurement Methodology": 1,
"Replacement Methodology": 1,
"Mass balance": 0,
},
"HFC-41 (CH3F)": {
"Alternative Parameter Measurement Methodology": 1,
"Replacement Methodology": 1,
"Mass balance": 0,
},
"HFC-43-10mee (C5H2F10)": {
"Alternative Parameter Measurement Methodology": 1,
"Replacement Methodology": 1,
"Mass balance": 0,
},
},
"Geothermal geyser steam or fluids": {
"CO2": {
"Alternative Parameter Measurement Methodology": 1,
"Replacement Methodology": 1,
"Measured heat": 0,
},
},
"Installation, maintenance, operation and decommissioning of electrical equipment": {
"SF6": {
"Alternative Parameter Measurement Methodology": 1,
"Replacement Methodology": 1,
"Mass balance": 0,
"Direct measurement": 0,
},
},
}
33 changes: 33 additions & 0 deletions ...porting/tests/models/program_configuration_tests/test_industrial_water_processing_2024.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
from django.test import TestCase
from .base_program_configuration_test import BaseProgramConfigurationTest


class IndustrialWasterWaterProcessing2024Test(BaseProgramConfigurationTest, TestCase):
@classmethod
def setUpTestData(cls):
cls.activity_name = "Industrial wastewater processing"
cls.year = 2024
cls.config_element_count = 11
cls.config = {
"Industrial wastewater process using anaerobic digestion": {
"CH4": {
"Chemical Oxygen Demand": 1,
"Biochemical Oxygen Demand": 1,
"Alternative Parameter Measurement Methodology": 1,
"Replacement Methodology": 1,
},
"N2O": {
"Nitrogen in effluent": 1,
"Alternative Parameter Measurement Methodology": 1,
"Replacement Methodology": 1,
},
},
"Oil-water separators": {
"CH4": {
"Default conversion factor": 0,
"Measured conversion factor": 1,
"Alternative Parameter Measurement Methodology": 1,
"Replacement Methodology": 1,
},
},
}
5 changes: 5 additions & 0 deletions bc_obps/reporting/tests/models/test_methodology.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@ def test_methodology_initial_data(self):
"WCI.363 (g.1)(ii)",
"2009 API Compendium",
"Other Methodology",
'Chemical Oxygen Demand',
'Biochemical Oxygen Demand',
'Nitrogen in effluent',
'Default conversion factor',
'Measured conversion factor',
"WCI.363 (c)",
"WCI.363 (l)",
"WCI.363 (m)",
Expand Down
Loading
Loading