Skip to content

Commit 7d84e12

Browse files
committed
fix: remove emissions domain filter for loads
1 parent 0326da9 commit 7d84e12

File tree

2 files changed

+1
-34
lines changed

2 files changed

+1
-34
lines changed

data/calculate-carbon-intensity.js

-31
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ export default function({
3636
isWemOrAu
3737
}) {
3838

39-
// console.log('calculate EI', emissionsDomains, powerEnergyDomains, domainPowerEnergy)
40-
41-
const timeCheck = 1696140000000
42-
const shouldTimeCheck = false
43-
4439
/**
4540
when viewing generation:
4641
sum(all emissions from visible sources except imports) / energy from all of the above
@@ -73,15 +68,6 @@ export default function({
7368
}
7469

7570
const getPowerEnergy = (data, domain) => {
76-
// return value if category is source or exports
77-
// if (domain.category === 'source' || _includes(domain.id, 'exports')) {
78-
// return data[domain.id] || 0
79-
// }
80-
return data[domain.id] || 0
81-
}
82-
83-
const getPowerEnergy2 = (data, domain) => {
84-
// test only
8571
return data[domain.id] || 0
8672
}
8773

@@ -116,28 +102,15 @@ export default function({
116102
emissionsDomains.forEach((domain) => {
117103
totalEmissions += getEmissions(d, domain)
118104

119-
if (shouldTimeCheck && d.time === timeCheck) {
120-
console.log(`emissions,${domain.id},${getEmissions(d, domain)}`)
121-
}
122-
123105
if (domain.category !== 'load') {
124106
totalEmissionsMinusLoads += getEmissions(d, domain)
125107
}
126108
})
127109

128110
powerEnergyDomains.forEach((domain) => {
129111
totalPowerEnergy += getPowerEnergy(d, domain)
130-
131-
if (shouldTimeCheck && d.time === timeCheck) {
132-
console.log(`power,${domain.id},${getPowerEnergy2(d, domain)}`)
133-
}
134112
})
135113

136-
if (shouldTimeCheck && d.time === timeCheck) {
137-
console.log('totalEmissions', totalEmissions)
138-
console.log('totalPowerEnergy', totalPowerEnergy)
139-
}
140-
141114
const totalPowerEnergyMinusBatteryDischarging =
142115
totalPowerEnergy - totalBatteryDischarging
143116

@@ -159,10 +132,6 @@ export default function({
159132
}
160133
}
161134

162-
if (shouldTimeCheck && d.time === timeCheck) {
163-
console.log('EI', ei)
164-
}
165-
166135
const isValidEI = Number.isFinite(ei)
167136

168137
if (ei < 0 || ei > 1500) {

pages/energy/_region/index.vue

+1-3
Original file line numberDiff line numberDiff line change
@@ -298,9 +298,7 @@ export default {
298298
},
299299
300300
emissionsDomains() {
301-
const domains = this.currentDomainEmissions.filter(
302-
(d) => d.category !== FT.LOAD || d.fuelTech === FT.EXPORTS
303-
)
301+
const domains = this.currentDomainEmissions
304302
const hidden = this.hiddenFuelTechs
305303
return domains
306304
? domains.filter((d) => !_includes(hidden, d[this.property]))

0 commit comments

Comments
 (0)