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

Develop minimal working version without support for parallel runs and vector-valued functions #15

Merged
Changes from 1 commit
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
6c973a8
Perform some obvious updates when importing.
BenjaminRodenberg Nov 30, 2021
22d7930
Merge branch 'develop' into dev-partitioned-heat-equation
BenjaminRodenberg Nov 30, 2021
31ec84e
Merge branch 'develop' into dev-partitioned-heat-equation
BenjaminRodenberg Nov 30, 2021
19ecbcd
Remove parallelization and PointSources. Update tests.
BenjaminRodenberg Dec 2, 2021
fee57d7
Fix most tests, remove nearest projection.
BenjaminRodenberg Dec 2, 2021
b571537
Fix remaining test.
BenjaminRodenberg Dec 2, 2021
d8e1fd8
Follow FEniCSx workflow and ask user for MPI.COMM_WORLD.
BenjaminRodenberg Dec 7, 2021
506a152
Partial update to dolfinx.
BenjaminRodenberg Dec 7, 2021
e35e7a1
Improve code.
BenjaminRodenberg Dec 7, 2021
543c596
continue with update to dolfinx
arvedes Jan 3, 2022
0d96b7c
update in discussion with Benjamin and Max
arvedes Jan 5, 2022
eccb894
continue update
Jan 7, 2022
c175e01
Add output, debug
Jan 7, 2022
3ca38dc
make coupling_expression derived class from dolfinx.fem.Function
Jan 10, 2022
ac96d50
use Constant for dt
Jan 10, 2022
f60ff1e
Add development version
BenjaminRodenberg Feb 24, 2022
115533b
Delete tutorials.patch
BenjaminRodenberg Feb 24, 2022
13f663a
Include dockerfile with development-version #6
arvedes Mar 3, 2022
9c09993
Repaired most test #1, update Dockerfile
arvedes Mar 3, 2022
a9c42d5
Fix linting errors.
BenjaminRodenberg Mar 8, 2022
630d7ec
Fix PEP8.
BenjaminRodenberg Mar 8, 2022
8592972
Manually fix more PEP8.
BenjaminRodenberg Mar 8, 2022
8c511fe
Manually fix linter, but some links are still broken.
BenjaminRodenberg Mar 8, 2022
4e809b0
Add sympy as dependency for tests.
BenjaminRodenberg Mar 8, 2022
8bffc27
Don't install sympy in docker.
BenjaminRodenberg Mar 8, 2022
e873f9d
Fix format.
BenjaminRodenberg Mar 8, 2022
e08cdd1
Don't install fenicsx-adapter in base image.
BenjaminRodenberg Mar 8, 2022
29b590f
Update test pipeline to use docker image.
BenjaminRodenberg Mar 8, 2022
81ea7d5
Fix docker namespace.
BenjaminRodenberg Mar 8, 2022
b83dee7
debug test_update_expression_scalar - still failing
arvedes Mar 10, 2022
59f63fa
clean up, debug tests
arvedes Mar 10, 2022
9184c71
Update detection of coupling subdomain: use array
arvedes Mar 30, 2022
6db7f45
bugfix in subdomain identification
arvedes Mar 30, 2022
3cface3
update for new dolfinx release
arvedes Apr 29, 2022
a5c28d0
update to doflinx v0.4.1
arvedes Jun 22, 2022
5af2065
debug adapter_core.convert_fenicsx_to_precice
arvedes Jun 22, 2022
da90074
Minor corrections
IshaanDesai Aug 17, 2022
d7a2491
Merge branch 'develop' into dev-partitioned-heat-equation
IshaanDesai Aug 18, 2022
26678c1
Fixing the error computation in the partitioned-heat-equation tutoria…
PhilipHildebrand Dec 2, 2022
48b43e2
Removal of tests based on vector functions
PhilipHildebrand Dec 14, 2022
b898df8
Merge branch 'develop' into merge-partitioned-heat-equation
BenjaminRodenberg Dec 16, 2022
9e6510a
Remove commented out code.
BenjaminRodenberg Dec 16, 2022
3e497bc
Update fenicsxprecice/adapter_core.py
BenjaminRodenberg Dec 16, 2022
9b47d9f
Merge branch 'develop' into merge-partitioned-heat-equation
BenjaminRodenberg Dec 16, 2022
9520b1a
Remove Dockerfile, because it is not needed.
BenjaminRodenberg Dec 16, 2022
c8e4b75
Simplify implementation of CustomExpression.
BenjaminRodenberg Dec 16, 2022
30c6c1c
Make private and further simplifications.
BenjaminRodenberg Dec 16, 2022
038aa4f
Take care of commented out code.
BenjaminRodenberg Dec 16, 2022
0d2f727
Removed unnecessary vertex types
PhilipHildebrand Dec 17, 2022
747f826
Add CI job for running tutorial.
BenjaminRodenberg Dec 22, 2022
83cfd53
Remove tutorials folder. Has been moved to PR https://github.com/prec…
BenjaminRodenberg Dec 22, 2022
cb70102
Print dolfinx version.
BenjaminRodenberg Dec 22, 2022
37b7819
Fix workflow
BenjaminRodenberg Dec 22, 2022
758c3ef
Use image with preCICE 2.5.0 and Ubuntu 22.04
BenjaminRodenberg Dec 22, 2022
71ba29c
Run autopep8 on pull requests.
BenjaminRodenberg Dec 22, 2022
c905495
Merge branch 'main' into merge-partitioned-heat-equation
BenjaminRodenberg Dec 22, 2022
8c777c4
Partially revert 038aa4f
BenjaminRodenberg Dec 23, 2022
623d6c1
Follow-up for 8c777c4
BenjaminRodenberg Dec 23, 2022
354b1f4
Fix format.
BenjaminRodenberg Dec 23, 2022
c84d00d
Update fenicsxprecice/adapter_core.py
BenjaminRodenberg Jan 5, 2023
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
Prev Previous commit
Next Next commit
Minor corrections
IshaanDesai committed Aug 17, 2022
commit da900743cca3dd5294a3ef3d22084ef7a1aba208
4 changes: 2 additions & 2 deletions fenicsxprecice/adapter_core.py
Original file line number Diff line number Diff line change
@@ -177,11 +177,11 @@ def get_fenicsx_vertices(function_space, coupling_subdomain, dims):
on_subdomain = coupling_subdomain(mesh.geometry.x.T)
ids, = np.where(on_subdomain)
if dims == 2:
coords = mesh.geometry.x[ids][:,:2]
coords = mesh.geometry.x[ids][:, :2]
else:
coords = np.array([])
except Exception as e: # fall back to old method # TODO is that to general? Better use, e.g., IndexError here?
print(f"Caught the following exception in the detection of the coupling subdomain:\n{e}")
print("Caught the following exception in the detection of the coupling subdomain:\n{e}")
print("Falling back to old, point-wise method.")
ids, coords = [], []
for idx in range(mesh.geometry.x.shape[0]):
1 change: 0 additions & 1 deletion fenicsxprecice/fenicsxprecice.py
Original file line number Diff line number Diff line change
@@ -271,7 +271,6 @@ def initialize(self, coupling_subdomain, read_function_space=None, write_object=
self._write_function_type = determine_function_type(write_function_space)
self._write_function_space = write_function_space

coords = function_space.mesh.geometry.x
self._fenicsx_dims = function_space.mesh.geometry.dim

# Ensure that function spaces of read and write functions use the same mesh