From b800ad9acff29c3e2a3781d3fe8c5e5569523225 Mon Sep 17 00:00:00 2001 From: manushak Date: Wed, 11 Sep 2024 18:57:40 +0400 Subject: [PATCH 1/4] fix(manifests): rename `carbon-embodied` to `embodied-carbon` --- manifests/examples/pipelines/nesting.yml | 4 +- .../pipeline-with-aggregate.yaml | 56 ++++----- .../outputs-if-diff/pipeline-with-mocks.yaml | 58 +++++----- .../examples/pipelines/pipeline-teads-sci.yml | 4 +- .../pipelines/pipeline-with-aggregate.yml | 4 +- .../pipelines/pipeline-with-mocks.yml | 4 +- manifests/examples/pipelines/sci.yml | 4 +- .../outputs/builtins/coefficient/success.yaml | 43 +++---- manifests/outputs/pipelines/nesting.yaml | 108 +++++++++--------- .../outputs/pipelines/pipeline-teads-sci.yaml | 10 +- manifests/outputs/pipelines/sci.yaml | 12 +- 11 files changed, 154 insertions(+), 153 deletions(-) diff --git a/manifests/examples/pipelines/nesting.yml b/manifests/examples/pipelines/nesting.yml index 631f4db90..de1c5e70f 100644 --- a/manifests/examples/pipelines/nesting.yml +++ b/manifests/examples/pipelines/nesting.yml @@ -136,7 +136,7 @@ initialize: config: input-parameters: - carbon-operational - - carbon-embodied + - embodied-carbon output-parameter: carbon parameter-metadata: inputs: @@ -144,7 +144,7 @@ initialize: description: Operational carbon footprint unit: gCO2eq aggregation-method: sum - carbon-embodied: + embodied-carbon: description: Embodied carbon footprint unit: gCO2eq aggregation-method: sum diff --git a/manifests/examples/pipelines/outputs-if-diff/pipeline-with-aggregate.yaml b/manifests/examples/pipelines/outputs-if-diff/pipeline-with-aggregate.yaml index b9771834f..7512e15fb 100644 --- a/manifests/examples/pipelines/outputs-if-diff/pipeline-with-aggregate.yaml +++ b/manifests/examples/pipelines/outputs-if-diff/pipeline-with-aggregate.yaml @@ -156,7 +156,7 @@ initialize: config: input-parameters: - carbon-operational - - carbon-embodied + - embodied-carbon output-parameter: carbon parameter-metadata: inputs: @@ -164,7 +164,7 @@ initialize: description: Operational carbon footprint unit: gCO2eq aggregation-method: sum - carbon-embodied: + embodied-carbon: description: Embodied carbon footprint unit: gCO2eq aggregation-method: sum @@ -319,7 +319,7 @@ tree: cpu-energy-raw: 0.0000563888888888889 vcpu-ratio: 8 cpu-energy-kwh: 0.000007048611111111113 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.0056388888888888895 carbon: 0.005649016996448503 sci: 0.000403501214032036 @@ -342,7 +342,7 @@ tree: cpu-energy-raw: 0.00005340277777777778 vcpu-ratio: 8 cpu-energy-kwh: 0.000006675347222222222 - carbon-embodied: 0.000010128107559614407 + embodied-carbon: 0.000010128107559614407 carbon-operational: 0.005340277777777777 carbon: 0.005350405885337391 sci: 0.0005589976298113692 @@ -365,7 +365,7 @@ tree: cpu-energy-raw: 0.00005190972222222222 vcpu-ratio: 8 cpu-energy-kwh: 0.0000064887152777777775 - carbon-embodied: 0.000010128107559614407 + embodied-carbon: 0.000010128107559614407 carbon-operational: 0.005190972222222222 carbon: 0.0052011003297818366 sci: 0.0006170797001436077 @@ -388,7 +388,7 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.005190972222222222 carbon: 0.005201100329781837 sci: 0.0010402200659563674 @@ -411,7 +411,7 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.005190972222222222 carbon: 0.005201100329781837 sci: 0.0010402200659563674 @@ -434,7 +434,7 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.005190972222222222 carbon: 0.005201100329781837 sci: 0.0010402200659563674 @@ -457,7 +457,7 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.005190972222222222 carbon: 0.005201100329781837 sci: 0.0010402200659563674 @@ -480,7 +480,7 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.005190972222222222 carbon: 0.005201100329781837 sci: 0.0010402200659563674 @@ -503,7 +503,7 @@ tree: cpu-energy-raw: 0.000031145833333333336 vcpu-ratio: 8 cpu-energy-kwh: 0.000003893229166666667 - carbon-embodied: 0.000006076864535768645 + embodied-carbon: 0.000006076864535768645 carbon-operational: 0.0031145833333333334 carbon: 0.003120660197869102 sci: 0.0010402200659563674 @@ -526,7 +526,7 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 - carbon-embodied: 0 + embodied-carbon: 0 carbon-operational: 0 carbon: 0 sci: 0 @@ -549,7 +549,7 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 - carbon-embodied: 0 + embodied-carbon: 0 carbon-operational: 0 carbon: 0 sci: 0 @@ -572,7 +572,7 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 - carbon-embodied: 0 + embodied-carbon: 0 carbon-operational: 0 carbon: 0 sci: 0 @@ -595,7 +595,7 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 - carbon-embodied: 0 + embodied-carbon: 0 carbon-operational: 0 carbon: 0 sci: 0 @@ -671,7 +671,7 @@ tree: cpu-energy-raw: 0.00007191666666666668 vcpu-ratio: 8 cpu-energy-kwh: 0.000008989583333333334 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.007191666666666666 carbon: 0.007201794774226282 sci: 0.00003273543079193765 @@ -694,7 +694,7 @@ tree: cpu-energy-raw: 0.00008565277777777778 vcpu-ratio: 8 cpu-energy-kwh: 0.000010706597222222223 - carbon-embodied: 0.000010128107559614407 + embodied-carbon: 0.000010128107559614407 carbon-operational: 0.008565277777777778 carbon: 0.008575405885337391 sci: 0.00009235052491901808 @@ -717,7 +717,7 @@ tree: cpu-energy-raw: 0.00008505555555555556 vcpu-ratio: 8 cpu-energy-kwh: 0.000010631944444444445 - carbon-embodied: 0.000010128107559614407 + embodied-carbon: 0.000010128107559614407 carbon-operational: 0.008505555555555556 carbon: 0.00851568366311517 sci: 0.0001439849894729618 @@ -740,7 +740,7 @@ tree: cpu-energy-raw: 0.00007878472222222222 vcpu-ratio: 8 cpu-energy-kwh: 0.000009848090277777778 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.007878472222222222 carbon: 0.007888600329781836 sci: 0.0002629533443260612 @@ -763,7 +763,7 @@ tree: cpu-energy-raw: 0.00007878472222222222 vcpu-ratio: 8 cpu-energy-kwh: 0.000009848090277777778 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.007878472222222222 carbon: 0.007888600329781836 sci: 0.0002629533443260612 @@ -786,7 +786,7 @@ tree: cpu-energy-raw: 0.00007878472222222222 vcpu-ratio: 8 cpu-energy-kwh: 0.000009848090277777778 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.007878472222222222 carbon: 0.007888600329781836 sci: 0.0002629533443260612 @@ -809,7 +809,7 @@ tree: cpu-energy-raw: 0.00007878472222222222 vcpu-ratio: 8 cpu-energy-kwh: 0.000009848090277777778 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.007878472222222222 carbon: 0.007888600329781836 sci: 0.0002629533443260612 @@ -832,7 +832,7 @@ tree: cpu-energy-raw: 0.00007878472222222222 vcpu-ratio: 8 cpu-energy-kwh: 0.000009848090277777778 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.007878472222222222 carbon: 0.007888600329781836 sci: 0.0002629533443260612 @@ -855,7 +855,7 @@ tree: cpu-energy-raw: 0.00004727083333333333 vcpu-ratio: 8 cpu-energy-kwh: 0.000005908854166666666 - carbon-embodied: 0.000006076864535768645 + embodied-carbon: 0.000006076864535768645 carbon-operational: 0.004727083333333333 carbon: 0.0047331601978691015 sci: 0.00026295334432606117 @@ -878,7 +878,7 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 - carbon-embodied: 0 + embodied-carbon: 0 carbon-operational: 0 carbon: 0 sci: 0 @@ -901,7 +901,7 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 - carbon-embodied: 0 + embodied-carbon: 0 carbon-operational: 0 carbon: 0 sci: 0 @@ -924,7 +924,7 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 - carbon-embodied: 0 + embodied-carbon: 0 carbon-operational: 0 carbon: 0 sci: 0 @@ -947,7 +947,7 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 - carbon-embodied: 0 + embodied-carbon: 0 carbon-operational: 0 carbon: 0 sci: 0 diff --git a/manifests/examples/pipelines/outputs-if-diff/pipeline-with-mocks.yaml b/manifests/examples/pipelines/outputs-if-diff/pipeline-with-mocks.yaml index 6b4f1c51d..6c820ea44 100644 --- a/manifests/examples/pipelines/outputs-if-diff/pipeline-with-mocks.yaml +++ b/manifests/examples/pipelines/outputs-if-diff/pipeline-with-mocks.yaml @@ -209,7 +209,7 @@ initialize: config: input-parameters: - carbon-operational - - carbon-embodied + - embodied-carbon output-parameter: carbon parameter-metadata: inputs: @@ -217,7 +217,7 @@ initialize: unit: gCO2eq description: Operational carbon footprint aggregation-method: sum - carbon-embodied: + embodied-carbon: unit: gCO2eq description: Embodied carbon footprint aggregation-method: sum @@ -379,7 +379,7 @@ tree: cpu-energy-raw: "*" vcpu-ratio: 8 cpu-energy-kwh: "*" - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: "*" carbon: "*" sci: "*" @@ -402,7 +402,7 @@ tree: cpu-energy-raw: "*" vcpu-ratio: 8 cpu-energy-kwh: "*" - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: "*" carbon: "*" sci: "*" @@ -425,7 +425,7 @@ tree: cpu-energy-raw: "*" vcpu-ratio: 8 cpu-energy-kwh: "*" - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: "*" carbon: "*" sci: "*" @@ -448,7 +448,7 @@ tree: cpu-energy-raw: "*" vcpu-ratio: 8 cpu-energy-kwh: "*" - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: "*" carbon: "*" sci: "*" @@ -471,7 +471,7 @@ tree: cpu-energy-raw: "*" vcpu-ratio: 8 cpu-energy-kwh: "*" - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: "*" carbon: "*" sci: "*" @@ -494,7 +494,7 @@ tree: cpu-energy-raw: "*" vcpu-ratio: 8 cpu-energy-kwh: "*" - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: "*" carbon: "*" sci: "*" @@ -517,7 +517,7 @@ tree: cpu-energy-raw: "*" vcpu-ratio: 8 cpu-energy-kwh: "*" - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: "*" carbon: "*" sci: "*" @@ -540,7 +540,7 @@ tree: cpu-energy-raw: "*" vcpu-ratio: 8 cpu-energy-kwh: "*" - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: "*" carbon: "*" sci: "*" @@ -563,7 +563,7 @@ tree: cpu-energy-raw: "*" vcpu-ratio: 8 cpu-energy-kwh: "*" - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: "*" carbon: "*" sci: "*" @@ -586,7 +586,7 @@ tree: cpu-energy-raw: "*" vcpu-ratio: 8 cpu-energy-kwh: "*" - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: "*" carbon: "*" sci: "*" @@ -609,7 +609,7 @@ tree: cpu-energy-raw: "*" vcpu-ratio: 8 cpu-energy-kwh: "*" - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: "*" carbon: "*" sci: "*" @@ -632,7 +632,7 @@ tree: cpu-energy-raw: "*" vcpu-ratio: 8 cpu-energy-kwh: "*" - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: "*" carbon: "*" sci: "*" @@ -655,7 +655,7 @@ tree: cpu-energy-raw: "*" vcpu-ratio: 8 cpu-energy-kwh: "*" - carbon-embodied: 0.0000020256215119228817 + embodied-carbon: 0.0000020256215119228817 carbon-operational: "*" carbon: "*" sci: "*" @@ -733,7 +733,7 @@ tree: cpu-energy-raw: "*" vcpu-ratio: 8 cpu-energy-kwh: "*" - carbon-embodied: "*" + embodied-carbon: "*" carbon-operational: "*" carbon: "*" sci: "*" @@ -756,7 +756,7 @@ tree: cpu-energy-raw: "*" vcpu-ratio: 8 cpu-energy-kwh: "*" - carbon-embodied: "*" + embodied-carbon: "*" carbon-operational: "*" carbon: "*" sci: "*" @@ -779,7 +779,7 @@ tree: cpu-energy-raw: "*" vcpu-ratio: 8 cpu-energy-kwh: "*" - carbon-embodied: "*" + embodied-carbon: "*" carbon-operational: "*" carbon: "*" sci: "*" @@ -802,7 +802,7 @@ tree: cpu-energy-raw: "*" vcpu-ratio: 8 cpu-energy-kwh: "*" - carbon-embodied: "*" + embodied-carbon: "*" carbon-operational: "*" carbon: "*" sci: "*" @@ -825,7 +825,7 @@ tree: cpu-energy-raw: "*" vcpu-ratio: 8 cpu-energy-kwh: "*" - carbon-embodied: "*" + embodied-carbon: "*" carbon-operational: "*" carbon: "*" sci: "*" @@ -848,7 +848,7 @@ tree: cpu-energy-raw: "*" vcpu-ratio: 8 cpu-energy-kwh: "*" - carbon-embodied: "*" + embodied-carbon: "*" carbon-operational: "*" carbon: "*" sci: "*" @@ -871,7 +871,7 @@ tree: cpu-energy-raw: "*" vcpu-ratio: 8 cpu-energy-kwh: "*" - carbon-embodied: "*" + embodied-carbon: "*" carbon-operational: "*" carbon: "*" sci: "*" @@ -894,7 +894,7 @@ tree: cpu-energy-raw: "*" vcpu-ratio: 8 cpu-energy-kwh: "*" - carbon-embodied: "*" + embodied-carbon: "*" carbon-operational: "*" carbon: "*" sci: "*" @@ -917,7 +917,7 @@ tree: cpu-energy-raw: "*" vcpu-ratio: 8 cpu-energy-kwh: "*" - carbon-embodied: "*" + embodied-carbon: "*" carbon-operational: "*" carbon: "*" sci: "*" @@ -940,7 +940,7 @@ tree: cpu-energy-raw: "*" vcpu-ratio: 8 cpu-energy-kwh: "*" - carbon-embodied: "*" + embodied-carbon: "*" carbon-operational: "*" carbon: "*" sci: "*" @@ -963,7 +963,7 @@ tree: cpu-energy-raw: "*" vcpu-ratio: 8 cpu-energy-kwh: "*" - carbon-embodied: "*" + embodied-carbon: "*" carbon-operational: "*" carbon: "*" sci: "*" @@ -986,7 +986,7 @@ tree: cpu-energy-raw: "*" vcpu-ratio: 8 cpu-energy-kwh: "*" - carbon-embodied: "*" + embodied-carbon: "*" carbon-operational: "*" carbon: "*" sci: "*" @@ -1009,7 +1009,7 @@ tree: cpu-energy-raw: "*" vcpu-ratio: 8 cpu-energy-kwh: "*" - carbon-embodied: "*" + embodied-carbon: "*" carbon-operational: "*" carbon: "*" sci: "*" @@ -1056,4 +1056,4 @@ tree: timestamp: "2023-12-12T00:01:00.000Z" duration: 1 aggregated: - carbon: "*" + carbon: "*" \ No newline at end of file diff --git a/manifests/examples/pipelines/pipeline-teads-sci.yml b/manifests/examples/pipelines/pipeline-teads-sci.yml index 28243d38f..2a20ce1b7 100644 --- a/manifests/examples/pipelines/pipeline-teads-sci.yml +++ b/manifests/examples/pipelines/pipeline-teads-sci.yml @@ -65,7 +65,7 @@ initialize: config: input-parameters: - carbon-operational - - carbon-embodied + - embodied-carbon output-parameter: carbon "time-sync": method: TimeSync @@ -123,4 +123,4 @@ tree: cloud/instance-type: A1 cloud/region: uk-west cpu/utilization: 15 - network/energy: 0.000001 + network/energy: 0.000001 \ No newline at end of file diff --git a/manifests/examples/pipelines/pipeline-with-aggregate.yml b/manifests/examples/pipelines/pipeline-with-aggregate.yml index 7cf805d92..1f436d0fa 100644 --- a/manifests/examples/pipelines/pipeline-with-aggregate.yml +++ b/manifests/examples/pipelines/pipeline-with-aggregate.yml @@ -142,7 +142,7 @@ initialize: config: input-parameters: - carbon-operational - - carbon-embodied + - embodied-carbon output-parameter: carbon parameter-metadata: outputs: @@ -259,4 +259,4 @@ tree: cpu/utilization: 33 cloud/instance-type: A1 cloud/region: uk-west - requests: 180 + requests: 180 \ No newline at end of file diff --git a/manifests/examples/pipelines/pipeline-with-mocks.yml b/manifests/examples/pipelines/pipeline-with-mocks.yml index 3e3ce92d8..804e3cdfe 100644 --- a/manifests/examples/pipelines/pipeline-with-mocks.yml +++ b/manifests/examples/pipelines/pipeline-with-mocks.yml @@ -196,7 +196,7 @@ initialize: config: input-parameters: - carbon-operational - - carbon-embodied + - embodied-carbon output-parameter: carbon parameter-metadata: inputs: @@ -204,7 +204,7 @@ initialize: description: Operational carbon footprint unit: gCO2eq aggregation-method: sum - carbon-embodied: + embodied-carbon: description: Embodied carbon footprint unit: gCO2eq aggregation-method: sum diff --git a/manifests/examples/pipelines/sci.yml b/manifests/examples/pipelines/sci.yml index 37a338286..4fca75ca7 100644 --- a/manifests/examples/pipelines/sci.yml +++ b/manifests/examples/pipelines/sci.yml @@ -68,7 +68,7 @@ initialize: config: input-parameters: - carbon-operational - - carbon-embodied + - embodied-carbon output-parameter: carbon "sci": path: "builtin" @@ -126,4 +126,4 @@ tree: cloud/instance-type: A1 cloud/region: uk-west cpu/utilization: 15 - network/energy: 0.000001 + network/energy: 0.000001 \ No newline at end of file diff --git a/manifests/outputs/builtins/coefficient/success.yaml b/manifests/outputs/builtins/coefficient/success.yaml index 4ea679a9a..d34222918 100644 --- a/manifests/outputs/builtins/coefficient/success.yaml +++ b/manifests/outputs/builtins/coefficient/success.yaml @@ -12,27 +12,27 @@ initialize: output-parameter: carbon-product execution: command: >- - /Users/mariamkhalatova/.npm/_npx/1bf7c3c15bf47d04/node_modules/.bin/ts-node - /Users/mariamkhalatova/Projects/UK/if/src/index.ts -m - manifests/outputs/plugins/coefficient/success.yml -o - manifests/outputs/plugins/coefficient/success + /Users/manushak/.npm/_npx/1bf7c3c15bf47d04/node_modules/.bin/ts-node + /Users/manushak/Documents/Projects/Green-Software/if/src/if-run/index.ts -m + manifests/examples/builtins/coefficient/success.yml -o + manifests/outputs/builtins/coefficient/success.yaml environment: - if-version: 0.4.0 + if-version: 0.6.0 os: macOS - os-version: "13.2" - node-version: 18.14.2 - date-time: 2024-07-02T05:37:08.297Z (UTC) + os-version: 14.6.1 + node-version: 18.20.4 + date-time: 2024-09-11T11:37:21.738Z (UTC) dependencies: - - "@babel/core@7.22.10" - - "@babel/preset-typescript@7.23.3" - - "@commitlint/cli@18.6.0" - - "@commitlint/config-conventional@18.6.0" - - "@grnsft/if-core@0.0.10" - - "@jest/globals@29.7.0" - - "@types/jest@29.5.8" - - "@types/js-yaml@4.0.9" - - "@types/luxon@3.4.2" - - "@types/node@20.9.0" + - '@babel/core@7.22.10' + - '@babel/preset-typescript@7.23.3' + - '@commitlint/cli@18.6.0' + - '@commitlint/config-conventional@18.6.0' + - '@grnsft/if-core@0.0.22' + - '@jest/globals@29.7.0' + - '@types/jest@29.5.8' + - '@types/js-yaml@4.0.9' + - '@types/luxon@3.4.2' + - '@types/node@20.9.0' - axios-mock-adapter@1.22.0 - axios@1.7.2 - cross-env@7.0.3 @@ -52,13 +52,14 @@ execution: - typescript-cubic-spline@1.0.1 - typescript@5.2.2 - winston@3.11.0 - - zod@3.22.4 + - zod@3.23.8 status: success tree: children: child: pipeline: - - coefficient + compute: + - coefficient inputs: - timestamp: 2023-08-06T00:00 duration: 3600 @@ -67,4 +68,4 @@ tree: - timestamp: 2023-08-06T00:00 duration: 3600 carbon: 30 - carbon-product: 90 + carbon-product: 90 \ No newline at end of file diff --git a/manifests/outputs/pipelines/nesting.yaml b/manifests/outputs/pipelines/nesting.yaml index f32120275..3a390abac 100644 --- a/manifests/outputs/pipelines/nesting.yaml +++ b/manifests/outputs/pipelines/nesting.yaml @@ -150,7 +150,7 @@ initialize: config: input-parameters: - carbon-operational - - carbon-embodied + - embodied-carbon output-parameter: carbon parameter-metadata: inputs: @@ -158,7 +158,7 @@ initialize: description: Operational carbon footprint unit: gCO2eq aggregation-method: sum - carbon-embodied: + embodied-carbon: description: Embodied carbon footprint unit: gCO2eq aggregation-method: sum @@ -319,7 +319,7 @@ tree: cpu-energy-raw: 0.00006833333333333335 vcpu-ratio: 8 cpu-energy-kwh: 0.000008541666666666668 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.006833333333333334 carbon: 0.0068434614408929475 sci: 0.00006983123919278518 @@ -343,7 +343,7 @@ tree: cpu-energy-raw: 0.00005340277777777778 vcpu-ratio: 8 cpu-energy-kwh: 0.000006675347222222222 - carbon-embodied: 0.000010128107559614407 + embodied-carbon: 0.000010128107559614407 carbon-operational: 0.005340277777777777 carbon: 0.005350405885337391 sci: 0.0001028924208718729 @@ -367,7 +367,7 @@ tree: cpu-energy-raw: 0.00005190972222222222 vcpu-ratio: 8 cpu-energy-kwh: 0.0000064887152777777775 - carbon-embodied: 0.000010128107559614407 + embodied-carbon: 0.000010128107559614407 carbon-operational: 0.005190972222222222 carbon: 0.0052011003297818366 sci: 0.0001544881286073813 @@ -391,7 +391,7 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.005190972222222222 carbon: 0.005201100329781837 sci: 0.0005673927632489277 @@ -415,7 +415,7 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.005190972222222222 carbon: 0.005201100329781837 sci: 0.0005673927632489277 @@ -439,7 +439,7 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.005190972222222222 carbon: 0.005201100329781837 sci: 0.0005673927632489277 @@ -463,7 +463,7 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.005190972222222222 carbon: 0.005201100329781837 sci: 0.0005673927632489277 @@ -487,7 +487,7 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.005190972222222222 carbon: 0.005201100329781837 sci: 0.0005673927632489277 @@ -511,7 +511,7 @@ tree: cpu-energy-raw: 0.000031145833333333336 vcpu-ratio: 8 cpu-energy-kwh: 0.000003893229166666667 - carbon-embodied: 0.000006076864535768645 + embodied-carbon: 0.000006076864535768645 carbon-operational: 0.0031145833333333334 carbon: 0.003120660197869102 sci: 0.0005673927632489276 @@ -535,7 +535,7 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 - carbon-embodied: 0 + embodied-carbon: 0 carbon-operational: 0 carbon: 0 sci: 0 @@ -559,7 +559,7 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 - carbon-embodied: 0 + embodied-carbon: 0 carbon-operational: 0 carbon: 0 sci: 0 @@ -583,7 +583,7 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 - carbon-embodied: 0 + embodied-carbon: 0 carbon-operational: 0 carbon: 0 sci: 0 @@ -607,7 +607,7 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 - carbon-embodied: 0 + embodied-carbon: 0 carbon-operational: 0 carbon: 0 sci: 0 @@ -685,7 +685,7 @@ tree: cpu-energy-raw: 0.00006833333333333335 vcpu-ratio: 8 cpu-energy-kwh: 0.000008541666666666668 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.006833333333333334 carbon: 0.0068434614408929475 sci: 0.0000834568468401579 @@ -709,7 +709,7 @@ tree: cpu-energy-raw: 0.00005340277777777778 vcpu-ratio: 8 cpu-energy-kwh: 0.000006675347222222222 - carbon-embodied: 0.000010128107559614407 + embodied-carbon: 0.000010128107559614407 carbon-operational: 0.005340277777777777 carbon: 0.005350405885337391 sci: 0.00015224732194049487 @@ -733,7 +733,7 @@ tree: cpu-energy-raw: 0.00005190972222222222 vcpu-ratio: 8 cpu-energy-kwh: 0.0000064887152777777775 - carbon-embodied: 0.000010128107559614407 + embodied-carbon: 0.000010128107559614407 carbon-operational: 0.005190972222222222 carbon: 0.0052011003297818366 sci: 0.000363108733129716 @@ -757,7 +757,7 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.005190972222222222 carbon: 0.005201100329781837 sci: 0.0014184819081223194 @@ -781,7 +781,7 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.005190972222222222 carbon: 0.005201100329781837 sci: 0.0014184819081223194 @@ -805,7 +805,7 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.005190972222222222 carbon: 0.005201100329781837 sci: 0.0014184819081223194 @@ -829,7 +829,7 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.005190972222222222 carbon: 0.005201100329781837 sci: 0.0014184819081223194 @@ -853,7 +853,7 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.005190972222222222 carbon: 0.005201100329781837 sci: 0.0014184819081223194 @@ -877,7 +877,7 @@ tree: cpu-energy-raw: 0.000031145833333333336 vcpu-ratio: 8 cpu-energy-kwh: 0.000003893229166666667 - carbon-embodied: 0.000006076864535768645 + embodied-carbon: 0.000006076864535768645 carbon-operational: 0.0031145833333333334 carbon: 0.003120660197869102 sci: 0.0014184819081223194 @@ -901,7 +901,7 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 - carbon-embodied: 0 + embodied-carbon: 0 carbon-operational: 0 carbon: 0 sci: 0 @@ -925,7 +925,7 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 - carbon-embodied: 0 + embodied-carbon: 0 carbon-operational: 0 carbon: 0 sci: 0 @@ -949,7 +949,7 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 - carbon-embodied: 0 + embodied-carbon: 0 carbon-operational: 0 carbon: 0 sci: 0 @@ -973,7 +973,7 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 - carbon-embodied: 0 + embodied-carbon: 0 carbon-operational: 0 carbon: 0 sci: 0 @@ -1053,7 +1053,7 @@ tree: cpu-energy-raw: 0.00006833333333333335 vcpu-ratio: 8 cpu-energy-kwh: 0.000008541666666666668 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.006833333333333334 carbon: 0.0068434614408929475 sci: 0.00006709275922444067 @@ -1077,7 +1077,7 @@ tree: cpu-energy-raw: 0.00005340277777777778 vcpu-ratio: 8 cpu-energy-kwh: 0.000006675347222222222 - carbon-embodied: 0.000010128107559614407 + embodied-carbon: 0.000010128107559614407 carbon-operational: 0.005340277777777777 carbon: 0.005350405885337391 sci: 0.0000911261343001502 @@ -1101,7 +1101,7 @@ tree: cpu-energy-raw: 0.00005190972222222222 vcpu-ratio: 8 cpu-energy-kwh: 0.0000064887152777777775 - carbon-embodied: 0.000010128107559614407 + embodied-carbon: 0.000010128107559614407 carbon-operational: 0.005190972222222222 carbon: 0.0052011003297818366 sci: 0.00014075142645028166 @@ -1125,7 +1125,7 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.005190972222222222 carbon: 0.005201100329781837 sci: 0.0007801650494672756 @@ -1149,7 +1149,7 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.005190972222222222 carbon: 0.005201100329781837 sci: 0.0007801650494672756 @@ -1173,7 +1173,7 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.005190972222222222 carbon: 0.005201100329781837 sci: 0.0007801650494672756 @@ -1197,7 +1197,7 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.005190972222222222 carbon: 0.005201100329781837 sci: 0.0007801650494672756 @@ -1221,7 +1221,7 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.005190972222222222 carbon: 0.005201100329781837 sci: 0.0007801650494672756 @@ -1245,7 +1245,7 @@ tree: cpu-energy-raw: 0.000031145833333333336 vcpu-ratio: 8 cpu-energy-kwh: 0.000003893229166666667 - carbon-embodied: 0.000006076864535768645 + embodied-carbon: 0.000006076864535768645 carbon-operational: 0.0031145833333333334 carbon: 0.003120660197869102 sci: 0.0007801650494672755 @@ -1269,7 +1269,7 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 - carbon-embodied: 0 + embodied-carbon: 0 carbon-operational: 0 carbon: 0 sci: 0 @@ -1293,7 +1293,7 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 - carbon-embodied: 0 + embodied-carbon: 0 carbon-operational: 0 carbon: 0 sci: 0 @@ -1317,7 +1317,7 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 - carbon-embodied: 0 + embodied-carbon: 0 carbon-operational: 0 carbon: 0 sci: 0 @@ -1341,7 +1341,7 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 - carbon-embodied: 0 + embodied-carbon: 0 carbon-operational: 0 carbon: 0 sci: 0 @@ -1419,7 +1419,7 @@ tree: cpu-energy-raw: 0.00006833333333333335 vcpu-ratio: 8 cpu-energy-kwh: 0.000008541666666666668 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.006833333333333334 carbon: 0.0068434614408929475 sci: 0.00007603846045436609 @@ -1443,7 +1443,7 @@ tree: cpu-energy-raw: 0.00005340277777777778 vcpu-ratio: 8 cpu-energy-kwh: 0.000006675347222222222 - carbon-embodied: 0.000010128107559614407 + embodied-carbon: 0.000010128107559614407 carbon-operational: 0.005340277777777777 carbon: 0.005350405885337391 sci: 0.00012081561676568304 @@ -1467,7 +1467,7 @@ tree: cpu-energy-raw: 0.00005190972222222222 vcpu-ratio: 8 cpu-energy-kwh: 0.0000064887152777777775 - carbon-embodied: 0.000010128107559614407 + embodied-carbon: 0.000010128107559614407 carbon-operational: 0.005190972222222222 carbon: 0.0052011003297818366 sci: 0.0001832602465191587 @@ -1491,7 +1491,7 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.005190972222222222 carbon: 0.005201100329781837 sci: 0.0007801650494672756 @@ -1515,7 +1515,7 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.005190972222222222 carbon: 0.005201100329781837 sci: 0.0007801650494672756 @@ -1539,7 +1539,7 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.005190972222222222 carbon: 0.005201100329781837 sci: 0.0007801650494672756 @@ -1563,7 +1563,7 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.005190972222222222 carbon: 0.005201100329781837 sci: 0.0007801650494672756 @@ -1587,7 +1587,7 @@ tree: cpu-energy-raw: 0.00005190972222222223 vcpu-ratio: 8 cpu-energy-kwh: 0.000006488715277777778 - carbon-embodied: 0.000010128107559614409 + embodied-carbon: 0.000010128107559614409 carbon-operational: 0.005190972222222222 carbon: 0.005201100329781837 sci: 0.0007801650494672756 @@ -1611,7 +1611,7 @@ tree: cpu-energy-raw: 0.000031145833333333336 vcpu-ratio: 8 cpu-energy-kwh: 0.000003893229166666667 - carbon-embodied: 0.000006076864535768645 + embodied-carbon: 0.000006076864535768645 carbon-operational: 0.0031145833333333334 carbon: 0.003120660197869102 sci: 0.0007801650494672755 @@ -1635,7 +1635,7 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 - carbon-embodied: 0 + embodied-carbon: 0 carbon-operational: 0 carbon: 0 sci: 0 @@ -1659,7 +1659,7 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 - carbon-embodied: 0 + embodied-carbon: 0 carbon-operational: 0 carbon: 0 sci: 0 @@ -1683,7 +1683,7 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 - carbon-embodied: 0 + embodied-carbon: 0 carbon-operational: 0 carbon: 0 sci: 0 @@ -1707,7 +1707,7 @@ tree: cpu-energy-raw: 0 vcpu-ratio: 8 cpu-energy-kwh: 0 - carbon-embodied: 0 + embodied-carbon: 0 carbon-operational: 0 carbon: 0 sci: 0 diff --git a/manifests/outputs/pipelines/pipeline-teads-sci.yaml b/manifests/outputs/pipelines/pipeline-teads-sci.yaml index abefd4adf..c014d9f6d 100644 --- a/manifests/outputs/pipelines/pipeline-teads-sci.yaml +++ b/manifests/outputs/pipelines/pipeline-teads-sci.yaml @@ -81,7 +81,7 @@ initialize: config: input-parameters: - carbon-operational - - carbon-embodied + - embodied-carbon output-parameter: carbon execution: command: >- @@ -197,7 +197,7 @@ tree: cpu-energy-raw: 0.000020833333333333333 vcpu-ratio: 8 cpu-energy-kwh: 0.0000026041666666666666 - carbon-embodied: 0.0000020256215119228817 + embodied-carbon: 0.0000020256215119228817 carbon-operational: 0.0020833333333333333 carbon: 0.002085358954845256 sci: 0.002085358954845256 @@ -221,7 +221,7 @@ tree: cpu-energy-raw: 0.000059375 vcpu-ratio: 8 cpu-energy-kwh: 0.000007421875 - carbon-embodied: 0.000010128107559614407 + embodied-carbon: 0.000010128107559614407 carbon-operational: 0.0059375 carbon: 0.005947628107559615 sci: 0.005947628107559615 @@ -245,7 +245,7 @@ tree: cpu-energy-raw: 0.00007267361111111111 vcpu-ratio: 8 cpu-energy-kwh: 0.000009084201388888889 - carbon-embodied: 0.00001417935058346017 + embodied-carbon: 0.00001417935058346017 carbon-operational: 0.007267361111111111 carbon: 0.007281540461694571 sci: 0.007281540461694571 @@ -269,7 +269,7 @@ tree: cpu-energy-raw: 0.00031145833333333335 vcpu-ratio: 8 cpu-energy-kwh: 0.00003893229166666667 - carbon-embodied: 0.00006076864535768645 + embodied-carbon: 0.00006076864535768645 carbon-operational: 0.031145833333333334 carbon: 0.03120660197869102 sci: 0.03120660197869102 diff --git a/manifests/outputs/pipelines/sci.yaml b/manifests/outputs/pipelines/sci.yaml index 99eed0ff6..322a413b8 100644 --- a/manifests/outputs/pipelines/sci.yaml +++ b/manifests/outputs/pipelines/sci.yaml @@ -84,7 +84,7 @@ initialize: config: input-parameters: - carbon-operational - - carbon-embodied + - embodied-carbon output-parameter: carbon sci: path: builtin @@ -210,7 +210,7 @@ tree: vcpu-ratio: 4 cpu/energy: 0.000005208333333333333 energy: 0.000006208333333333333 - carbon-embodied: 0.000004051243023845763 + embodied-carbon: 0.000004051243023845763 carbon-operational: 0.004966666666666666 carbon: 0.004970717909690512 sci: 0.004970717909690512 @@ -237,7 +237,7 @@ tree: vcpu-ratio: 4 cpu/energy: 0.00001484375 energy: 0.00001584375 - carbon-embodied: 0.000020256215119228814 + embodied-carbon: 0.000020256215119228814 carbon-operational: 0.012674999999999999 carbon: 0.012695256215119228 sci: 0.012695256215119228 @@ -264,7 +264,7 @@ tree: vcpu-ratio: 4 cpu/energy: 0.000018168402777777778 energy: 0.000019168402777777778 - carbon-embodied: 0.00002835870116692034 + embodied-carbon: 0.00002835870116692034 carbon-operational: 0.015334722222222222 carbon: 0.015363080923389142 sci: 0.015363080923389142 @@ -291,7 +291,7 @@ tree: vcpu-ratio: 4 cpu/energy: 0.00007786458333333334 energy: 0.00007886458333333333 - carbon-embodied: 0.0001215372907153729 + embodied-carbon: 0.0001215372907153729 carbon-operational: 0.06309166666666667 carbon: 0.06321320395738204 - sci: 0.06321320395738204 + sci: 0.06321320395738204 \ No newline at end of file From 5d5311c849d0cb99934153e8f318f17967112df4 Mon Sep 17 00:00:00 2001 From: manushak Date: Wed, 11 Sep 2024 18:58:26 +0400 Subject: [PATCH 2/4] fix(manifests): fix sci-embodied success manifest --- manifests/examples/builtins/sci-embodied/success.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/manifests/examples/builtins/sci-embodied/success.yml b/manifests/examples/builtins/sci-embodied/success.yml index c37677931..cff80fe05 100644 --- a/manifests/examples/builtins/sci-embodied/success.yml +++ b/manifests/examples/builtins/sci-embodied/success.yml @@ -12,7 +12,7 @@ initialize: query: instance-class: cloud/instance-type output: ["cpu-cores-utilized", "vcpus-allocated"] - "sci-embodied-new": # a model that calculates m from te, tir, el, rr and rtor + "sci-embodied": # a model that calculates m from te, tir, el, rr and rtor method: SciEmbodied path: "builtin" tree: @@ -31,3 +31,6 @@ tree: inputs: - timestamp: 2023-07-06T00:00 duration: 3600 + cloud/vendor: intel + cloud/instance-type: Standard_A1_v2 + cpu/utilization: 10 From fb1c73b9846edb8348d0fa9b52b9b330ca653f3b Mon Sep 17 00:00:00 2001 From: manushak Date: Wed, 11 Sep 2024 18:59:23 +0400 Subject: [PATCH 3/4] fix(mocks): rename `carbon-embodied` to `embodied-carbon` --- src/__mocks__/builtins/export-yaml.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/__mocks__/builtins/export-yaml.ts b/src/__mocks__/builtins/export-yaml.ts index 5ebf9cb1b..5d23a8705 100644 --- a/src/__mocks__/builtins/export-yaml.ts +++ b/src/__mocks__/builtins/export-yaml.ts @@ -43,8 +43,8 @@ export const tree = { 'resources-reserved': 1, 'resources-total': 8, 'cpu/energy': 0.000008888888888888888, - "carbon-plus-energy'": 10.000008888888889, - 'carbon-embodied': 0.0000020256215119228817, + 'carbon-plus-energy': 10.000008888888889, + 'embodied-carbon': 0.0000020256215119228817, 'carbon-operational': 4000, carbon: 4000.0000020256216, sci: 240000.0001215373, @@ -92,7 +92,7 @@ export const tree = { 'resources-total': 8, 'cpu/energy': 0.00001650338753387534, "carbon-plus-energy'": 10.000016503387533, - 'carbon-embodied': 0.0000020256215119228817, + 'embodied-carbon': 0.0000020256215119228817, 'carbon-operational': 4000, carbon: 4000.0000020256216, sci: 240000.0001215373, From ed44b194fa4406664bff3d60518a5d877307a21f Mon Sep 17 00:00:00 2001 From: manushak Date: Wed, 11 Sep 2024 19:00:02 +0400 Subject: [PATCH 4/4] docs(builtins): rename `carbon-embodied` to `embodied-carbon` --- src/if-run/builtins/sci-embodied/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/if-run/builtins/sci-embodied/README.md b/src/if-run/builtins/sci-embodied/README.md index a40072278..80baeab06 100644 --- a/src/if-run/builtins/sci-embodied/README.md +++ b/src/if-run/builtins/sci-embodied/README.md @@ -22,7 +22,7 @@ The `parameter-metadata` section contains information about the `description`, ` - `unit`: The unit of measurement for the parameter. - `aggregation-method`: The method used to aggregate this parameter (`sum`, `avg`, or `none`). -- `outputs`: Describes the `carbon-embodied` parameter, which includes: +- `outputs`: Describes the `embodied-carbon` parameter, which includes: - `description`: A brief description of the parameter. - `unit`: The unit of measurement for the parameter. - `aggregation-method`: The method used to aggregate this parameter (`sum`, `avg`, or `none`). @@ -70,7 +70,7 @@ Note that if you do not provide any inputs at all, we fall back to defaults that ### Outputs -- `carbon-embodied`: The total embodied emissions for the component, measured in gCO2e, per timestep. +- `embodied-carbon`: The total embodied emissions for the component, measured in gCO2e, per timestep. ## Calculation @@ -123,7 +123,7 @@ tree: child: pipeline: compute: - - sci-embodied + - sci-embodied inputs: - timestamp: 2024-08-19T00:00 duration: 3600