Commit 8a45d0a
committed
Merge development branch with conflict resolution
Resolved conflicts:
- Renamed workflow files from .yml to .yaml (standard naming)
- Removed pdoc workflow (docs now use Sphinx)
- Removed obsolete docs/user/Installation.qmd (superseded by restructured docs)
- Removed docs/_quarto.yaml (Quarto not used for main docs)
- Merged environment.yaml with pytest-mpi and pygmsh from RC
Changes from development:
- Container configuration updates
- Workflow file renames for consistency
- Solver improvements for boundary conditions
- New test for Poisson natural BCs
Underworld development team with AI support from Claude Code20 files changed
Lines changed: 261 additions & 150 deletions
File tree
- .github
- .devcontainer
- workflows
- envs
- docs/developer
- container
- docker
- src/underworld3/cython
- tests
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
8 | | - | |
| 7 | + | |
| 8 | + | |
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
This file was deleted.
This file was deleted.
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
| 26 | + | |
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
37 | | - | |
| 37 | + | |
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
| |||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
0 commit comments