Commit Graph
149 Commits
Author SHA1 Message Date
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
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
Adrien M. Bernede 3c03649d7b Initial options and revert visualization to mesh 2020-01-23 23:18:26 -08:00
camierjs eb7a46592b Revert style changes 2020-01-23 23:16:48 -08:00
Yohann ed033cf873 Merge branch 'master' into yohann/dg 2020-01-23 16:58:46 -08:00
artv3 8bf6d6b041 fixed merge conflict 2020-01-23 15:42:40 -08:00
Vargas 7f6419fb45 make style 2020-01-21 10:45:11 -08:00
Tzanio 07bf04e4df make style 2020-01-16 09:38:14 -08:00
holec1 62eb032b10 Merge branch 'master' into stefanozampini/support-tensor-perm-curl 2020-01-16 09:06:09 -08:00
Arturo Vargas a719377385 Merge branch 'master' into convection-pa 2020-01-15 15:46:40 -08:00
Julian Andrej 046b990a7d Merge branch 'master' into rectop-bc-dev
Resolved conflicts:
	CHANGELOG
	fem/bilininteg.hpp
	tests/unit/fem/test_pa_kernels.cpp
2020-01-15 15:18:29 -08:00
Yohann e2858823e1 Merge branch 'master' into yohann/dg 2020-01-13 15:16:15 -08:00
holec1 592dedd03b Cleaning of redundant lines. 2020-01-10 13:52:59 -08:00
holec1 0d054ae399 VectorFEMassIntegrator for mixed H(Curl), H(Div), H1i FEs. 2020-01-10 11:00:15 -08:00
artv3 d371e647a4 Merge branch 'master' into convection-pa 2020-01-09 14:30:24 -08:00
holec1 c49e01f5c3 Added implementation of AssembleElementMatrix for VECTOR and SCALAR FE. 2020-01-09 11:13:27 -08:00
holec1 c010ed78b4 Cleanup. 2020-01-08 18:22:27 -08:00
holec1 de4c42626e Added consistent elmat fill with Q, VQ, MQ for SCALAR-VECTOR. 2020-01-08 18:00:42 -08:00
holec1 3804eb6e4e Added support for SCALAR-SCALAR in VectorFEMassIntegrator. 2020-01-08 17:22:34 -08:00
Tzanio 5534584ef8 Merge branch 'master' into rectop-bc-dev 2020-01-08 16:44:22 -08:00
holec1 3d264ba0af Corrected size of elmat and its filling for H1i test functions. 2020-01-08 15:48:19 -08:00
holec1 acdefa9abe AssembleElementMatrix calls AssembleElementMatrix2(el, el, Trans, elmat). 2020-01-08 13:40:53 -08:00
holec1 46b386eb2f Added a better specification of SCALAR/VECTOR FEs.
Improved documentation.
2020-01-08 13:20:11 -08:00