Code

Updated block models for v2#125

Code

Open

Tim-Evans-Seequent wants to merge 45 commits intogmggroup:devgmggroup/omf-python:devfrom seequent:blockmodelseequent/omf:blockmodelCopy head branch name to clipboard

+1,182-2,636

Commits

Commits on Feb 26, 2023

• Ignore vscode settings.

  

  Tim Evans

  committed
  a0a7029

  Copy full SHA for a0a7029

• Fix test failures with latest NumPy.

  

  Tim Evans

  committed
  2a864bf

  Copy full SHA for 2a864bf

Commits on Feb 27, 2023

• Sketched out the basics of new block models.

  

  Tim Evans

  committed
  fa89c46

  Copy full SHA for fa89c46

• Moved to sub-package.

  

  Tim Evans

  committed
  01a856d

  Copy full SHA for 01a856d

• Split up.

  

  Tim Evans

  committed
  8448b16

  Copy full SHA for 8448b16

Commits on Feb 28, 2023

• Added more sub-block checks.

  

  Tim Evans

  committed
  3c2f800

  Copy full SHA for 3c2f800

• Split definitions from models to make things simpler.

  

  Tim Evans

  committed
  1a96190

  Copy full SHA for 1a96190

• Test that uint array packing works.

  

  Tim Evans

  committed
  8f3335d

  Copy full SHA for 8f3335d

• Raise ValidationError from sub-block checks.

  

  Tim Evans

  committed
  e2c7ab6

  Copy full SHA for e2c7ab6

• Added free-form sub-blocked models.

  

  Tim Evans

  committed
  3a8901b

  Copy full SHA for 3a8901b

Commits on Mar 1, 2023

• Finished sub-block checks and tests for them.

  

  Tim Evans

  committed
  6726a95

  Copy full SHA for 6726a95

• Removed dead test code, added a few more tests.

  

  Tim Evans

  committed
  002b963

  Copy full SHA for 002b963

Commits on Mar 2, 2023

• Cleaned up code and added docstrings.

  

  Tim Evans

  committed
  d2e6850

  Copy full SHA for d2e6850

• Merge remote-tracking branch 'origin/master' into block-models-v2

  

  Tim Evans

  committed
  ceb94d4

  Copy full SHA for ceb94d4

• Cleaned up merge issues.

  

  Tim Evans

  committed
  f00f3ba

  Copy full SHA for f00f3ba

• Added schemas to objects without them, and cleaned up code.

  

  Tim Evans

  committed
  90243cd

  Copy full SHA for 90243cd

• Fixed pylint complaints.

  

  Tim Evans

  committed
  8f3b495

  Copy full SHA for 8f3b495

• Fixed failing schema lookups giving bad error messages.

  

  Tim Evans

  committed
  04fbe72

  Copy full SHA for 04fbe72

• Fixed v2 asset test.

  

  Tim Evans

  committed
  e4a148f

  Copy full SHA for e4a148f

• Copy origin correctly for VolumeGridGeometry.

  

  Tim Evans

  committed
  2d288c4

  Copy full SHA for 2d288c4

• Removed match statement.

  

  Tim Evans

  committed
  63cc16b

  Copy full SHA for 63cc16b

• Don't assert things that are different on Linux.

  

  Tim Evans

  committed
  e7f8e07

  Copy full SHA for e7f8e07

• Use the lower-memory version of numpy.isin.

  

  Tim Evans

  committed
  b75a653

  Copy full SHA for b75a653

• Updated docs and fixed tests.

  

  Tim Evans

  committed
  6385672

  Copy full SHA for 6385672

• Fixed remaining tests.

  

  Tim Evans

  committed
  5a3009e

  Copy full SHA for 5a3009e

• Remove unused import.

  

  Tim Evans

  committed
  14df011

  Copy full SHA for 14df011

Commits on Mar 3, 2023

• Removed dead code and outdated notebooks.

  

  Tim Evans

  committed
  67eac27

  Copy full SHA for 67eac27

• Code review fixes.

  

  Tim Evans

  committed
  b65d863

  Copy full SHA for b65d863

Commits on Mar 13, 2023

• Code review changes and some tidying up.

  

  Tim Evans

  committed
  4d27671

  Copy full SHA for 4d27671

Commits on Mar 14, 2023

• Fixed unions and improved docs a little.

  

  Tim Evans

  committed
  93bd53b

  Copy full SHA for 93bd53b

• Added missing doc link.

  

  Tim Evans

  committed
  f7c8b5c

  Copy full SHA for f7c8b5c

• Removed unnecessary methods.

  

  Tim Evans

  committed
  15c5925

  Copy full SHA for 15c5925

• Changed to a single top-level block model element with optional sub-blocks.

  

  Tim Evans

  committed
  e8f4aa4

  Copy full SHA for e8f4aa4

• Moved the common parts of the block model definitions back to the block model.

  

  Tim Evans

  committed
  231d7c2

  Copy full SHA for 231d7c2

• Cleaned up sub-block modes.

  

  Tim Evans

  committed
  b009389

  Copy full SHA for b009389

Commits on Mar 16, 2023

• Removed useless code, cleaned up, and improved documentation.

  

  Tim Evans

  committed
  2a67566

  Copy full SHA for 2a67566

• Added missing part of sub-block docs.

  

  Tim Evans

  committed
  1a1b19e

  Copy full SHA for 1a1b19e

• Fixed pylint errors.

  

  Tim Evans

  committed
  56adf6a

  Copy full SHA for 56adf6a

• Fixed error in Python 3.11.

  

  Tim Evans

  committed
  6da9dac

  Copy full SHA for 6da9dac

Commits on Mar 17, 2023

• Improved free-form docs.

  

  Tim Evans

  committed
  2476ea8

  Copy full SHA for 2476ea8

• Fixed docs on BlockModel.

  

  Tim Evans

  committed
  99db672

  Copy full SHA for 99db672

• Merge pull request #2 from seequent/block-models-v2

  Show description for a353b9a
  Tim-Evans-Seequent

  authored
  a353b9a

  Copy full SHA for a353b9a

Commits on Mar 22, 2023

• Added examples of writing and reading block models.

  

  Tim Evans

  committed
  05b7d63

  Copy full SHA for 05b7d63

• Merge pull request #3 from seequent/block-model-examples

  Show description for 0dd0ad4
  Tim-Evans-Seequent

  authored
  0dd0ad4

  Copy full SHA for 0dd0ad4

Commits on Mar 23, 2023

• Improved validation of tensor arrays and removed empty file.

  

  Tim Evans

  committed
  3828402

  Copy full SHA for 3828402