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

Array<T> clean up #204

Merged
merged 42 commits into from
Jan 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
a7bbd15
added missing *.i. fixed doftrans.i (remove import fe.i). Serial test…
sshiraiwa Sep 28, 2023
d1ba42b
update mfem SHA to 4.6
sshiraiwa Sep 28, 2023
67906ea
update version number to 4.6.0rc1
sshiraiwa Sep 28, 2023
57707c1
debugging github action macos build
sshiraiwa Sep 29, 2023
c51eaf3
debugging github action macos build
sshiraiwa Sep 29, 2023
e2dca42
Merge remote-tracking branch 'origin/mfem_46_dev' into macos_build_debug
sshiraiwa Sep 29, 2023
b864e9c
removed numba-scipy install
sshiraiwa Sep 29, 2023
5c10e22
fixed yml error
sshiraiwa Sep 29, 2023
700bcf7
update SHA to the version which has a fix of doftrans
sshiraiwa Nov 17, 2023
60b3654
fixed nonlinearform and bilinearform wrapper addressed some API changes
sshiraiwa Nov 18, 2023
3685338
working on new examples
sshiraiwa Jan 2, 2024
181a726
addressing https://github.com/mfem/mfem/issues/3965 by optimizing wra…
sshiraiwa Jan 2, 2024
2d371c5
added test routine to demonstrate the fix
sshiraiwa Jan 2, 2024
6dddbd0
Merge branch 'GetSerialGridFunction_fix' into v46_new_ex
sshiraiwa Jan 2, 2024
1123498
ex34.py works
sshiraiwa Jan 2, 2024
016e179
fixed ex34 when suitsparse is available
sshiraiwa Jan 2, 2024
295ae75
minor edit
sshiraiwa Jan 3, 2024
4049702
ex36.py looks okay
sshiraiwa Jan 3, 2024
9142224
working on ex37
sshiraiwa Jan 3, 2024
a074754
working on ex37.py
sshiraiwa Jan 3, 2024
724ebe3
update default MFEM SHA to the one after fixing socket connection issue
sshiraiwa Jan 4, 2024
5e6a519
Merge branch 'mfem_46_dev' into v46_new_ex
sshiraiwa Jan 4, 2024
9df6ada
ex37 is okay. Convergence process is slightly different. Does GetVect…
sshiraiwa Jan 5, 2024
8ece1ec
ex38 in progress
sshiraiwa Jan 5, 2024
357f766
ex38 works. intrules.i, lininteg.i and bilininteg.i are modified to a…
sshiraiwa Jan 5, 2024
b57b342
(DO NOT USE THIS ONE) Serial version passed all example test. Paralle…
sshiraiwa Jan 5, 2024
469128c
(DO NOT USE THIS ONE) Serial version passed all example test. Paralle…
sshiraiwa Jan 5, 2024
5c1cb85
apply the same modification to parallel wrapper
sshiraiwa Jan 6, 2024
ac50dda
cleaned *.i
sshiraiwa Jan 6, 2024
bf3ebb3
added ex34p.py
sshiraiwa Jan 6, 2024
18953bd
added ex37p.py, rearranged ex37 to separate ParXXX and XXX cleanly
sshiraiwa Jan 6, 2024
75f46f8
fixed error in wraping FormRectangularLinearSystem and FormRectangula…
sshiraiwa Jan 6, 2024
88ed8b1
ex35p in progress....
sshiraiwa Jan 6, 2024
8135e19
ex35p in progress....
sshiraiwa Jan 6, 2024
04ba3a6
ex35p in progress....
sshiraiwa Jan 7, 2024
5d4bcb4
ex35p works
sshiraiwa Jan 7, 2024
f6dab41
all example pass the comparison test locally !
sshiraiwa Jan 7, 2024
e2edffe
added intrules_cut
sshiraiwa Jan 8, 2024
c7a70cf
fixed ex36p, reporing a wrong total DoFs
sshiraiwa Jan 8, 2024
8e8e9fa
minor change to test
sshiraiwa Jan 8, 2024
a009ffb
minor change to test,,,removed 3.11,
sshiraiwa Jan 8, 2024
896d38b
added Array<unsigned int>, Array<long long> and Array<char>
sshiraiwa Jan 9, 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
16 changes: 8 additions & 8 deletions .github/workflows/test_with_MFEM_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,21 @@ jobs:
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10"]
#python-version: ["3.10"]
#os: [ubuntu-latest]
os: [ubuntu-20.04]
# USE_FLAGS : cuda, parallel, libceed
env:
- { USE_FLAGS: "000"}
- { USE_FLAGS: "100"}
- { USE_FLAGS: "010"}
- { USE_FLAGS: "110"}
# - { USE_FLAGS: "100"}
# - { USE_FLAGS: "010"}
# - { USE_FLAGS: "110"}

