Code

Merging dev onto release#2890

Code

Merged

jgostick merged 34 commits intoreleasePMEAL/OpenPNM:releasefrom devPMEAL/OpenPNM:devCopy head branch name to clipboardJan 26, 2024

+94,937-70,658

Commits

Commits on Jul 23, 2023

• updating the init files in a few places with docstrings

  jgostick

  committed
  46fba6a

  Copy full SHA for 46fba6a

Commits on Sep 26, 2023

• Merge branch 'dev' into fixing-basic-usage-docs

  jgostick

  committed
  be976f3

  Copy full SHA for be976f3

Commits on Sep 28, 2023

• fixing typos generator tutorial

  jgostick

  committed
  64f3a9f

  Copy full SHA for 64f3a9f

Commits on Oct 5, 2023

• fixed typos in tutorial No.3: data and topology storage

  MohammadMehrnia787

  committed
  1777992

  Copy full SHA for 1777992

Commits on Oct 26, 2023

• Deleted line that adds pore.coords property to bcc network

  mkaguer

  committed
  2e05f38

  Copy full SHA for 2e05f38

Commits on Nov 3, 2023

• Improved spheres_and_cylinders conduit lengths model to catch more edge cases

  jgostick

  committed
  5e600bc

  Copy full SHA for 5e600bc

• enhanced tests to catch additional case

  jgostick

  committed
  4270b12

  Copy full SHA for 4270b12

• updating shape factor tests

  jgostick

  committed
  cb48a8c

  Copy full SHA for cb48a8c

• added hydraulic conductance integration tests

  jgostick

  committed
  99a4fe0

  Copy full SHA for 99a4fe0

• oops, forgot to add assert before isclose

  jgostick

  committed
  12b6f45

  Copy full SHA for 12b6f45

• comparing conduits to analytical solution in integration test

  jgostick

  committed
  6d663d7

  Copy full SHA for 6d663d7

Commits on Nov 22, 2023

• Merge branch 'dev' into fixing-basic-usage-docs

  jgostick

  committed
  7bb0564

  Copy full SHA for 7bb0564

• adding a network extraction example

  jgostick

  committed
  9648d71

  Copy full SHA for 9648d71

• fixing a pep8 error

  jgostick

  committed
  95c7a7e

  Copy full SHA for 95c7a7e

• Merge pull request #2866 from PMEAL/fixing-basic-usage-docs

  Show description for b301339
  jgostick

  authored
  b301339

  Copy full SHA for b301339

• Bump version number (build part)

  

  actions-user

  authored and

  github-actions[bot]

  committed
  eed4136

  Copy full SHA for eed4136

• Update docs.txt

  Show description for 5bab78e
  jgostick

  authored
  5bab78e

  Copy full SHA for 5bab78e

• Bump version number (build part)

  

  actions-user

  authored and

  github-actions[bot]

  committed
  5e2404c

  Copy full SHA for 5e2404c

Commits on Nov 23, 2023

• fixing typos

  Show description for a905ae1
  MohammadMehrnia787

  committed
  a905ae1

  Copy full SHA for a905ae1

Commits on Dec 6, 2023

• typos in examples #1-10

  Show description for bc04bda
  MohammadMehrnia787

  committed
  bc04bda

  Copy full SHA for bc04bda

Commits on Dec 22, 2023

• Merge pull request #2831 from PMEAL/fixing_typos_in_examples

  Show description for 4d5b844
  jgostick

  authored
  4d5b844

  Copy full SHA for 4d5b844

• Bump version number (build part)

  

  actions-user

  authored and

  github-actions[bot]

  committed
  0baf355

  Copy full SHA for 0baf355

Commits on Jan 26, 2024

• Fixed bug in pore surface area models

  jgostick

  committed
  9e31311

  Copy full SHA for 9e31311

• updating tests

  jgostick

  committed
  c6a4333

  Copy full SHA for c6a4333

• updating tests

  jgostick

  committed
  93b5bb5

  Copy full SHA for 93b5bb5

• adding check to prevent negative numbers

  jgostick

  committed
  51c3715

  Copy full SHA for 51c3715

• Merge pull request #2889 from PMEAL/fix_pore_surface_area

  Show description for 47e0ac7
  jgostick

  authored
  47e0ac7

  Copy full SHA for 47e0ac7

• Bump version number (build part)

  

  actions-user

  authored and

  github-actions[bot]

  committed
  1668355

  Copy full SHA for 1668355

• Merge branch 'release' into dev

  Show description for cc3012b
  jgostick

  committed
  cc3012b

  Copy full SHA for cc3012b

• Bump version number (build part)

  

  actions-user

  authored and

  github-actions[bot]

  committed
  53b6e6c

  Copy full SHA for 53b6e6c

• Merge pull request #2848 from PMEAL/issue2847_bcc

  Show description for 478890c
  jgostick

  authored
  478890c

  Copy full SHA for 478890c

• Bump version number (build part)

  

  actions-user

  authored and

  github-actions[bot]

  committed
  3677802

  Copy full SHA for 3677802

• Merge pull request #2853 from PMEAL/more_robust_conduit_lengths

  Show description for 4d41843
  jgostick

  authored
  4d41843

  Copy full SHA for 4d41843

• Bump version number (build part)

  

  actions-user

  authored and

  github-actions[bot]

  committed
  223b0c0

  Copy full SHA for 223b0c0