Merge remote-tracking branch 'origin/master' into pyramid-dev

Browse Source

# Conflicts:
#	fem/fe.cpp
#	fem/fe.hpp
#	fem/fe_coll.cpp
#	fem/fe_coll.hpp
#	fem/geom.hpp
#	fem/intrules.cpp
#	mesh/mesh.cpp
#	mesh/mesh.hpp
#	mesh/mesh_headers.hpp
#	mesh/pyramid.cpp
#	mesh/pyramid.hpp
#	miniapps/common/mesh_extras.cpp
#	miniapps/tools/display-basis.cpp
#	tests/unit/fem/test_3d_bilininteg.cpp
#	tests/unit/fem/test_get_value.cpp

...

This commit is contained in:

Stowell, Mark L

2023-10-06 10:48:38 -07:00

parent 3c40606626 c0867ca009

commit e6ce209f64

1108 changed files with 187279 additions and 55596 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_l2.cpp

+1045

File diff suppressed because it is too large Load Diff