Commit Graph
172 Commits
Author SHA1 Message Date
Tzanio Kolev cc49757166 Merge branch 'master' into gf-getvalue-dev 2020-05-19 10:34:14 -07:00
Yohann 4ff9fa3c28 Merge branch 'master' into yohann/mass-emat 2020-05-15 15:58:37 -07:00
Stowell, Mark L 493e8b7862 Merge remote-tracking branch 'origin/master' into gf-getvalue-dev 2020-05-11 16:01:59 -07:00
Stowell, Mark L b86570dd2f Merge remote-tracking branch 'origin/master' into matrix-coef-mass-bug-fix 2020-05-01 10:32:02 -07:00
Stowell, Mark L 408d5e411b T->Elem[12]->SetIntPoint is now handled internally by FaceElementTransformations::SetIntPoint 2020-04-29 16:57:51 -07:00
Stowell, Mark L 5394b3f8e5 Removing SetActiveSide from integrators 2020-04-29 16:56:41 -07:00
Stowell, Mark L adf2ca72e9 Merge remote-tracking branch 'origin/master' into gf-getvalue-dev
# Conflicts:
#	fem/coefficient.cpp
2020-04-24 15:30:49 -07:00
Yohann Dudouit 9c32615e8c Merge branch 'master' into yohann/mass-emat 2020-04-21 12:09:44 -07:00
Dylan Copeland 71ecff776a Merge branch 'master' of https://github.com/mfem/mfem into rtpa
Conflicts:
	CHANGELOG
	linalg/operator.cpp
2020-04-21 11:48:59 -07:00
Yohann Dudouit 18e1762286 Remove commented code. 2020-04-20 15:16:40 -07:00
Stowell, Mark L 00edaa1089 Merge remote-tracking branch 'origin/master' into matrix-coef-mass-bug-fix
# Conflicts:
#	tests/unit/fem/test_3d_bilininteg.cpp
2020-04-15 15:03:45 -07:00
camierjs f031a1f98d Keep elmat initialization to zero 2020-04-14 17:11:07 -07:00
Yohann Dudouit 2c28c92a4a make style 2020-04-07 16:59:26 -07:00
Yohann Dudouit 2fd8ad493c Merge branch 'master' into yohann/mass-emat 2020-04-07 16:07:21 -07:00
Dylan Copeland d7b0a8ce64 Merge branch 'master' of https://github.com/mfem/mfem into rtpa
Conflicts:
	examples/ex24.cpp
	examples/ex24p.cpp
	examples/ex5p.cpp
	fem/CMakeLists.txt
	tests/unit/fem/test_pa_coeff.cpp
2020-03-29 19:54:52 -07:00
Yohann Dudouit 8e9ff181d2 Skeleton for AddMult on faces. 2020-03-18 16:32:20 -07:00
Yohann Dudouit 0f26cf2400 Skeleton for DGTrace assemble EA. 2020-03-17 17:37:10 -07:00
Dylan Copeland 447a73cdac Implemented PA for ex5(p), with a new MixedBilinearForm function to assemble the diagonal of ADA^T for a diagonal D. 2020-03-13 13:59:54 -07:00
Stowell, Mark L 8b81c29b2b Merge remote-tracking branch 'origin/master' into gf-getvalue-dev
# Conflicts:
#	fem/datacollection.cpp
#	fem/gridfunc.hpp
2020-03-12 20:56:28 -07:00
camierjs 36c2282668 Merge branch 'master' into minimal-surf-dev-rewritten 2020-03-11 08:04:33 -07:00
Tzanio f0bd9b287f Some edits in fem/ 2020-03-09 19:30:02 -07:00
Tzanio 05125e19d5 Removed a space 2020-03-09 15:36:41 -07:00
Yohann Dudouit 8a9dea2a0f Element Assembly working for mass on CPU and GPU. 2020-03-06 09:30:00 -08:00
Stowell, Mark L c9f366e0b0 Fixed size of temporary DenseMatrix 2020-03-06 10:18:51 -05:00
camierjs 036d399856 WIP Merge branch 'master' into minimal-surf-dev-rewritten 2020-03-05 08:56:51 -08:00
camierjs 5ef984ee94 Merge branch 'master' into minimal-surf-dev-rewritten 2020-03-04 20:53:20 -08:00
Tzanio 2e37ba7d97 Merge branch 'master' into yohann/dg
Conflicts:
x	fem/bilinearform_ext.cpp
2020-03-04 20:42:09 -08:00
Tzanio ca55ef0217 The release number for mfem-4.1 is LLNL-CODE-806117 2020-03-02 17:18:46 -08:00
Yohann Dudouit 155808ccf8 Merge branch 'master' into yohann/dg 2020-03-02 10:51:32 -08:00
Tzanio 88a78bb6aa Merge branch 'master' into bsd-relicense
Conflicts:
	CONTRIBUTING.md