include:
- os: macos-latest
python-version: 3.9
env: {USE_FLAGS: "000"}
- os: [ubuntu-20.04]
python-version: 3.9
env: {USE_FLAGS: "001"}
# - os: [ubuntu-20.04]
# python-version: 3.9
# env: {USE_FLAGS: "001"}
#
runs-on: ${{ matrix.os }}
#env: ${{ matrix.env }}
Expand Down Expand Up @@ -65,9 +64,10 @@ jobs:
pip install six numpy --verbose
if [ "${{matrix.python-version}}" = "3.10" ] ; then
pip install numba numba-scipy --verbose
#pip install scipy
#pip install scipy numba --verbose
else
pip install numba numba-scipy --verbose
#pip install numba scipy --verbose
fi

if [ -f requirements.txt ]; then
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,7 @@ test/*
!test/*.py
!test/cpp
!test/cpp/
!test/issues/*.py
!test/issues/data_3960/VisIt_volume
*.egg-info
*.py#
96 changes: 96 additions & 0 deletions data/fichera-mixed.mesh
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
MFEM mesh v1.0

#
# MFEM Geometry Types (see mesh/geom.hpp):
#
# POINT = 0
# SEGMENT = 1
# TRIANGLE = 2
# SQUARE = 3
# TETRAHEDRON = 4
# CUBE = 5
# PRISM = 6
#

dimension
3

elements
14
1 4 13 15 21 25
1 4 12 13 15 21
1 4 13 21 22 25
1 4 15 24 21 25
1 4 13 15 25 16
1 5 0 1 4 3 9 10 13 12
1 5 8 9 12 11 17 18 21 20
1 5 2 3 6 5 11 12 15 14
1 6 3 4 6 12 13 15
1 6 4 7 6 13 16 15
1 6 12 13 21 9 10 18
1 6 13 22 21 10 19 18
1 6 11 14 20 12 15 21
1 6 15 21 24 14 20 23

boundary
30
1 3 5 6 3 2
2 2 3 6 4
2 2 4 6 7
3 3 3 4 1 0
4 3 11 12 9 8
5 3 2 3 12 11
6 3 0 1 10 9
7 2 9 10 18
7 2 10 19 18
8 3 8 9 18 17
9 3 1 4 13 10
10 3 4 7 16 13
11 2 13 16 25
11 2 13 25 22
12 3 10 13 22 19
13 3 7 6 15 16
14 3 6 5 14 15
15 3 15 14 23 24
16 2 16 15 25
16 2 15 24 25
17 3 5 2 11 14
18 3 3 0 9 12
19 3 11 8 17 20
20 2 11 20 14
20 2 14 20 23
21 3 17 18 21 20
22 3 18 19 22 21
23 2 21 22 25
23 2 21 25 24
24 3 20 21 24 23

vertices
26
3
0 -1 -1
1 -1 -1
-1 0 -1
0 0 -1
1 0 -1
-1 1 -1
0 1 -1
1 1 -1
-1 -1 0
0 -1 0
1 -1 0
-1 0 0
0 0 0
1 0 0
-1 1 0
0 1 0
1 1 0
-1 -1 1
0 -1 1
1 -1 1
-1 0 1
0 0 1
1 0 1
-1 1 1
0 1 1
1 1 1
2 changes: 1 addition & 1 deletion examples/ex18.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ def run(problem=1,
# 10. Compute the L2 solution error summed for all components.
if (t_final == 2.0):
error = sol.ComputeLpError(2., u0)
print("Solution error: " + str(error))
print("Solution error: " + "{:g}".format(error))


if __name__ == "__main__":
Expand Down
4 changes: 2 additions & 2 deletions examples/ex18_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def Mult(self, x, y):
y.SetSubVector(vdofs, ymat.GetData())


class DomainIntegrator(mfem.BilinearFormIntegrator):
class DomainIntegrator(mfem.PyBilinearFormIntegrator):
def __init__(self, dim):
num_equation = globals()['num_equation']
self.flux = mfem.DenseMatrix(num_equation, dim)
Expand Down Expand Up @@ -165,7 +165,7 @@ def AssembleElementMatrix2(self, trial_fe, test_fe, Tr, elmat):
self.dshapedx[j, d]


class FaceIntegrator(mfem.NonlinearFormIntegrator):
class FaceIntegrator(mfem.PyNonlinearFormIntegrator):
def __init__(self, rsolver, dim):
self.rsolver = rsolver
self.shape1 = mfem.Vector()
Expand Down
2 changes: 1 addition & 1 deletion examples/ex23.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ def EvalValue(self, x):
visualization = False
print("GLVis visualization disabled.")
else:
sout.precision(precision)
sout.precision(output.precision)
sout << "solution\n" << mesh << dudt_gf
sout << "pause\n"
sout.flush()
Expand Down
2 changes: 1 addition & 1 deletion examples/ex33p.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'''
MFEM example 33
MFEM example 33p

See c++ version in the MFEM library for more detail

Expand Down
Loading