Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update for 0.10.0.dev0 #14

Merged
merged 9 commits into from
Oct 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ on:
jobs:
build-and-test:
runs-on: ubuntu-latest
container: ghcr.io/fenics/dolfinx/dolfinx:v0.8.0
container: ghcr.io/fenics/dolfinx/dolfinx:nightly
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Install FEniCSx-Shells
run: |
python3 -m pip install --no-build-isolation --check-build-dependencies '.[ci]'

- name: ruff checks
run: |
ruff check .
ruff format --check .

- name: Install FEniCSx-Shells
run: |
python3 -m pip install --no-build-isolation --check-build-dependencies .

- name: Build documentation
run: |
Expand Down
8 changes: 5 additions & 3 deletions demo/demo_nonlinear-naghdi-clamped-semicylinder.py
Original file line number Diff line number Diff line change
Expand Up @@ -545,10 +545,12 @@ def compute_cell_contributions(V, points):
at that point"""
# Determine what process owns a point and what cells it lies within
mesh = V.mesh
_, _, owning_points, cells = dolfinx.cpp.geometry.determine_point_ownership(
point_ownership_data = dolfinx.cpp.geometry.determine_point_ownership(
mesh._cpp_object, points, 1e-6
)
owning_points = np.asarray(owning_points).reshape(-1, 3)

owning_points = np.asarray(point_ownership_data.dest_points).reshape(-1, 3)
cells = point_ownership_data.dest_cells

# Pull owning points back to reference cell
mesh_nodes = mesh.geometry.x
Expand Down Expand Up @@ -618,7 +620,7 @@ def F(self, x: PETSc.Vec, b: PETSc.Vec) -> None:
dofs, basis_value * self.PS, addv=PETSc.InsertMode.ADD_VALUES
)

apply_lifting(b, [self._a], bcs=[self.bcs], x0=[x], scale=-1.0)
apply_lifting(b, [self._a], bcs=[self.bcs], x0=[x], alpha=-1.0)
b.ghostUpdate(addv=PETSc.InsertMode.ADD, mode=PETSc.ScatterMode.REVERSE)
set_bc(b, self.bcs, x, -1.0)

Expand Down
5 changes: 2 additions & 3 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
jupytext_process.process()

project = "FEniCSx-Shells"
copyright = "2022, FEniCSx-Shells Authors"
copyright = "2022-2024, FEniCSx-Shells Authors"
author = "FEniCSx-Shells Authors"
release = "0.5.0.dev0"
release = "0.10.0.dev0"

# -- General configuration ---------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
Expand Down Expand Up @@ -55,5 +55,4 @@
# -- Options for HTML output -------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output

html_theme = "alabaster"
html_static_path = ["_static"]
2 changes: 1 addition & 1 deletion launch-container.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash
CONTAINER_ENGINE="docker"
${CONTAINER_ENGINE} run -ti -v $(pwd):/shared -w /shared dolfinx/dolfinx:v0.7.2
${CONTAINER_ENGINE} run -ti -v $(pwd):/shared -w /shared dolfinx/dolfinx:v0.9.0
22 changes: 17 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,29 @@ build-backend = "setuptools.build_meta"

[project]
name = "fenicsx-shells"
version = "0.8.0.dev0"
description = "FEniCSx-Shells"
version = "0.10.0.dev0"
description = "A FEniCSx library for simulating thin structures"
readme = "README.md"
requires-python = ">=3.9.0"
license = { file = "COPYING.LESSER" }
authors = [
{ email = "jack.hale@uni.lu" },
{ name = "Jack S. Hale" },
{ name = "Jack S. Hale", email = "mail@jackhale.co.uk" },
{ name = "Tian Yang" }
]
dependencies = [
"fenics-dolfinx>=0.8.0.dev0,<0.9.0",
"fenics-dolfinx>=0.10.0.dev0,<0.11.0",
]

[project.optional-dependencies]
doc = ["jupytext", "myst_parser", "sphinx_rtd_theme", "sphinx"]
demo = ["matplotlib"]
test = ["pytest"]
lint = ["ruff"]
ci = [
"fenicsx-shells[doc]",
"fenicsx-shells[demo]",
"fenicsx-shells[test]",
"fenicsx-shells[lint]",
]

[tool.ruff]
Expand Down
Loading