2020-03-02 09:28:37 -08:00
camierjs cbda3fc4cc Merge branch 'master' into minimal-surf-dev-rewritten 2020-03-01 12:22:30 -08:00
Veselin Dobrev 9c02e21f4e Tweak VectorFEMassIntegrator::AssembleElementMatrix2 to handle the
case when dim != spaceDim.
2020-02-28 13:51:59 -08:00
Yohann Dudouit 6e5bda0743 Merge branch 'master' into yohann/dg 2020-02-27 16:38:19 -08:00
Tzanio e689fd5b28 Merge branch 'master' into bsd-relicense 2020-02-27 09:29:25 -08:00
Stefano Zampini d8ad353f5c Fix for surface meshes 2020-02-27 18:15:42 +03:00
camierjs a734a01961 Merge branch 'master' into minimal-surf-dev-rewritten 2020-02-25 17:10:13 -08:00
Tzanio 2caa222edf A number of changes to switch the code from LGPL-2.1 to BSD-3:
- Updated LICENSE, README, CHANGELOG and CONTRIBUTING.md
- Removed COPYRIGHT, added NOTICE
- Updated the headers in all source files, makefiles, etc.
2020-02-23 11:16:46 -08:00
camierjs f5fc032281 Merge branch 'master' into minimal-surf-dev-rewritten 2020-02-07 16:31:31 -08:00
Miguel Salazar de Troya 58ed2c2333 adding setter and fixing with_coeff to bool 2020-02-03 16:23:44 -08:00
Yohann Dudouit 537f9e57fc Merge branch 'master' into yohann/dg
Conflicts:
	fem/bilininteg.hpp
	fem/bilininteg_convection.cpp
2020-01-29 16:31:55 -08:00
Yohann Dudouit 2ba20c9d5f Revert make style. 2020-01-29 14:17:31 -08:00
Veselin Dobrev e71e5c67b1 Merge pull request #914 from mfem/convection-pa
PA Convection Operator [convection-pa]
2020-01-28 18:54:35 -08:00
Veselin Dobrev ab7078610a Merge pull request #1068 from mfem/stefanozampini/support-tensor-perm-curl
Minor addition to VectorFEMassIntegrator
2020-01-28 18:10:05 -08:00
camierjs 0b6b595556 Style and bring back non-square VectorDiffusionIntegrator::AssembleElementVector 2020-01-27 11:36:45 -08:00
camierjs e61223a594 meld & merge toward master, still fa sdim errors 2020-01-24 18:27:31 -08:00
artv3 344acbf6d2 Addressed PR comments; 2020-01-24 15:50:15 -08:00
camierjs 5608d9e0fe Merge branch 'master' into minimal-surf-dev 2020-01-23 23:44:53 -08:00
camierjs c159efc9ab Merge branch 'master' into minimal-surf-dev 2020-01-23 23:44:36 -08:00
camierjs adea89cf64 Cleanup and vdiffusion fix 2020-01-23 23:42:29 -08:00
camierjs add421be30 Merge branch 'master' into minimal-surf-dev 2020-01-23 23:42:27 -08:00