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

DO NOT SQUASH Absorb FInAT and GEM #104

Merged
merged 923 commits into from
Dec 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
923 commits
Select commit Hold shift + click to select a range
fbaf67a
gem: New Inverse and Solve nodes
sv2518 Apr 30, 2020
82ed173
gem: Allow FlexiblyIndexed to apply to any shaped thing
sv2518 Apr 30, 2020
47e2357
gem: Avoid complex warnings when initialising Literal array
wence- Apr 30, 2020
5b60d80
AWc had been failing to chop off the AWnc constraint dofs.
FAznaran May 12, 2020
afcf70a
AWc now gets constructed, but diverges.
FAznaran May 12, 2020
3876090
gem: Teach refactoriser about conj/real/imag
wence- Apr 30, 2020
4ae1782
Merge pull request #212 from firedrakeproject/wence/complex
wence- May 13, 2020
9fbef27
WIP: aw.py is still wrong.
rckirby May 14, 2020
dc21ed8
WIP: AW elements
rckirby May 14, 2020
e1c96f6
update scaling in W for aWc
rckirby May 19, 2020
aade71d
impero: Add option to avoid ReturnAccumulate nodes
wence- May 9, 2020
bfde63d
Merge pull request #216 from firedrakeproject/wence/feature/return-ac…
wence- May 20, 2020
fd14cbf
Allow for ComponentTensor(NotAFlexiblyIndexed()) and Inverse/Solve in…
sv2518 May 11, 2020
aa8ac4f
Update scaling in AWnc element
rckirby May 27, 2020
05f3501
Merge pull request #214
wence- May 29, 2020
ca0244a
WIP AW
rckirby May 29, 2020
dd85cfd
The AWc transformation now seems to be working.
FAznaran Jun 2, 2020
5476708
Plausible rescaling of aw dofs
rckirby Jun 2, 2020
a1ec31e
Update AW dof scaling to improve conditioning
rckirby Jun 2, 2020
bf9b644
Fix vertex transformations in AW
rckirby Jun 22, 2020
5c3b55b
put back AW
rckirby Jun 22, 2020
1b78e90
Merge remote-tracking branch 'origin/master' into directSerendipity
rckirby Jun 22, 2020
e615fcf
WIP: general order
rckirby Jun 23, 2020
784ef00
Generalize direct serendipity to general order
rckirby Jun 26, 2020
cc0a129
Remove unneeded file
rckirby Jun 26, 2020
75056d4
Clean up some flake8
rckirby Jun 29, 2020
1145909
Address most of Lawrence's comments. Need to figure out geometric_di…
rckirby Jun 29, 2020
700f167
enriched: Return subelement for single argument
wence- Jul 1, 2020
48e8926
fix a bug
rckirby Jul 2, 2020
6a06450
Add helper function; fix typos
rckirby Jul 3, 2020
46e8d03
Merge pull request #59 from FInAT/wence/fix/unroll-enriched
wence- Jul 8, 2020
fc54994
Small fix to flake8 & a big
rckirby Jul 9, 2020
3e0a757
Add a test for the direct serendipity
rckirby Jul 10, 2020
563f9d9
see if this helps travis
rckirby Jul 10, 2020
ac8db54
address miklos' concerns on test
rckirby Jul 10, 2020
b4167b9
see if travis like .dot instead of @
rckirby Jul 10, 2020
9000a24
simplify mapping class via gem.Literal
rckirby Jul 10, 2020
0b17b8a
Put back
rckirby Jul 10, 2020
72559c9
Cultic deprogramming
rckirby Jul 10, 2020
a49b61d
Do not cast to real
miklos1 Jul 10, 2020
b13fdd6
Add a test for Morley using the gem interpreter.
rckirby Jul 10, 2020
e4c326d
Refactor FIAT-based physical mapping into a separate file to facilita…
rckirby Jul 10, 2020
6173e08
Wrap some stuff into gem:
rckirby Jul 10, 2020
64dddd0
Add (broken) AWc test for debugging purposes
rckirby Jul 10, 2020
3b0b193
WIP: redo AW test to include Piola
rckirby Jul 10, 2020
d2099ad
Test now runs but fails. To debug later
rckirby Jul 10, 2020
eca17f8
Update test for AW
rckirby Jul 13, 2020
1e62cd7
Clean up test
rckirby Jul 13, 2020
e9c7228
Turn of doff scaling
rckirby Jul 13, 2020
68e7f07
Merge pull request #220 from firedrakeproject/miklos1/fix-complex-war…
miklos1 Jul 13, 2020
bd31eb0
Support variant when creating RT/BDM/Nedelec elements
FabianL1908 May 7, 2020
f2f6fd5
fix entity_closure_dofs
rckirby Jul 16, 2020
d9f5467
Merge pull request #56 from FInAT/fabianL/feature/interpolation-nodes
wence- Jul 21, 2020
3bb7f80
Merge branch 'master' into bdmc
pefarrell Jul 22, 2020
8e9f1d2
Fix bug in higher-order elements
rckirby Aug 5, 2020
e91ea1c
Remove comments/flake8
rckirby Aug 5, 2020
75f5f05
Another cleanup, including comments
rckirby Aug 5, 2020
d6dec6b
Add KMV elements (WIP)
rckirby Aug 11, 2020
0b3519d
Get docs building without warnings
wence- Aug 13, 2020
3de0b41
Merge pull request #61 from FInAT/wence/docs
wence- Aug 14, 2020
4a9277c
enriched: accept generator in constructor
wence- Aug 10, 2020
2feaf4b
Implement RestrictedElement
wence- Jul 24, 2020
ce6b006
Add tests for restricted elements
wence- Aug 14, 2020
438b14a
Merge pull request #60 from FInAT/wence/feature/restricted
wence- Aug 15, 2020
bfa8638
Merge branch 'master' into pefarrell/aaw
rckirby Aug 18, 2020
3d77f85
add citations, fix flake8
rckirby Aug 18, 2020
7717aab
remove pytest import
rckirby Aug 18, 2020
809c178
Fix citations
rckirby Aug 18, 2020
455eaf8
Delete trailing whitespace
miklos1 Aug 19, 2020
9f7f641
Improve names per Lawrence's request
miklos1 Aug 19, 2020
9718943
Avoid using local imports
miklos1 Aug 19, 2020
18a7b89
Merge branch 'master' into directSerendipity
miklos1 Aug 19, 2020
7b00e4f
sympy2gem: Handle symengine objects too
wence- Aug 19, 2020
491d8ac
Use symengine for direct Serendipity element
wence- Aug 19, 2020
1b02625
sympy2gem: Explicitly cast to int/float
wence- Aug 19, 2020
d343845
Make use of symengine optional (defaults off)
wence- Aug 19, 2020
b84cfe7
Now using a direct construction of internal Lagrange polynomials. Al…
rckirby Aug 20, 2020
6d50fee
Now using a direct construction of internal Lagrange polynomials.
rckirby Aug 20, 2020
90d9fa1
Cache symbolic basis functions on element
wence- Aug 21, 2020
f93ea44
merging
rckirby Aug 21, 2020
14c75fe
Introduce property 'fiat_equivalent' of FInAT elements
miklos1 Aug 22, 2020
d982e1b
Implement .fiat_equivalent for most elements
miklos1 Aug 22, 2020
f18361d
Add FIAT wrapper for Bernstein elements
miklos1 Aug 22, 2020
7604e23
Add NodalEnrichedElement wrapper
miklos1 Aug 22, 2020
beae633
Remove most local imports
miklos1 Aug 22, 2020
af82613
Address PR comments
miklos1 Aug 24, 2020
0429738
Ignore FIAT.DiscontinuousRaviartThomas
miklos1 Aug 25, 2020
e354a48
Merge pull request #67 from FInAT/miklos1/scatter-fiatinterface
wence- Aug 25, 2020
2175c09
remove comments in test code
rckirby Aug 25, 2020
9b53f3f
rename mpping
rckirby Aug 25, 2020
65922db
More magic methods for gem Nodes
wence- Aug 25, 2020
8493067
mppng --> mapping in morley test
rckirby Aug 25, 2020
ad0b45a
Refactor edge transformations; add entity_closure_dofs
rckirby Aug 26, 2020
4a4b79a
Merging master in.
rckirby Aug 26, 2020
001b730
Revert an indexing change that broke things; fix direct serendipity t…
rckirby Aug 26, 2020
ee7d577
Merge pull request #63 from FInAT/pefarrell/aaw
rckirby Aug 28, 2020
dfcad54
Fix tabulation for zany elements
wence- Aug 28, 2020
5170262
Merge pull request #69 from FInAT/wence/fix/zany
wence- Aug 28, 2020
3656993
More stuff for SminusCurl.
Justincrum Sep 8, 2020
be5d090
Add citations for KMV elements
rckirby Sep 10, 2020
f5e867a
Merge pull request #70 from FInAT/KMV
wence- Sep 10, 2020
127bc32
Merge remote-tracking branch 'origin' into trimmedSerendipity
Justincrum Sep 22, 2020
215f319
Fixed something having variant in it.
Justincrum Sep 25, 2020
e13c017
Always give weights to a QuadratureElement.
pefarrell Nov 27, 2020
629377e
Merge pull request #72 from FInAT/pefarrell/fix/quadrature-element-we…
wence- Nov 27, 2020
434a929
Merge remote-tracking branch 'origin/master' into bdmc
Dec 16, 2020
edceab4
Make symengine an optional dependency
wence- Mar 10, 2021
377b855
Merge pull request #76 from FInAT/wence/optional-symengine
wence- Mar 11, 2021
05a9899
Small boilerplate change.
Mar 30, 2021
f9f215a
ComponentTensor: allow zero extent shape indices
ReubenHill Apr 29, 2021
345e606
Merge pull request #246 from firedrakeproject/ReubenHill/patch-compon…
wence- Apr 29, 2021
9391a88
Add docstrings to PointSingleton and PointSet
ReubenHill Apr 29, 2021
df852fe
Merge pull request #80 from FInAT/ReubenHill/patch-pointset-2
ReubenHill Apr 30, 2021
c535c78
Add optional rule arg to quadrature_element
ReubenHill Aug 13, 2020
7a16b8f
Use @cached_property in PointSingleton
ReubenHill Aug 20, 2020
cffee5e
Preliminary attempts at patching up conditioning of the AW elements.
FAznaran May 19, 2021
2da30d6
New UnknownPointSet for runtime known points
ReubenHill Aug 20, 2020
a8b0e4d
Create QuadratureElement from ref cell and rule
ReubenHill May 11, 2021
81afb02
QuadratureElement FIAT equivalent with unknown points
ReubenHill May 17, 2021
5143d65
Condition number of AW mass matrices appears to be O(1) under refinem…
FAznaran May 19, 2021
842b870
Get rid of some repeat code.
FAznaran May 20, 2021
48c30fc
Merge pull request #81 from FInAT/ReubenHill/0d-mesh-interpolation-hack
dham Jun 1, 2021
84c8e97
Merging
rckirby Jun 4, 2021
5bafc7c
Deal with flake8 issues.
FAznaran Jun 8, 2021
71e6b65
Add flop counting visitor
AWhitmell May 19, 2021
2243be5
Created try/except block for impero tree
AndrewWhitmell Jul 8, 2021
f303764
Merge pull request #252 from AWhitmell/andrew/benchmarking
wence- Jul 12, 2021
bba4768
Compare to spatial dim when making QuadratureElement
ReubenHill Jul 13, 2021
4b0cd30
Merge pull request #91 from FInAT/ReubenHill/patch_quadrature_el
wence- Jul 14, 2021
5976ca7
Ensure literals in point evaluation are floats
wence- Aug 18, 2021
2f7c120
Merge pull request #92 from FInAT/wence/fix/point-eval-literals
wence- Aug 18, 2021
b1ecca3
c_e_d_e: Move dual evaluation to FInAT
mkan88 Jun 5, 2020
98084c3
Add dual_basis and dual_evaluation to elements
ReubenHill May 27, 2020
313f20c
dual_evaluation: generalise methods
ReubenHill Aug 19, 2021
14554cc
optimise: option to ignore indices in sum factorisation
wence- Aug 19, 2021
931d123
tensorfiniteelement: Tidy dual_basis and dual_evaluation
ReubenHill Aug 19, 2021
17b2d03
base: generalise dual evaluation routine
wence- Aug 19, 2021
5470e04
tensor product: Simplify dual basis construction
wence- Aug 19, 2021
97bb787
fiat: simplify translation of FIAT dual to FInAT dual
wence- Aug 19, 2021
c2b73d1
dual_evaluation and dual_basis comment/doc/name improvements
wence- Aug 19, 2021
bd9a986
QuadratureElement: implement dual_basis for all schemes
ReubenHill Aug 20, 2021
f71ac9d
remove sparse lib dependency
ReubenHill Aug 20, 2021
405c3e4
dual_basis: make a cached property
ReubenHill Aug 23, 2021
420ef40
fiat: Error if dual_basis uses Functional.deriv_dict
ReubenHill Aug 24, 2021
5cac93b
Merge pull request #89 from FInAT/ReubenHill/finat-dual-eval
wence- Aug 26, 2021
5b9fb66
Merge pull request #250 from firedrakeproject/ReubenHill/finat-dual-eval
wence- Aug 26, 2021
84e248d
tfe: Implement entity_dofs
wence- Aug 31, 2021
6e079a3
Merge pull request #97 from FInAT/wence/feature/tfe-entity-dofs
pefarrell Aug 31, 2021
b9d014c
Give discontinuous elements a dual
wence- Sep 3, 2021
d58de2b
orientations: define entity_orientations() method for FlattenedDimens…
ksagiyam Apr 21, 2021
5961b20
Merge pull request #87 from FInAT/ksagiyam/orientation
dham Sep 30, 2021
fe324af
Merge remote-tracking branch 'origin/master' into AWconditioning
FAznaran Oct 5, 2021
056061e
Merge pull request #88 from FInAT/AWconditioning
rckirby Oct 7, 2021
6fc07ad
Fix O(N^2) behaviour in flop counting
wence- Oct 7, 2021
e7274ad
Merge pull request #263 from firedrakeproject/wence/fix/flop-count-slow
wence- Oct 11, 2021
d90ed71
Add is_mixed property to EnrichedElement
connorjward Nov 4, 2021
b0e2c5e
Add Real element
connorjward Nov 17, 2021
bf3520b
Added wrapper for FIAT.FDMElement
pbrubeck Dec 7, 2021
849cb04
Merge pull request #101 from connorjward/connorjward/new-pyop2-api
dham Dec 8, 2021
c7078bb
add FDMHermite element diagonalizing the biharmonic operator in 1D an…
pbrubeck Jan 17, 2022
ee75601
Merge pull request #100 from FInAT/pbrubeck/fdm-element
dham Feb 3, 2022
a406a21
gem: IndexError for invalid literal indices
wence- Apr 7, 2022
8054098
optimise: New pass to constant fold literal Zeros
wence- Apr 7, 2022
c8cbefa
gem: Don't eagerly constant-fold literal Zeros
wence- Apr 7, 2022
1e36990
gem: add extract_type
ksagiyam Mar 1, 2022
63a75c5
wrap discontinuous FDM elements
pbrubeck Apr 13, 2022
c311859
Rename FDM elements
pbrubeck May 12, 2022
d7c5f6d
tensor_product: Fix shape of dual basis
wence- Sep 3, 2021
cb9c7b1
hdivcurl: Implement dual_basis
wence- Sep 3, 2021
732e5df
Merge remote-tracking branch 'origin/master' into trimmedSerendipity
rckirby Jun 23, 2022
bd48d60
Disable entity_permutations for trimmed serendipity elements
rckirby Jun 24, 2022
650f7e6
flake8
rckirby Jun 24, 2022
182d8a4
Fix variant option for Nedelec (inadvertently deleted on merge)
rckirby Jun 27, 2022
5cb9332
Fix more in variant args
rckirby Jun 27, 2022
4fab030
Merge pull request #102 from FInAT/trimmedSerendipity
rckirby Jun 27, 2022
68efbbd
Merge pull request #98 from FInAT/wence/feature/hdivcurl-dual
ReubenHill Jun 29, 2022
3bd5fb0
Merge remote-tracking branch 'origin/master' into pbrubeck/fdm-discon…
pbrubeck Jul 4, 2022
143442e
add FDMQuadrature element
pbrubeck Jul 11, 2022
57f0759
Merge pull request #275 from firedrakeproject/wence/fix/issue-274-maybe
dham Jul 28, 2022
18101c1
Revert "Maybe fix issue 274"
ksagiyam Aug 3, 2022
c54c352
Merge pull request #281 from firedrakeproject/revert-275-wence/fix/is…
wence- Aug 3, 2022
ef2bbe9
gem: IndexError for invalid literal indices
wence- Aug 3, 2022
c4c5a97
optimise: New pass to constant fold literal Zeros
wence- Aug 3, 2022
03ef874
gem: Don't eagerly constant-fold literal Zeros
wence- Aug 3, 2022
56e52eb
fiat_element: do not Zero()
ksagiyam Aug 3, 2022
3c111fe
optimise: New pass for ListTensor in constant_fold_zero()
ksagiyam Aug 3, 2022
0302f17
Merge pull request #103 from FInAT/ksagiyam/fix-issue-274-retry
ksagiyam Sep 8, 2022
0cfaa6c
Merge pull request #282 from firedrakeproject/ksagiyam/fix-issue-274-…
ksagiyam Sep 8, 2022
49af9f6
Merge remote-tracking branch 'origin/master' into pbrubeck/fdm-discon…
pbrubeck Sep 9, 2022
79031e2
wrap FIAT.Legendre and FIAT.IntegratedLegendre
pbrubeck Oct 24, 2022
6134334
orientation: handle extrinsic orientations in tensor product elements
ksagiyam Nov 10, 2022
5a20627
tensor_product: update factor_point_set for hex
ksagiyam Nov 16, 2022
97316e3
Merge pull request #104 from FInAT/ksagiyam/orientations
ksagiyam Dec 8, 2022
2a49bed
Merge remote-tracking branch 'origin/master' into pbrubeck/fdm-discon…
pbrubeck Dec 12, 2022
74bff49
Expand EnrichedElement (#105)
pbrubeck Jan 11, 2023
7b90df1
Merge branch 'master' into pbrubeck/fdm-discontinuous
Jan 18, 2023
4dc84d8
Merge pull request #107 from FInAT/pbrubeck/fdm-discontinuous
dham Feb 8, 2023
d08cf65
refactor: make tensorproduct permutations in FIAT
ksagiyam Apr 4, 2023
632a749
Merge pull request #108 from FInAT/ksagiyam/check_cell_reflection
dham Apr 19, 2023
b04551d
Expunge COFFEE (#291)
connorjward May 10, 2023
d3c4458
Merge branch 'master' into bdmc
tommbendall Jul 25, 2023
531691f
update elements to handle lack of "entity_permutations" correctly
tommbendall Jul 25, 2023
02007f0
fix lint
tommbendall Jul 26, 2023
0227fef
Adapt to UFL changes in subdomain_id (#297)
connorjward Sep 12, 2023
a8b7e06
Merge pull request #55 from FInAT/bdmc
dham Sep 20, 2023
5ec6521
Move ufl legacy elements to finat
mscroggs Oct 16, 2023
fa7657b
flake
mscroggs Oct 16, 2023
87ee4d1
add HDiv and HCurl functions
mscroggs Nov 8, 2023
1d91b5b
import as
mscroggs Nov 8, 2023
e70de4b
implement CallableSobolevSpace
mscroggs Nov 8, 2023
d9651ad
Subclass spectral Lagrange elements
pbrubeck Nov 10, 2023
34029ea
lint E721 do not compare types, for exact checks use is
pbrubeck Nov 10, 2023
2c45da7
same lint again
pbrubeck Nov 10, 2023
9a711e3
use correct super constructor
pbrubeck Nov 10, 2023
d7d40bf
Merge pull request #112 from FInAT/pbrubeck/spectral-subclassing
pbrubeck Nov 13, 2023
d8b72ce
Merge pull request #111 from FInAT/mscroggs/ufl-elements
ksagiyam Nov 15, 2023
7e91069
Add missing embedded_superdegree and embedded_subdegree properties (#…
connorjward Nov 21, 2023
0b537f3
Tabulate Ciarlet generically
pbrubeck Nov 21, 2023
c4e3b58
remove singledispatch
pbrubeck Nov 22, 2023
cd26c09
Allow embedded_subdegree and embedded_superdegree to handle tuples (#…
connorjward Nov 22, 2023
a7080b1
Merge pull request #115 from FInAT/pbrubeck/fix/point-evaluation
dham Nov 22, 2023
3de9323
Support Lagrange/IntegratedLegendre variants
pbrubeck Dec 31, 2023
ecf345a
Merge pull request #117 from FInAT/pbrubeck/variants
dham Feb 7, 2024
d3d205a
Fix dual basis for singleton weight
pbrubeck Feb 8, 2024
ff5dca8
Merge pull request #121 from FInAT/pbrubeck/fix/dual-basis-singleton
pbrubeck Feb 9, 2024
58823db
C0/C1 Macroelements (#123)
pbrubeck May 1, 2024
ecc0001
JDBetteridge/numpy2 rebase (#313)
JDBetteridge Jun 7, 2024
b074885
Add Johnson Mercier as PhysicallyMappedElement (#126)
pbrubeck Jun 19, 2024
0f661e4
GEM: sympy2gem conditional support (#128)
pbrubeck Jun 26, 2024
a6fe525
numpy 2.0 fix
pbrubeck Jun 28, 2024
6eb834a
High order HCT (#129)
pbrubeck Jul 11, 2024
2c7aa93
sympy2gem: Fix boolean type checking (#130)
pbrubeck Jul 11, 2024
b365ff5
Merge pull request #314 from firedrakeproject/pbrubeck/argyris-variant
rckirby Jul 11, 2024
0b60daa
HCT: basis transformation for hierarchical edge functions (#131)
pbrubeck Jul 17, 2024
660bda0
Add QuadraticPowellSabin{6|12} (#132)
rckirby Jul 23, 2024
58e4c5c
RestrictedElement: fixes for prisms (#133)
pbrubeck Jul 30, 2024
1990cb6
finat.ufl.RestrictedElement: support restriction_domain="reduced" (#135)
pbrubeck Aug 16, 2024
673f743
Use md5 to hash FiniteElementBase (#134)
JDBetteridge Sep 4, 2024
014f246
sympy2gem: if-then-else (#137)
pbrubeck Sep 4, 2024
2c5b662
Add physically mapped Stokes elements (#139)
pbrubeck Oct 8, 2024
0381989
Guzman-Neilan H1(div) macroelement (#140)
pbrubeck Oct 16, 2024
c37a93d
Ksagiyam/hex interior facet (#138)
ksagiyam Nov 6, 2024
348569f
generalise VariableIndex and FlexiblyIndexed (#317)
ksagiyam Nov 6, 2024
e3b9bbe
Update UFL element interface (#118)
mscroggs Nov 15, 2024
50bc36f
Allow HHJ in 3D (#142)
pbrubeck Nov 19, 2024
f4c4866
gem: attach dtype to every node (#327)
ksagiyam Nov 20, 2024
14b757f
Use static Literal for faster code generation (#146)
pbrubeck Nov 28, 2024
358aab4
Merge remote-tracking branch 'finat/master' into connorjward/add-fina…
connorjward Dec 4, 2024
4746c81
Merge remote-tracking branch 'gem/master' into connorjward/add-finat-gem
connorjward Dec 4, 2024
39247cb
Move FInAT and gem into FIAT repository
connorjward Dec 4, 2024
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
32 changes: 32 additions & 0 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: github pages

on:
push:
branches:
- master

jobs:
build_docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Setup python
uses: actions/setup-python@v3
with:
python-version: 3.12
- name: Install
run: |
python -m pip install .[doc]
- name: Build docs
run: |
make -C docs html
- name: Deploy
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./docs/build/html
publish_branch: gh-pages
enable_jekyll: false
allow_empty_commit: false
user_name: 'github-actions[bot]'
user_email: 'github-actions[bot]@users.noreply.github.com'
20 changes: 13 additions & 7 deletions .github/workflows/pythonapp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,19 @@

name: FIAT CI

on: [push, pull_request]
on:
push:
branches:
- master
pull_request:

jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
python-version: ['3.9', '3.10', '3.11', '3.12']
python-version: ['3.10', '3.11', '3.12', '3.13']

steps:
- uses: actions/checkout@v4
Expand All @@ -28,12 +32,14 @@ jobs:
run: |
python -m pip install pydocstyle
python -m pydocstyle .
- name: Install FIAT
run: pip install .
- name: Test with pytest
- name: Install FIAT and CI dependencies
run: |
python -m pip install coveralls pytest pytest-cov pytest-xdist
DATA_REPO_GIT="" python -m pytest --cov=FIAT/ test/
python -m pip install '.[test]'
python -m pip install coveralls pytest-cov
- name: Test FIAT
run: DATA_REPO_GIT="" python -m pytest --cov=FIAT/ test/FIAT
- name: Test FInAT
run: DATA_REPO_GIT="" python -m pytest --cov=finat/ --cov=gem/ test/finat
- name: Coveralls
if: ${{ github.repository == 'FEniCS/fiat' && github.head_ref == '' && matrix.os == 'ubuntu-latest' && matrix.python-version == '3.11' }}
env:
Expand Down
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,8 @@
/doc/sphinx/source/api-doc
release/

/doc/sphinx/source/_build/
/docs/build/
/docs/source/FIAT.rst
/docs/source/finat.rst
/docs/source/finat.ufl.rst
/docs/source/gem.rst
3 changes: 0 additions & 3 deletions doc/sphinx/requirements.txt

This file was deleted.

7 changes: 6 additions & 1 deletion doc/sphinx/Makefile → docs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,12 @@ help:
clean:
rm -rf $(BUILDDIR)/*

html:
apidoc:
sphinx-apidoc -f -T -o source/ ../FIAT
sphinx-apidoc -f -T -o source/ ../finat
sphinx-apidoc -f -T -o source/ ../gem

html: apidoc
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
Expand Down
Binary file added docs/images/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
194 changes: 194 additions & 0 deletions docs/images/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions docs/source/_themes/finat/README
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
This is the Sphinx theme for the FInAT web page
It was originally based on the Firedrake web page,
which was based on the dolfin-adjoint theme,
which was in turn based oh the FEniCS project theme.
41 changes: 41 additions & 0 deletions docs/source/_themes/finat/layout.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{% extends "basic/layout.html" %}

{% block extrahead %}
<!--[if lte IE 6]>
<link rel="stylesheet" href="{{ pathto('_static/ie6.css', 1) }}" type="text/css" media="screen" charset="utf-8" />
<![endif]-->

<link rel="stylesheet" href="{{ pathto('_static/featured.css', 1) }}">

{% if theme_favicon %}
<link rel="shortcut icon" href="{{ pathto('_static/'+theme_favicon, 1) }}" />
{% endif %}
{% endblock %}

{# override upper relbar to show our navigation menu #}
{% block relbar1 %}
<div class="wrapper">
<a href="{{ pathto('index.html', 1) }}"><img src="{{ pathto('_static/%s.%s' % ('banner', 'png'), 1) }}" width="900px" alt="FInAT Project Banner" /></a>
<div id="access">
<div class="menu">
<ul>
<li class="page_item"><a href="https://github.com/FInAT/finat" title="GitHub">GitHub</a></li>
<!-- <li class="page_item"><a href="{{ pathto('documentation.html', 1) }}" title="Documentation for FInAT">Documentation</a></li>
<li class="page_item"><a href="{{ pathto('download.html', 1) }}" title="Obtain the FInAT code">Download</a></li>
<li class="page_item"><a href="{{ pathto('%s.%s' % ('team', 'html'), 1) }}" title="The guilty parties">Team</a></li>
<li class="page_item"><a href="{{ pathto('publications.html', 1) }}" title="Publications">Publications</a></li>
<li class="page_item"><a href="{{ pathto('funding.html', 1) }}" title="Our financial supporters">Funding</a></li>
<li class="page_item"><a href="{{ pathto('contact.html', 1) }}" title="Getting in touch">Contact</a></li>
<li class="page_item"><a href="http://buildbot-ocean.ese.ic.ac.uk:8080/builders/FInAT-trunk" title="Buildbot">Buildbot</a></li>-->
</ul>
</div><!-- .menu -->
</div><!-- #access -->
</div><!-- #wrapper -->
{% endblock %}

{# do not display lower relbar #}
{% block relbar2 %}{% endblock %}

{# do not display sidebars #}
{% block sidebar1 %}{% endblock %}
{% block sidebar2 %}{% endblock %}
Binary file added docs/source/_themes/finat/static/banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading