Skip to content

Commit

Permalink
Merge pull request #7 from equinor/mature-code-more
Browse files Browse the repository at this point in the history
Develop code vs metadata 0.7.1
  • Loading branch information
jcrivenaes authored May 4, 2021
2 parents 6994acb + be8699d commit bd92205
Show file tree
Hide file tree
Showing 10 changed files with 622 additions and 219 deletions.
8 changes: 4 additions & 4 deletions docs/example_surface_v070.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ tracklog: # changed from events

class: surface
file: # peesv: Re-entered the file block, as the file is a specific concept that we currently put logic on
absolute: c:/absolute/share/results/maps/volantis_gp_base--depth.gri
absolute: c:/absolute/share/results/maps/volantis_gp_base--depth.gri # JRIV added
relative: share/results/maps/volantis_gp_base--depth.gri
checksum_md5: kjhsdfvsdlfk23knerknvk23 #

Expand All @@ -31,9 +31,9 @@ fmu:
- detailed description
- optional

# KAN TENKE MEG Å DROPPE DENNE, DA DEN MÅ INJISERES ETTERPÅ
# workflow: # not sure, but a reference to the workflow / job that made this. Making it expandable.
# reference: rms/structural_model
# KAN TENKE MEG Å DROPPE DENNE, DA DEN MÅ INJISERES ETTERPÅ,
workflow:
reference: post eclipse script

# generes av scriptet som aggraderer... under aggradation??
element: # currently not used on Drogon, but extensively used on e.g. JS
Expand Down
10 changes: 10 additions & 0 deletions pytest.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#pytest tests/test_grid3d/test_grid.py::test_roffbin_import_v2_emerald -o log_cli=true -s

[pytest]
minversion = 6.0
addopts = --verbose
log_cli = False
log_cli_format = %(levelname)8s (%(relativeCreated)6.0fms) %(filename)44s [%(funcName)40s()] %(lineno)4d >> %(message)s
log_cli_level = INFO
testpaths =
tests
Loading

0 comments on commit bd92205

Please sign in to comment.