Skip to content

Commit 7017319

Browse files
committed
fix: replace term iteration with ensemble
1 parent 4bd35f8 commit 7017319

File tree

2 files changed

+28
-27
lines changed

2 files changed

+28
-27
lines changed

tests/testdata/case.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
# example YAML file for ensembles (a parent object in Sumo)
22

3-
$schema: https://main-fmu-schemas-dev.radix.equinor.com/schemas/0.8.0/fmu_results.json
4-
version: "0.8.0" # including for REP and others to build logic on.
5-
source: fmu # always included, and always this value if FMU made it. For quick identification for external consumers.
3+
$schema: https://main-fmu-schemas-dev.radix.equinor.com/schemas/0.12.0/fmu_results.json
4+
version: "0.12.0" # including for REP and others to build logic on.
5+
source: fmu # always included, and always this value if FMU made it. For quick identification for external consumers.
66
class: case
77
fmu:
88
case:
99
name: TestCase from fmu.sumo
10-
uuid: 8bb56d60-8758-481a-89a4-6bac8561d38e # (pseudo-)random valid uuid4xs
10+
uuid: 8bb56d60-8758-481a-89a4-6bac8561d38e # (pseudo-)random valid uuid4xs, this is re-generated in tests.
1111
user:
1212
id: testuser # $USER from ERT
1313
description:
1414
- yet other detailed description
1515
- optional
16-
restart_from: 00000000-0000-0000-0000-000000000000 # fmu.iteration.uuid for another iteration/case
16+
restart_from: 00000000-0000-0000-0000-000000000000 # fmu.ensemble.uuid for another ensemble/case
1717
model:
1818
name: ff
1919
revision: 21.0.0.dev
@@ -26,7 +26,7 @@ fmu:
2626

2727
access:
2828
asset:
29-
name: Drogon # adding level to make room for unique ID in the future
29+
name: Drogon # adding level to make room for unique ID in the future
3030

3131
# ensemble objects have no ssdl details
3232

tests/testdata/surface.yml

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
$schema: https://main-fmu-schemas-dev.radix.equinor.com/schemas/0.8.0/fmu_results.json
2-
version: "0.8.0" # including for REP and others to build logic on.
3-
source: fmu # always included, and always this value if FMU made it. For quick identification for external consumers.
1+
$schema: https://main-fmu-schemas-dev.radix.equinor.com/schemas/0.12.0/fmu_results.json
2+
version: "0.12.0" # including for REP and others to build logic on.
3+
source: fmu # always included, and always this value if FMU made it. For quick identification for external consumers.
44

55
tracklog:
66
- datetime: '2020-10-28T14:28:02'
@@ -24,10 +24,10 @@ fmu:
2424
description:
2525
- detailed description
2626
- optional
27-
27+
2828
context:
2929
stage: "realization"
30-
30+
3131
workflow: # not sure, but a reference to the workflow / job that made this. Making it expandable.
3232
reference: rms/structural_model
3333

@@ -39,16 +39,19 @@ fmu:
3939
description:
4040
- yet other detailed description
4141
- optional
42-
restart_from: 15ce3b84-766f-4c93-9050-b154861f9100 # fmu.iteration.uuid for another iteration/case
42+
restart_from: 15ce3b84-766f-4c93-9050-b154861f9100 # fmu.ensemble.uuid for another ensemble/case
4343

44-
iteration:
44+
ensemble:
4545
id: 0 # always an int, will be 0 for e.g. "pred"
46-
uuid: 4b939310-34b1-4179-802c-49460bc0f799 # hash of case.uuid + iteration.id
46+
uuid: 4b939310-34b1-4179-802c-49460bc0f799 # hash of case.uuid + ensemble.id
4747
name: "iter-0" # /"pred"
4848

49-
realization: # could be expanded in the future?
49+
entity:
50+
uuid: dc2971e1-abae-4691-92fc-17fbd926461a
51+
52+
realization: # could be expanded in the future?
5053
id: 33
51-
uuid: 29a15b21-ce13-471b-9a4a-0f791552aa51 # hash of case.uuid + iteration.uuid + realization.id
54+
uuid: 29a15b21-ce13-471b-9a4a-0f791552aa51 # hash of case.uuid + ensemble.uuid + realization.id
5255
name: "realization-33"
5356
parameters: # directly pass parameters.txt. This is potentially a lot of content, only a stub is included here.
5457
SENSNAME: faultseal
@@ -61,28 +64,27 @@ fmu:
6164
FAULT_SEAL_SCALING: 0.1
6265
FWL_CENTRAL: 1677
6366
jobs: # directly pass jobs.json. This is a lot of content, only a stub is included here.
64-
umask: '0002'
67+
umask: "0002"
6568
DATA_ROOT: /some/path/20.4.0_20201106/ert/model
6669
anything: something
6770
something:
6871
anything: something
6972
global_update_path: {}
7073
jobList:
71-
- name: MAKE_DIRECTORY
72-
min_arg: 1
73-
anything: something
74+
- name: MAKE_DIRECTORY
75+
min_arg: 1
76+
anything: something
7477

7578
file:
7679
relative_path: realization-33/iter-0/share/results/maps/volantis_gp_base--amplitude.gri # case-relative
7780
absolute_path: /some/absolute/path//realization-33/iter-0/share/results/maps/volantis_gp_base--amplitude.gri
78-
checksum_md5: 0123456789abcdef0123456789abcdef # checksum of the file, not the data.
81+
checksum_md5: 0123456789abcdef0123456789abcdef # checksum of the file, not the data.
7982

8083
data: # The data block describes the actual data (e.g. surface). Only present in data objects
81-
8284
# if stratigraphic, name must match the strat column. This is the official name of this surface.
8385
name: volantis_top-volantis_base
84-
stratigraphic: false # if true, this is a stratigraphic surface found in the strat column
85-
offset: 0.0 # to be used if a specific horizon is represented with an offset.
86+
stratigraphic: false # if true, this is a stratigraphic surface found in the strat column
87+
offset: 0.0 # to be used if a specific horizon is represented with an offset.
8688

8789
top: # not required, but allowed
8890
name: volantis_gp_top
@@ -127,7 +129,7 @@ data: # The data block describes the actual data (e.g. surface). Only present in
127129
yinc: 25.0
128130
yflip: 1
129131
rotation: 30.000000834826057
130-
undef: 1.0e+33 # Allow both number and string
132+
undef: 1.0e+33 # Allow both number and string
131133
bbox:
132134
xmin: 456012.5003497944
133135
xmax: 467540.52762886323
@@ -181,10 +183,9 @@ masterdata:
181183
field:
182184
- identifier: DROGON
183185
uuid: 00000000-0000-0000-0000-000000000000
184-
coordinate_system: # changing from "coordinates" to clarify this is not content
186+
coordinate_system: # changing from "coordinates" to clarify this is not content
185187
identifier: ST_WGS84_UTM37N_P32637
186188
uuid: ad214d85-dac7-19da-e053-c918a4889309
187189
stratigraphic_column:
188190
identifier: DROGON_2020
189191
uuid: 12345678-1234-1234-1234-123456789012
190-

0 commit comments

Comments
 (0)