Merge remote-tracking branch 'origin/master' into lo-dim-em-dev

Browse Source

# Conflicts:
#	fem/fe.cpp
#	fem/fe.hpp
#	fem/gridfunc.cpp
#	tests/unit/fem/test_lin_interp.cpp

...

This commit is contained in:

Stowell, Mark L

2021-10-04 11:44:27 -07:00

parent 96e05a1cbb cb1eaa1b81

commit 4c25cfb50b

209 changed files with 32919 additions and 21529 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

fem/fe/fe_fixed_order.cpp

+6274

File diff suppressed because it is too large Load Diff