Merge branch 'master' into develop · tum-pbs/PhiFlow@4a71915 · GitHub

Commit

Merge branch 'master' into develop

Browse files

# Conflicts:
#	phi/VERSION
#	phi/field/_field.py
#	phi/geom/_mesh.py
#	setup.py

Loading branch information

holl- committed Sep 29, 2024

2 parents d448f41 + 60046db commit 4a71915