Skip to content

Commit

Permalink
slightly updated reference factors to match greencloud study
Browse files Browse the repository at this point in the history
  • Loading branch information
@tibosmn
tibosmn committed Apr 23, 2024
1 parent 120e789 commit 11f8aa4
Show file tree
Hide file tree
Showing 10 changed files with 42 additions and 42 deletions.
6 changes: 3 additions & 3 deletions boaviztapi/data/factors.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@
"impact": 156.00
},
"adp": {
"die_impact": 5.80e-09,
"die_impact": 5.87e-09,
"impact": 2.04e-02
}
}

"hdd": {
"gwp": {
"impact": 31.10
"impact": 31.11
},
"pe": {
"impact": 276.00
Expand Down Expand Up @@ -101,7 +101,7 @@
},
"pe": {
"die_impact": 27.30,
"impact": 76.90
"impact": 73.98
},
"adp": {
"die_impact": 6.30e-05,
Expand Down
6 changes: 3 additions & 3 deletions docs/docs/Explanations/components/cpu.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ with:

| Constant | Units | Value |
|--------------------------------------------------|-------------|----------|
| $\text{CPU}_\text{embedded_die}^{\text{gwp}}$ | kgCO2eq/cm2 | 1.97 |
| $\text{CPU}_\text{embedded_die}^{\text{adp}}$ | kgSbeq/cm2 | 5.80E-07 |
| $\text{CPU}_\text{embedded_die}^{\text{pe}}$ | MJ/cm2 | 26.50 |
| $\text{CPU}_\text{embedded_die}^{\text{gwp}}$ | kgCO2eq/mm2 | 1.97e−02 |
| $\text{CPU}_\text{embedded_die}^{\text{adp}}$ | kgSbeq/mm2 | 5.87e-09 |
| $\text{CPU}_\text{embedded_die}^{\text{pe}}$ | MJ/mm2 | 0.265 |
| $\text{CPU}_\text{embedded_base}^{\text{gwp}}$ | kgCO2eq | 9.14 |
| $\text{CPU}_\text{embedded_base}^{\text{adp}}$ | kgSbeq | 2.04E-02 |
| $\text{CPU}_\text{embedded_base}^{\text{pe}}$ | MJ | 156.00 |
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/Explanations/components/hdd.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ The HDD disk manufacturing impact is considered as a constant.

| Constant | Unit | Value |
|-----------------------------------------------|---------|----------|
| $\text{HDD}_{\text{embedded}}^{\text{gwp}}$ | kgCO2eq | 31.10 |
| $\text{HDD}_{\text{embedded}}^{\text{gwp}}$ | kgCO2eq | 31.11 |
| $\text{HDD}_{\text{embedded}}^{\text{adp}}$ | kgSbeq | 2.50E-04 |
| $\text{HDD}_{\text{embedded}}^{\text{pe}}$ | MJ | 276.00 |

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/Explanations/components/ssd.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ with:
| $\text{SSD}_\text{embedded_die}^\text{pe}$ | MJ/cm2 | 27.30 |
| $\text{SSD}_\text{embedded_base}^\text{gwp}$ | kgCO2eq | 6.34 |
| $\text{SSD}_\text{embedded_base}^\text{adp}$ | kgSbeq | 5.63E-04 |
| $\text{SSD}_\text{embedded_base}^\text{pe}$ | MJ | 76.90 |
| $\text{SSD}_\text{embedded_base}^\text{pe}$ | MJ | 73.98 |

!!!info
If there are more than 1 SDD we multiply $\text{SSD}_\text{embedded}^\text{criteria}$ by the number of SSD given in `units`.
Expand Down
22 changes: 11 additions & 11 deletions tests/api/test_cloud.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ async def test_empty_usage_with_url_params_r5ad():
ImpactOutput(11170.0, 214.0, 4000.0),
),
PEImpact(
ImpactOutput(21470.0, 7596.0, 13000.0, END_OF_LIFE_WARNING),
ImpactOutput(21470.0, 7590.0, 13000.0, END_OF_LIFE_WARNING),
ImpactOutput(5808000.0, 121.0, 100000.0),
),
)
Expand Down Expand Up @@ -278,7 +278,7 @@ async def test_verbose_output_with_empty_usage():
ImpactOutput(11170.0, 214.0, 4000.0),
),
PEImpact(
ImpactOutput(21470.0, 7596.0, 13000.0, END_OF_LIFE_WARNING),
ImpactOutput(21470.0, 7590.0, 13000.0, END_OF_LIFE_WARNING),
ImpactOutput(5808000.0, 121.0, 100000.0),
),
verbose_output={
Expand Down Expand Up @@ -393,7 +393,7 @@ async def test_verbose_output_with_empty_usage():
"max": 32,
"min": 32,
"source": "Completed from name name based on "
"https://docs.google.com/spreadsheets/d/1DqYgQnEDLQVQm5acMAhLgHLD8xXCG9BIrk-_Nv6jF3k/edit#gid=224728652.",
"https://docs.google.com/spreadsheets/d/1DqYgQnEDLQVQm5acMAhLgHLD8xXCG9BIrk-_Nv6jF3k/edit#gid=224728652.",
"status": "COMPLETED",
"value": 32,
},
Expand All @@ -410,15 +410,15 @@ async def test_verbose_output_with_empty_usage():
"max": "Naples",
"min": "Naples",
"source": "Completed from name name based on "
"https://docs.google.com/spreadsheets/d/1DqYgQnEDLQVQm5acMAhLgHLD8xXCG9BIrk-_Nv6jF3k/edit#gid=224728652.",
"https://docs.google.com/spreadsheets/d/1DqYgQnEDLQVQm5acMAhLgHLD8xXCG9BIrk-_Nv6jF3k/edit#gid=224728652.",
"status": "COMPLETED",
"value": "Naples",
},
"gwp_factor": {
"max": 0.9,
"min": 0.023,
"source": "https://www.sciencedirect.com/science/article/pii/S0306261921012149: \n"
"Average of 27 european countries",
"Average of 27 european countries",
"status": "DEFAULT",
"unit": "kg CO2eq/kWh",
"value": 0.38,
Expand Down Expand Up @@ -476,15 +476,15 @@ async def test_verbose_output_with_empty_usage():
"max": "AMD",
"min": "AMD",
"source": "Completed from name name based on "
"https://docs.google.com/spreadsheets/d/1DqYgQnEDLQVQm5acMAhLgHLD8xXCG9BIrk-_Nv6jF3k/edit#gid=224728652.",
"https://docs.google.com/spreadsheets/d/1DqYgQnEDLQVQm5acMAhLgHLD8xXCG9BIrk-_Nv6jF3k/edit#gid=224728652.",
"status": "COMPLETED",
"value": "AMD",
},
"model_range": {
"max": "EPYC",
"min": "EPYC",
"source": "Completed from name name based on "
"https://docs.google.com/spreadsheets/d/1DqYgQnEDLQVQm5acMAhLgHLD8xXCG9BIrk-_Nv6jF3k/edit#gid=224728652.",
"https://docs.google.com/spreadsheets/d/1DqYgQnEDLQVQm5acMAhLgHLD8xXCG9BIrk-_Nv6jF3k/edit#gid=224728652.",
"status": "COMPLETED",
"value": "EPYC",
},
Expand Down Expand Up @@ -517,7 +517,7 @@ async def test_verbose_output_with_empty_usage():
"max": 200,
"min": 200,
"source": "Completed from name name based on "
"https://docs.google.com/spreadsheets/d/1DqYgQnEDLQVQm5acMAhLgHLD8xXCG9BIrk-_Nv6jF3k/edit#gid=224728652.",
"https://docs.google.com/spreadsheets/d/1DqYgQnEDLQVQm5acMAhLgHLD8xXCG9BIrk-_Nv6jF3k/edit#gid=224728652.",
"status": "COMPLETED",
"unit": "W",
"value": 200,
Expand All @@ -526,7 +526,7 @@ async def test_verbose_output_with_empty_usage():
"max": 64,
"min": 64,
"source": "Completed from name name based on "
"https://docs.google.com/spreadsheets/d/1DqYgQnEDLQVQm5acMAhLgHLD8xXCG9BIrk-_Nv6jF3k/edit#gid=224728652.",
"https://docs.google.com/spreadsheets/d/1DqYgQnEDLQVQm5acMAhLgHLD8xXCG9BIrk-_Nv6jF3k/edit#gid=224728652.",
"status": "COMPLETED",
"value": 64,
},
Expand Down Expand Up @@ -694,7 +694,7 @@ async def test_verbose_output_with_empty_usage():
"max": 0.9,
"min": 0.023,
"source": "https://www.sciencedirect.com/science/article/pii/S0306261921012149: \n"
"Average of 27 european countries",
"Average of 27 european countries",
"status": "DEFAULT",
"unit": "kg CO2eq/kWh",
"value": 0.38,
Expand Down Expand Up @@ -867,7 +867,7 @@ async def test_verbose_output_with_empty_usage():
"max": 0.9,
"min": 0.023,
"source": "https://www.sciencedirect.com/science/article/pii/S0306261921012149: \n"
"Average of 27 european countries",
"Average of 27 european countries",
"status": "DEFAULT",
"unit": "kg CO2eq/kWh",
"value": 0.38,
Expand Down
10 changes: 5 additions & 5 deletions tests/api/test_component.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,7 @@ async def test_wrong_manuf_ssd():
'use': 'not implemented'},
'pe': {'description': 'Consumption of primary energy',
'embedded': {'max': 1365000.0,
'min': 2807.0,
'min': 2804.0,
'value': 600.0,
'warnings': ['End of life is not included in '
'the calculation',
Expand Down Expand Up @@ -714,9 +714,9 @@ async def test_complete_ssd():
'unit': 'kgCO2eq',
'use': 'not implemented'},
'pe': {'description': 'Consumption of primary energy',
'embedded': {'max': 292.7,
'min': 292.7,
'value': 292.7,
'embedded': {'max': 289.8,
'min': 289.8,
'value': 289.8,
'warnings': ['End of life is not included in the '
'calculation']},
'unit': 'MJ',
Expand Down Expand Up @@ -752,7 +752,7 @@ async def test_empty_ssd():
'use': 'not implemented'},
'pe': {'description': 'Consumption of primary energy',
'embedded': {'max': 1365000.0,
'min': 2807.0,
'min': 2804.0,
'value': 600.0,
'warnings': ['End of life is not included in the '
'calculation',
Expand Down
6 changes: 3 additions & 3 deletions tests/api/test_server.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ async def test_complete_config_server():
'unit': 'kgCO2eq',
'use': {'max': 26430.0, 'min': 337.7, 'value': 7000.0}},
'pe': {'description': 'Consumption of primary energy',
'embedded': {'max': 15430.0,
'embedded': {'max': 15420.0,
'min': 14450.0,
'value': 15430.0,
'value': 15420.0,
'warnings': ['End of life is not included in the '
'calculation']},
'unit': 'MJ',
Expand Down Expand Up @@ -261,7 +261,7 @@ async def test_partial_server_1():
'use': {'max': 26430.0, 'min': 337.7, 'value': 7000.0}},
'pe': {'description': 'Consumption of primary energy',
'embedded': {'max': 2796000.0,
'min': 14810.0,
'min': 14800.0,
'value': 20000.0,
'warnings': ['End of life is not included in the '
'calculation',
Expand Down
10 changes: 5 additions & 5 deletions tests/data/factors.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,22 @@

"cpu": {
"gwp": {
"die_impact": 0.0197,
"die_impact": 1.97e-02,
"impact": 9.14
},
"pe": {
"die_impact": 0.2650,
"die_impact": 0.265,
"impact": 156.00
},
"adp": {
"die_impact": 5.80e-09,
"die_impact": 5.87e-09,
"impact": 2.04e-02
}
}

"hdd": {
"gwp": {
"impact": 31.10
"impact": 31.11
},
"pe": {
"impact": 276.00
Expand Down Expand Up @@ -101,7 +101,7 @@
},
"pe": {
"die_impact": 27.30,
"impact": 76.90
"impact": 73.98
},
"adp": {
"die_impact": 6.30e-05,
Expand Down
18 changes: 9 additions & 9 deletions tests/unit/test_bottom_up.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def test_bottom_up_component_ssd_empty(empty_ssd_model):
'use': 'not implemented'},
'pe': {'description': 'Consumption of primary energy',
'embedded': {'max': 1365000.0,
'min': 2807.0,
'min': 2804.0,
'value': 600.0,
'warnings': ['End of life is not included in the '
'calculation',
Expand Down Expand Up @@ -141,9 +141,9 @@ def test_bottom_up_component_ssd_complete(complete_ssd_model):
'unit': 'kgCO2eq',
'use': 'not implemented'},
'pe': {'description': 'Consumption of primary energy',
'embedded': {'max': 292.7,
'min': 292.7,
'value': 292.7,
'embedded': {'max': 289.8,
'min': 289.8,
'value': 289.8,
'warnings': ['End of life is not included in the '
'calculation']},
'unit': 'MJ',
Expand All @@ -169,8 +169,8 @@ def test_bottom_up_component_ssd_incomplete(incomplete_ssd_model):
'unit': 'kgCO2eq',
'use': 'not implemented'},
'pe': {'description': 'Consumption of primary energy',
'embedded': {'max': 2624.0,
'min': 127.8,
'embedded': {'max': 2621.0,
'min': 124.9,
'value': 600.0,
'warnings': ['End of life is not included in the '
'calculation']},
Expand Down Expand Up @@ -344,9 +344,9 @@ def test_bottom_up_component_hdd(hdd_model):
'unit': 'kgSbeq',
'use': 'not implemented'},
'gwp': {'description': 'Total climate change',
'embedded': {'max': 31.1,
'min': 31.1,
'value': 31.1,
'embedded': {'max': 31.11,
'min': 31.11,
'value': 31.11,
'warnings': ['End of life is not included in the '
'calculation']},
'unit': 'kgCO2eq',
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/test_verbose.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def test_verbose_component_ssd(empty_ssd_model):
'use': 'not implemented'},
'pe': {'description': 'Consumption of primary energy',
'embedded': {'max': 1365000.0,
'min': 2807.0,
'min': 2804.0,
'value': 600.0,
'warnings': ['End of life is not included in '
'the calculation',
Expand Down

0 comments on commit 11f8aa4

Please sign in to comment.