From 600f4ff5ace9470f0d51fa0ecf89624b16c0390d Mon Sep 17 00:00:00 2001
From: Rendani Gangazhe <rendanig@gmail.com>
Date: Wed, 31 May 2023 13:00:32 +0200
Subject: [PATCH] Compare energy usage to number of light bulbs running

---
 .../CarbonEmissions/CarbonEmissions.vue        | 18 +++++++++---------
 .../CarbonEmissions/carbonEmissionConstants.js |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/client/src/components/JobMetrics/CarbonEmissions/CarbonEmissions.vue b/client/src/components/JobMetrics/CarbonEmissions/CarbonEmissions.vue
index b09de16f15a..b91bbe46a26 100644
--- a/client/src/components/JobMetrics/CarbonEmissions/CarbonEmissions.vue
+++ b/client/src/components/JobMetrics/CarbonEmissions/CarbonEmissions.vue
@@ -43,7 +43,7 @@ const carbonEmissions = computed(() => {
     const powerNeededMemory = powerUsageEffectiveness * memoryAllocatedInGibibyte * memoryPowerUsed;
     const totalPowerNeeded = powerNeededCpu + powerNeededMemory;
 
-    // Energy needed. Convert kWh to kW
+    // Energy needed. Convert Watt to kWh
     const energyNeededCPU = (runtimeInHours * powerNeededCpu) / 1000;
     const energyNeededMemory = (runtimeInHours * powerNeededMemory) / 1000;
     const totalEnergyNeeded = (runtimeInHours * totalPowerNeeded) / 1000;
@@ -70,13 +70,13 @@ const carbonEmissionsComparisons = computed(() => {
         return;
     }
 
-    const { totalCarbonEmissions } = carbonEmissions.value;
+    const { totalCarbonEmissions, totalEnergyNeeded } = carbonEmissions.value;
 
     const {
         averagePassengerCarEmissionsEU,
         averagePassengerCarEmissionsUS,
         gasolineCarbonEmissions,
-        ledCarbonEmissionSavings,
+        lightbulbEnergyUsage,
         smartphonesChargedCarbonEmissions,
         treeYear,
     } = carbonEmissionsConstants;
@@ -123,13 +123,13 @@ const carbonEmissionsComparisons = computed(() => {
         icon: "car",
     };
 
-    const incandescentLampsSwitchedToLEDs: CarbonComparison = {
-        heading: "LEDs running for a year",
+    const lightbulbsRunning: CarbonComparison = {
+        heading: "Light bulbs running",
         explanation:
-            "Amount of CO2e you could have saved had you switched incandescent lights to LEDs and run them for a year",
+            "The amount of incandescent light bulbs you could have powered given your job's energy usage",
         value: prettyPrintValue({
-            value: parseFloat((totalCarbonEmissions / (ledCarbonEmissionSavings * 1e6)).toFixed(3)),
-            threshold: 1e-3,
+            value: parseFloat((totalEnergyNeeded / lightbulbEnergyUsage).toFixed(3)),
+            threshold: 1,
         }),
         icon: "lightbulb",
     };
@@ -158,7 +158,7 @@ const carbonEmissionsComparisons = computed(() => {
         gasolineConsumed,
         drivingInEU,
         drivingInUS,
-        incandescentLampsSwitchedToLEDs,
+        lightbulbsRunning,
         smartphonesCharged,
         treeMonths,
     ];
diff --git a/client/src/components/JobMetrics/CarbonEmissions/carbonEmissionConstants.js b/client/src/components/JobMetrics/CarbonEmissions/carbonEmissionConstants.js
index 9e0f57beef2..03756da2b33 100644
--- a/client/src/components/JobMetrics/CarbonEmissions/carbonEmissionConstants.js
+++ b/client/src/components/JobMetrics/CarbonEmissions/carbonEmissionConstants.js
@@ -10,8 +10,8 @@ export const barrelOfOilCarbonEmissions = 0.43;
 // source: (in grams) https://www.epa.gov/energy/greenhouse-gases-equivalencies-calculator-calculations-and-references#gasoline
 export const gasolineCarbonEmissions = 8887;
 
-// source  (in metric tons) https://www.epa.gov/energy/greenhouse-gases-equivalencies-calculator-calculations-and-references#lights
-export const ledCarbonEmissionSavings = 2.64e-2;
+// source  (in kWh) https://www.epa.gov/energy/greenhouse-gases-equivalencies-calculator-calculations-and-references#lights
+export const lightbulbEnergyUsage = 43 / 1000;
 
 // source: (in W/GB) http://dl.acm.org/citation.cfm?doid=3076113.3076117 and https://www.tomshardware.com/uk/reviews/intel-core-i7-5960x-haswell-e-cpu,3918-13.html
 export const memoryPowerUsage = 0.3725;