Merge pull request #471 from dcrreynolds/dev

Updating if-demo functional-unit-time to match expected value
Green-Software-Foundation · Feb 28, 2024 · 012bcf8 · 012bcf8
2 parents 53b00e3 + 30e9a03
commit 012bcf8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 27 deletions.
diff --git a/examples/impls/test/if-demo.yml b/examples/impls/test/if-demo.yml
@@ -43,7 +43,7 @@ graph:
           grid-carbon-intensity: 951
         sci:
           functional-unit: ''
-          functional-unit-time: hour
+          functional-unit-time: 1-hour
       inputs:
           - timestamp: '2023-11-02T10:35:31.820Z'
             duration: 3600

diff --git a/examples/ompls/if-demo.yml b/examples/ompls/if-demo.yml
@@ -43,8 +43,7 @@ graph:
           grid-carbon-intensity: 951
         sci:
           functional-unit: ''
-          functional-unit-time: hour
-          functional-unit-duration: 1
+          functional-unit-time: 1-hour          
       inputs:
         - timestamp: '2023-11-02T10:35:31.820Z'
           duration: 3600
@@ -81,8 +80,7 @@ graph:
           total-resources: 64
           grid-carbon-intensity: 951
           functional-unit: ''
-          functional-unit-time: hour
-          functional-unit-duration: 1
+          functional-unit-time: 1-hour
           vcpus-allocated: '1'
           vcpus-total: '64'
           physical-processor: >-
@@ -119,8 +117,7 @@ graph:
           total-resources: 64
           grid-carbon-intensity: 951
           functional-unit: ''
-          functional-unit-time: hour
-          functional-unit-duration: 1
+          functional-unit-time: 1-hour
           vcpus-allocated: '1'
           vcpus-total: '64'
           physical-processor: >-
@@ -157,8 +154,7 @@ graph:
           total-resources: 64
           grid-carbon-intensity: 951
           functional-unit: ''
-          functional-unit-time: hour
-          functional-unit-duration: 1
+          functional-unit-time: 1-hour
           vcpus-allocated: '1'
           vcpus-total: '64'
           physical-processor: >-
@@ -195,8 +191,7 @@ graph:
           total-resources: 64
           grid-carbon-intensity: 951
           functional-unit: ''
-          functional-unit-time: hour
-          functional-unit-duration: 1
+          functional-unit-time: 1-hour
           vcpus-allocated: '1'
           vcpus-total: '64'
           physical-processor: >-
@@ -233,8 +228,7 @@ graph:
           total-resources: 64
           grid-carbon-intensity: 951
           functional-unit: ''
-          functional-unit-time: hour
-          functional-unit-duration: 1
+          functional-unit-time: 1-hour
           vcpus-allocated: '1'
           vcpus-total: '64'
           physical-processor: >-
@@ -271,8 +265,7 @@ graph:
           total-resources: 64
           grid-carbon-intensity: 951
           functional-unit: ''
-          functional-unit-time: hour
-          functional-unit-duration: 1
+          functional-unit-time: 1-hour
           vcpus-allocated: '1'
           vcpus-total: '64'
           physical-processor: >-
@@ -309,8 +302,7 @@ graph:
           total-resources: 64
           grid-carbon-intensity: 951
           functional-unit: ''
-          functional-unit-time: hour
-          functional-unit-duration: 1
+          functional-unit-time: 1-hour
           vcpus-allocated: '1'
           vcpus-total: '64'
           physical-processor: >-
@@ -347,8 +339,7 @@ graph:
           total-resources: 64
           grid-carbon-intensity: 951
           functional-unit: ''
-          functional-unit-time: hour
-          functional-unit-duration: 1
+          functional-unit-time: 1-hour
           vcpus-allocated: '1'
           vcpus-total: '64'
           physical-processor: >-
@@ -385,8 +376,7 @@ graph:
           total-resources: 64
           grid-carbon-intensity: 951
           functional-unit: ''
-          functional-unit-time: hour
-          functional-unit-duration: 1
+          functional-unit-time: 1-hour
           vcpus-allocated: '1'
           vcpus-total: '64'
           physical-processor: >-
@@ -423,8 +413,7 @@ graph:
           total-resources: 64
           grid-carbon-intensity: 951
           functional-unit: ''
-          functional-unit-time: hour
-          functional-unit-duration: 1
+          functional-unit-time: 1-hour
           vcpus-allocated: '1'
           vcpus-total: '64'
           physical-processor: >-
@@ -461,8 +450,7 @@ graph:
           total-resources: 64
           grid-carbon-intensity: 951
           functional-unit: ''
-          functional-unit-time: hour
-          functional-unit-duration: 1
+          functional-unit-time: 1-hour
           vcpus-allocated: '1'
           vcpus-total: '64'
           physical-processor: >-
@@ -499,8 +487,7 @@ graph:
           total-resources: 64
           grid-carbon-intensity: 951
           functional-unit: ''
-          functional-unit-time: hour
-          functional-unit-duration: 1
+          functional-unit-time: 1-hour
           vcpus-allocated: '1'
           vcpus-total: '64'
           physical-processor: >-
@@ -515,3 +502,4 @@ graph:
           embodied-carbon: 0.00007616949023199022
           carbon: 0.00928015128032383
           sci: 33.40854460916579
+if-version: v0.1.9