From 49227795edccbb04aa8f165771a00f251033e8f1 Mon Sep 17 00:00:00 2001 From: Nicolas Perriault Date: Wed, 4 Dec 2024 08:55:12 +0100 Subject: [PATCH] refactor: move weaving elec_pppm to textile wellknown. (#843) The `elec_pppm` field in textile `processes.json` file was used by only one process: Weaving. The patch moves the weaving pick-per-meter consumption value to a static value in `Data.Textile.WellKnown`. --- data/textile/activities.json | 80 ------------------------------ data/textile/export.py | 1 - public/data/textile/processes.json | 80 ------------------------------ src/Data/Textile/Process.elm | 3 -- src/Data/Textile/Simulator.elm | 2 +- src/Data/Textile/WellKnown.elm | 7 +++ tests/Data/Textile/FormulaTest.elm | 1 - 7 files changed, 8 insertions(+), 166 deletions(-) diff --git a/data/textile/activities.json b/data/textile/activities.json index 9279d03a4..d00d04440 100644 --- a/data/textile/activities.json +++ b/data/textile/activities.json @@ -8,7 +8,6 @@ "step_usage": "Energie", "uuid": "elec-medium-region-asia", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null, @@ -24,7 +23,6 @@ "step_usage": "Energie", "uuid": "elec-medium-region-africa", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null, @@ -40,7 +38,6 @@ "step_usage": "Energie", "uuid": "elec-medium-region-middle-east", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null, @@ -56,7 +53,6 @@ "step_usage": "Energie", "uuid": "elec-medium-region-latin-america", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null, @@ -72,7 +68,6 @@ "step_usage": "Energie", "uuid": "elec-medium-region-north-america", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null, @@ -88,7 +83,6 @@ "step_usage": "Energie", "uuid": "53c7378e585cf74cea4837819be6e631", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null, @@ -104,7 +98,6 @@ "step_usage": "Energie", "uuid": "8bbc2475141687462993329f9b7c2ddf", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null, @@ -120,7 +113,6 @@ "step_usage": "Energie", "uuid": "d33cefdc558e3fe890174e6f1e205015", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null, @@ -136,7 +128,6 @@ "step_usage": "Energie", "uuid": "debdaaba938a58ac1ab0131e47186092", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null, @@ -152,7 +143,6 @@ "step_usage": "Energie", "uuid": "609797e4710a81c9903bc72c141ff191", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null, @@ -168,7 +158,6 @@ "step_usage": "Energie", "uuid": "d3287580187139b11ce76f80013510d0", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null, @@ -184,7 +173,6 @@ "step_usage": "Energie", "uuid": "e5f92d33532b4e649da2541b264fa363", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null, @@ -200,7 +188,6 @@ "step_usage": "Energie", "uuid": "ae9240745e54987338d2228c3be2a5ec", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null, @@ -216,7 +203,6 @@ "step_usage": "Energie", "uuid": "region-elec-west-europe", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null, @@ -232,7 +218,6 @@ "step_usage": "Energie", "uuid": "80ff4bc21a0e197ea3f69d809fd8d4f1", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null, @@ -248,7 +233,6 @@ "step_usage": "Energie", "uuid": "3c131d87f8dd997d14d2ffc3477f83e6", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null, @@ -264,7 +248,6 @@ "step_usage": "Energie", "uuid": "4968e9f8cf72cb72700d94b242048db0", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null, @@ -280,7 +263,6 @@ "step_usage": "Energie", "uuid": "4ee8150b0cbf3603e03345d780ba7a61", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null, @@ -296,7 +278,6 @@ "uuid": "elasthane-lycra", "unit": "kg", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.21292, "alias": null, @@ -340,7 +321,6 @@ "step_usage": "Matières", "uuid": "75b27555d86fe1c66686cdf4339efc89", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.21292, "alias": null, @@ -362,7 +342,6 @@ "step_usage": "Matières", "uuid": "4d81aa5f76872e1e4c0e1bb14b01e93b", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.21292, "alias": null, @@ -384,7 +363,6 @@ "step_usage": "Matières", "uuid": "6e442b958af0d26f85ecacce2eeb23d0", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.03097, "alias": null, @@ -406,7 +384,6 @@ "step_usage": "Matières", "uuid": "f32024fc5e736e01fa14321363900581", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.03097, "alias": null, @@ -430,7 +407,6 @@ "step_usage": "Matières", "uuid": "087896096b5bede914ef3ec1062b1c02", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.03097, "alias": null, @@ -458,7 +434,6 @@ "step_usage": "Matières", "uuid": "88a1395a1c61be31b0bc692e977dd10b", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.03097, "alias": null, @@ -480,7 +455,6 @@ "step_usage": "Matières", "uuid": "cf76c9e1872effbd04d49aec742e7952", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.07115, "alias": null, @@ -502,7 +476,6 @@ "step_usage": "Matières", "uuid": "wool-default", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.35, "alias": null, @@ -523,7 +496,6 @@ "step_usage": "Matières", "uuid": "wool-new", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.35, "alias": null, @@ -568,7 +540,6 @@ "step_usage": "Matières", "uuid": "a211822aabe83653a6079b9d5677daed", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.1675, "alias": null, @@ -592,7 +563,6 @@ "step_usage": "Matières", "uuid": "coton-bio", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.09511, "alias": null, @@ -615,7 +585,6 @@ "step_usage": "Matières", "uuid": "fa590941e8bbf72c8956b5c3ba793eb7", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.18106, "alias": null, @@ -637,7 +606,6 @@ "step_usage": "Matières", "uuid": "f89bba0c170190e003fa3f643591cca5", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.055, "alias": null, @@ -659,7 +627,6 @@ "step_usage": "Matières", "uuid": "993955be-5888-6f39-137c-56af8c5187c1", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.38696, "alias": null, @@ -708,7 +675,6 @@ "step_usage": "Matières", "uuid": "9c6ab710-4a08-c720-cede-24428a013fda", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.17842, "alias": null, @@ -757,7 +723,6 @@ "step_usage": "Tissage / Tricotage", "uuid": "9c478d79-ff6b-45e1-9396-c3bd897faa1d", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 8.64, "waste": 0.05446, "alias": "knitting-mix", @@ -795,7 +760,6 @@ "step_usage": "Tissage / Tricotage", "uuid": "6524ac1e-cc95-4b5a-b462-2fccad7a0bce", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 6.06443, "waste": 0.005, "alias": "knitting-fully-fashioned", @@ -833,7 +797,6 @@ "step_usage": "Tissage / Tricotage", "uuid": "11648b33-f117-4eca-bb09-233c0ad0757f", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 13.2112, "waste": 0.005, "alias": "knitting-seamless", @@ -871,7 +834,6 @@ "step_usage": "Tissage / Tricotage", "uuid": "f9686809-f55e-4b96-b1f0-3298959de7d0", "heat_MJ": 0, - "elec_pppm": 0.0003145, "elec_MJ": 0, "waste": 0.06253, "alias": "weaving", @@ -934,7 +896,6 @@ "pef": 60.189078724645206 }, "heat_MJ": 25.87, - "elec_pppm": 0, "elec_MJ": 7.17, "waste": 0, "alias": "dyeing-fabric", @@ -973,7 +934,6 @@ "pef": 94.30202340574053 }, "heat_MJ": 30.06, - "elec_pppm": 0, "elec_MJ": 9.22, "waste": 0, "alias": "dyeing-article", @@ -1012,7 +972,6 @@ "pef": 72.46288021314759 }, "heat_MJ": 33.42, - "elec_pppm": 0, "elec_MJ": 10.15, "waste": 0, "alias": "dyeing-yarn", @@ -1027,7 +986,6 @@ "step_usage": "Transport", "uuid": "86ac591e1e5c1d96a0d004ac830563d9", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": "sea-transport", @@ -1043,7 +1001,6 @@ "step_usage": "Transport", "uuid": "d3130e7ed9686fcc4bbe980e0375ad88", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": "air-transport", @@ -1059,7 +1016,6 @@ "step_usage": "Transport", "uuid": "7037ea59d8d644fd35f80fd1982f9fe9", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": "train-transport", @@ -1075,7 +1031,6 @@ "step_usage": "Transport", "uuid": "f37aba954435f9f158c19a9449d373b2", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": "road-transport", @@ -1115,7 +1070,6 @@ "pef": 24.033004439288675 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": "distribution", @@ -1130,7 +1084,6 @@ "step_usage": "Energie", "uuid": "b42506cbed4b459815c78d741b453e8e", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null, @@ -1146,7 +1099,6 @@ "step_usage": "Energie", "uuid": "32644303e316aebb9ffa31e9856c8f6b", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null, @@ -1162,7 +1114,6 @@ "step_usage": "Energie", "uuid": "0b69950358f3e8f0d3fb049d71481186", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null, @@ -1178,7 +1129,6 @@ "step_usage": "Energie", "uuid": "825dae104f028cb558dac151f7c45f03", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null, @@ -1194,7 +1144,6 @@ "step_usage": "Energie", "uuid": "2764d908c1a6fe88976d6eabf16295da", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null, @@ -1210,7 +1159,6 @@ "step_usage": "Energie", "uuid": "2c27aa8ba10e717c63b8508b487909bd", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null, @@ -1226,7 +1174,6 @@ "step_usage": "Energie", "uuid": "de2cd7848f853b1c9b8a5d7b0f255144", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null, @@ -1242,7 +1189,6 @@ "step_usage": "Energie", "uuid": "e0f11b283ad36b3da097649bee199149", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null, @@ -1258,7 +1204,6 @@ "step_usage": "Energie", "uuid": "028c9bf863a1ab77a0e636029afc5839", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null, @@ -1274,7 +1219,6 @@ "step_usage": "Energie", "uuid": "99b549d4ba7a0f5f4ab6050d6a6689ad", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null, @@ -1290,7 +1234,6 @@ "step_usage": "Energie", "uuid": "3f90d52cc1dfe32119bf53db2713c407", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null, @@ -1305,7 +1248,6 @@ "step_usage": "Energie", "uuid": "heat-europe", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": "heat-europe", @@ -1343,7 +1285,6 @@ "step_usage": "Energie", "uuid": "heat-row", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": "heat-row", @@ -1381,7 +1322,6 @@ "step_usage": "Utilisation", "uuid": "406d1f98-1052-458d-8f50-1901853d896d", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0.80952, "waste": 0, "alias": null, @@ -1419,7 +1359,6 @@ "step_usage": "Utilisation", "uuid": "4964273a-cdbd-43cf-8cf8-4b017aee4f03", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 1.0266, "waste": 0, "alias": null, @@ -1457,7 +1396,6 @@ "step_usage": "Utilisation", "uuid": "2572015b-7320-4ce1-bc99-cc6de371a654", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0.80952, "waste": 0, "alias": null, @@ -1495,7 +1433,6 @@ "step_usage": "Utilisation", "uuid": "8c040f35-e137-424b-a67f-2e50b628c1bf", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0.9663, "waste": 0, "alias": null, @@ -1533,7 +1470,6 @@ "step_usage": "Utilisation", "uuid": "ea7afeed-c058-4dbb-be01-66704a9afb1f", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 1.0266, "waste": 0, "alias": null, @@ -1571,7 +1507,6 @@ "step_usage": "Utilisation", "uuid": "2b39a7ac-38bd-435f-85a4-783023d845bf", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 1.0266, "waste": 0, "alias": null, @@ -1609,7 +1544,6 @@ "step_usage": "Utilisation", "uuid": "d3bff7b7-efc1-459b-856d-ea0801d6912f", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0.80952, "waste": 0, "alias": null, @@ -1647,7 +1581,6 @@ "step_usage": "Utilisation", "uuid": "7f76529e-521d-4795-bb36-ff896c4692da", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 1.0266, "waste": 0, "alias": null, @@ -1710,7 +1643,6 @@ "pef": 2.184273654856301 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": "passenger-car", @@ -1724,7 +1656,6 @@ "step_usage": "Fin de vie", "uuid": "266fa378-77c0-11ec-90d6-0242ac120003", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": "end-of-life", @@ -1762,7 +1693,6 @@ "step_usage": "Tissage / Tricotage", "uuid": "364298ad-2058-4ec4-b2d0-47f5214abffb", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 4.194, "waste": 0.04003, "alias": "knitting-straight", @@ -1800,7 +1730,6 @@ "step_usage": "Tissage / Tricotage", "uuid": "2e16787c-7a89-4883-acdf-37d3d362bdab", "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 4.25101, "waste": 0.034, "alias": "knitting-circular", @@ -1863,7 +1792,6 @@ "pef": 22.66169575467732 }, "heat_MJ": 37.81, - "elec_pppm": 0, "elec_MJ": 6.53, "waste": 0, "alias": "fading", @@ -1902,7 +1830,6 @@ "pef": 8.354115771936371 }, "heat_MJ": 7.25, - "elec_pppm": 0, "elec_MJ": 4.56, "waste": 0, "alias": "printing-pigment", @@ -1941,7 +1868,6 @@ "pef": 8.180265537420423 }, "heat_MJ": 8.72, - "elec_pppm": 0, "elec_MJ": 5.22, "waste": 0, "alias": "printing-substantive", @@ -1980,7 +1906,6 @@ "pef": 353.9410037138773 }, "heat_MJ": 10.74, - "elec_pppm": 0, "elec_MJ": 1.61, "waste": 0, "alias": "finishing", @@ -1994,7 +1919,6 @@ "step_usage": "Ennoblissement", "uuid": "ecobalyse-teinture-fibres-synthetiques", "heat_MJ": 10.74, - "elec_pppm": 0, "elec_MJ": 1.61, "waste": 0, "alias": "dyeing-synthetic-fiber", @@ -2032,7 +1956,6 @@ "step_usage": "Ennoblissement", "uuid": "ecobalyse-teinture-fibres-cellulosiques", "heat_MJ": 10.74, - "elec_pppm": 0, "elec_MJ": 1.61, "waste": 0, "alias": "dyeing-cellulosic-fiber", @@ -2071,7 +1994,6 @@ "step_usage": "Ennoblissement", "uuid": "blanchiment", "heat_MJ": 10.74, - "elec_pppm": 0, "elec_MJ": 1.61, "waste": 0, "alias": "bleaching", @@ -2086,7 +2008,6 @@ "step_usage": "Ennoblissement", "uuid": "ecobalyse-impression-pigmentaire", "heat_MJ": 10.74, - "elec_pppm": 0, "elec_MJ": 1.61, "waste": 0, "alias": "printing-paste", @@ -2124,7 +2045,6 @@ "step_usage": "Ennoblissement", "uuid": "ecobalyse-impression-fixe-lave-colorants", "heat_MJ": 10.74, - "elec_pppm": 0, "elec_MJ": 1.61, "waste": 0, "alias": "printing-dyes", diff --git a/data/textile/export.py b/data/textile/export.py index 21cedcb7a..e19324577 100755 --- a/data/textile/export.py +++ b/data/textile/export.py @@ -110,7 +110,6 @@ def to_process(activity): else {"impacts": {}} ), "heat_MJ": activity["heat_MJ"], - "elec_pppm": activity["elec_pppm"], "elec_MJ": activity["elec_MJ"], "waste": activity["waste"], "alias": activity["alias"], diff --git a/public/data/textile/processes.json b/public/data/textile/processes.json index ef0a4e0ec..95c677374 100644 --- a/public/data/textile/processes.json +++ b/public/data/textile/processes.json @@ -32,7 +32,6 @@ "pef": 67.572468289423 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null @@ -70,7 +69,6 @@ "pef": 57.27286314080849 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null @@ -108,7 +106,6 @@ "pef": 53.85203360338701 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null @@ -146,7 +143,6 @@ "pef": 26.67819894378467 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null @@ -184,7 +180,6 @@ "pef": 35.86926390471668 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null @@ -222,7 +217,6 @@ "pef": 82.61994342367964 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null @@ -260,7 +254,6 @@ "pef": 69.15842379973827 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null @@ -298,7 +291,6 @@ "pef": 11.83347642985147 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null @@ -336,7 +328,6 @@ "pef": 19.062951024438945 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null @@ -374,7 +365,6 @@ "pef": 10.552637688310561 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null @@ -412,7 +402,6 @@ "pef": 67.28467836877752 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null @@ -450,7 +439,6 @@ "pef": 15.162720126799286 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null @@ -488,7 +476,6 @@ "pef": 27.79539379175755 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null @@ -526,7 +513,6 @@ "pef": 35.36398153017472 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null @@ -564,7 +550,6 @@ "pef": 26.676201035245835 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null @@ -602,7 +587,6 @@ "pef": 26.457894467307508 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null @@ -640,7 +624,6 @@ "pef": 25.296764431669217 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null @@ -678,7 +661,6 @@ "pef": 101.62695244753462 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null @@ -716,7 +698,6 @@ "pef": 656.9997972762471 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.21292, "alias": null @@ -754,7 +735,6 @@ "pef": 550.0740644734477 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.21292, "alias": null @@ -792,7 +772,6 @@ "pef": 768.8582369858626 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.21292, "alias": null @@ -830,7 +809,6 @@ "pef": 222.14731849829033 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.03097, "alias": null @@ -868,7 +846,6 @@ "pef": 309.71558911493605 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.03097, "alias": null @@ -906,7 +883,6 @@ "pef": 138.9890125263651 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.03097, "alias": null @@ -944,7 +920,6 @@ "pef": 570.2684161564904 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.03097, "alias": null @@ -982,7 +957,6 @@ "pef": 256.951793458764 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.07115, "alias": null @@ -1020,7 +994,6 @@ "pef": 2931.4802301799327 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.35, "alias": null @@ -1058,7 +1031,6 @@ "pef": 502.36175453936755 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.35, "alias": null @@ -1096,7 +1068,6 @@ "pef": 573.0550833318028 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.1675, "alias": null @@ -1134,7 +1105,6 @@ "pef": 488.6208132830078 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.09511, "alias": null @@ -1172,7 +1142,6 @@ "pef": 50.42407156564021 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.18106, "alias": null @@ -1210,7 +1179,6 @@ "pef": 354.5790491655871 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.055, "alias": null @@ -1248,7 +1216,6 @@ "pef": 221.26277508920253 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.38696, "alias": null @@ -1286,7 +1253,6 @@ "pef": 185.4743814674453 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0.17842, "alias": null @@ -1324,7 +1290,6 @@ "pef": 0.0 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 8.64, "waste": 0.05446, "alias": "knitting-mix" @@ -1362,7 +1327,6 @@ "pef": 0.0 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 6.06443, "waste": 0.005, "alias": "knitting-fully-fashioned" @@ -1400,7 +1364,6 @@ "pef": 0.0 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 13.2112, "waste": 0.005, "alias": "knitting-seamless" @@ -1438,7 +1401,6 @@ "pef": 0.0 }, "heat_MJ": 0, - "elec_pppm": 0.0003145, "elec_MJ": 0, "waste": 0.06253, "alias": "weaving" @@ -1476,7 +1438,6 @@ "pef": 60.189078724645206 }, "heat_MJ": 25.87, - "elec_pppm": 0, "elec_MJ": 7.17, "waste": 0, "alias": "dyeing-fabric" @@ -1514,7 +1475,6 @@ "pef": 94.30202340574051 }, "heat_MJ": 30.06, - "elec_pppm": 0, "elec_MJ": 9.22, "waste": 0, "alias": "dyeing-article" @@ -1552,7 +1512,6 @@ "pef": 72.46288021314761 }, "heat_MJ": 33.42, - "elec_pppm": 0, "elec_MJ": 10.15, "waste": 0, "alias": "dyeing-yarn" @@ -1590,7 +1549,6 @@ "pef": 1.4322921637269501 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": "sea-transport" @@ -1628,7 +1586,6 @@ "pef": 57.19662380793924 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": "air-transport" @@ -1666,7 +1623,6 @@ "pef": 5.8322976988226625 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": "train-transport" @@ -1704,7 +1660,6 @@ "pef": 13.909104855022996 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": "road-transport" @@ -1742,7 +1697,6 @@ "pef": 24.033004439288668 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": "distribution" @@ -1780,7 +1734,6 @@ "pef": 36.09204359775752 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null @@ -1818,7 +1771,6 @@ "pef": 50.22894252636405 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null @@ -1856,7 +1808,6 @@ "pef": 54.133563259006316 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null @@ -1894,7 +1845,6 @@ "pef": 15.438721259967162 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null @@ -1932,7 +1882,6 @@ "pef": 64.21583493522782 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null @@ -1970,7 +1919,6 @@ "pef": 2.420402496037708 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null @@ -2008,7 +1956,6 @@ "pef": 62.24016310342568 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null @@ -2046,7 +1993,6 @@ "pef": 47.60564420358556 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null @@ -2084,7 +2030,6 @@ "pef": 38.48886281648279 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null @@ -2122,7 +2067,6 @@ "pef": 37.757485039069145 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null @@ -2160,7 +2104,6 @@ "pef": 48.94992432662239 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": null @@ -2198,7 +2141,6 @@ "pef": 4.443660504016495 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": "heat-europe" @@ -2236,7 +2178,6 @@ "pef": 7.827383319524371 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": "heat-row" @@ -2274,7 +2215,6 @@ "pef": 18.84986033179577 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0.80952, "waste": 0, "alias": null @@ -2312,7 +2252,6 @@ "pef": 18.84986033179577 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 1.0266, "waste": 0, "alias": null @@ -2350,7 +2289,6 @@ "pef": 18.84986033179577 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0.80952, "waste": 0, "alias": null @@ -2388,7 +2326,6 @@ "pef": 18.84986033179577 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0.9663, "waste": 0, "alias": null @@ -2426,7 +2363,6 @@ "pef": 18.84986033179577 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 1.0266, "waste": 0, "alias": null @@ -2464,7 +2400,6 @@ "pef": 18.84986033179577 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 1.0266, "waste": 0, "alias": null @@ -2502,7 +2437,6 @@ "pef": 18.84986033179577 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0.80952, "waste": 0, "alias": null @@ -2540,7 +2474,6 @@ "pef": 18.84986033179577 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 1.0266, "waste": 0, "alias": null @@ -2578,7 +2511,6 @@ "pef": 2.184273654856301 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": "passenger-car" @@ -2616,7 +2548,6 @@ "pef": 33.28066255209558 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 0, "waste": 0, "alias": "end-of-life" @@ -2654,7 +2585,6 @@ "pef": 0.0 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 4.194, "waste": 0.04003, "alias": "knitting-straight" @@ -2692,7 +2622,6 @@ "pef": 0.0 }, "heat_MJ": 0, - "elec_pppm": 0, "elec_MJ": 4.25101, "waste": 0.034, "alias": "knitting-circular" @@ -2730,7 +2659,6 @@ "pef": 22.661695754677325 }, "heat_MJ": 37.81, - "elec_pppm": 0, "elec_MJ": 6.53, "waste": 0, "alias": "fading" @@ -2768,7 +2696,6 @@ "pef": 8.354115771936371 }, "heat_MJ": 7.25, - "elec_pppm": 0, "elec_MJ": 4.56, "waste": 0, "alias": "printing-pigment" @@ -2806,7 +2733,6 @@ "pef": 8.180265537420423 }, "heat_MJ": 8.72, - "elec_pppm": 0, "elec_MJ": 5.22, "waste": 0, "alias": "printing-substantive" @@ -2844,7 +2770,6 @@ "pef": 353.9410037138773 }, "heat_MJ": 10.74, - "elec_pppm": 0, "elec_MJ": 1.61, "waste": 0, "alias": "finishing" @@ -2882,7 +2807,6 @@ "pef": 0.0 }, "heat_MJ": 10.74, - "elec_pppm": 0, "elec_MJ": 1.61, "waste": 0, "alias": "dyeing-synthetic-fiber" @@ -2920,7 +2844,6 @@ "pef": 0.0 }, "heat_MJ": 10.74, - "elec_pppm": 0, "elec_MJ": 1.61, "waste": 0, "alias": "dyeing-cellulosic-fiber" @@ -2958,7 +2881,6 @@ "pef": 10.471103597886401 }, "heat_MJ": 10.74, - "elec_pppm": 0, "elec_MJ": 1.61, "waste": 0, "alias": "bleaching" @@ -2996,7 +2918,6 @@ "pef": 0.0 }, "heat_MJ": 10.74, - "elec_pppm": 0, "elec_MJ": 1.61, "waste": 0, "alias": "printing-paste" @@ -3034,7 +2955,6 @@ "pef": 0.0 }, "heat_MJ": 10.74, - "elec_pppm": 0, "elec_MJ": 1.61, "waste": 0, "alias": "printing-dyes" diff --git a/src/Data/Textile/Process.elm b/src/Data/Textile/Process.elm index 581f98d95..baa22d510 100644 --- a/src/Data/Textile/Process.elm +++ b/src/Data/Textile/Process.elm @@ -30,7 +30,6 @@ type alias Process = , correctif : String , displayName : Maybe String , elec : Energy -- MJ per kg of material to process - , elec_pppm : Float -- kWh/(pick,m) per kg of material to process , heat : Energy -- MJ per kg of material to process , impacts : Impacts , info : String @@ -98,7 +97,6 @@ decode impactsDecoder = |> Pipe.required "correctif" Decode.string |> Pipe.optional "displayName" (Decode.maybe Decode.string) Nothing |> Pipe.required "elec_MJ" (Decode.map Energy.megajoules Decode.float) - |> Pipe.required "elec_pppm" Decode.float |> Pipe.required "heat_MJ" (Decode.map Energy.megajoules Decode.float) |> Pipe.required "impacts" impactsDecoder |> Pipe.required "info" Decode.string @@ -148,7 +146,6 @@ encode process = , ( "correctif", Encode.string process.correctif ) , ( "displayName", EncodeExtra.maybe Encode.string process.displayName ) , ( "elec_MJ", Encode.float (Energy.inMegajoules process.elec) ) - , ( "elec_pppm", Encode.float process.elec_pppm ) , ( "heat_MJ", Encode.float (Energy.inMegajoules process.heat) ) , ( "impacts", Impact.encode process.impacts ) , ( "info", Encode.string process.info ) diff --git a/src/Data/Textile/Simulator.elm b/src/Data/Textile/Simulator.elm index 438328813..c091e9434 100644 --- a/src/Data/Textile/Simulator.elm +++ b/src/Data/Textile/Simulator.elm @@ -572,7 +572,7 @@ computeFabricImpacts { textile } ({ inputs, lifeCycle } as simulator) = Formula.weavingImpacts step.impacts { countryElecProcess = country.electricityProcess , outputMass = fabricOutputMass - , pickingElec = process.elec_pppm + , pickingElec = WellKnown.weavingElecPPPM , surfaceMass = surfaceMass , yarnSize = inputs.yarnSize |> Maybe.withDefault inputs.product.yarnSize } diff --git a/src/Data/Textile/WellKnown.elm b/src/Data/Textile/WellKnown.elm index f8fd5255c..518dc1947 100644 --- a/src/Data/Textile/WellKnown.elm +++ b/src/Data/Textile/WellKnown.elm @@ -4,6 +4,7 @@ module Data.Textile.WellKnown exposing , getEnnoblingHeatProcess , getPrintingProcess , load + , weavingElecPPPM ) import Data.Country exposing (Country) @@ -114,3 +115,9 @@ load processes = |> fromAlias "sea-transport" |> fromAlias "train-transport" |> fromAlias "weaving" + + +weavingElecPPPM : Float +weavingElecPPPM = + -- kWh/(pick,m) per kg of material to process + 0.0003145 diff --git a/tests/Data/Textile/FormulaTest.elm b/tests/Data/Textile/FormulaTest.elm index 216e02f70..cd787fce1 100644 --- a/tests/Data/Textile/FormulaTest.elm +++ b/tests/Data/Textile/FormulaTest.elm @@ -32,7 +32,6 @@ noOpProcess = , correctif = "" , displayName = Just "Default" , elec = Energy.megajoules 0 - , elec_pppm = 0 , heat = Energy.megajoules 0 , impacts = Impact.empty , info = ""