Commit Graph
176 Commits
Author SHA1 Message Date
camierjs 6173cb7e4c MFEM_USE_SIMD defaulted to YES 2020-04-30 10:14:08 -07:00
camierjs 2567c2bf75 Merge branch 'master' into x86 2020-03-30 10:18:16 -07:00
camierjs 445037c954 Merge branch 'master' into x86 2020-03-20 13:55:23 -07:00
William F Godoy 9c379891bf Resolving conflicts with latest master 2020-03-18 09:41:46 -04:00
camierjs 333e5a8701 Merge branch 'master' into x86 2020-03-15 14:55:03 -07:00
Jakub Cerveny e2b2920bd0 Updated copyright headers 2020-03-11 10:15:45 +01:00
Jakub Cerveny a2cf6022ed Merge branch 'master' into gecko-integration2-dev 2020-03-11 09:23:38 +01:00
Tzanio 58872c9e7b Merge branch 'master' into okina-mmu
Conflicts:
	fem/datacollection.cpp
	tests/unit/CMakeLists.txt
2020-03-04 15:19:33 -08:00
Tzanio ca55ef0217 The release number for mfem-4.1 is LLNL-CODE-806117 2020-03-02 17:18:46 -08:00
Julian Andrej d6dd084cfc replaced gzstream with modified zstr 2020-02-27 14:32:04 -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
Jakub Cerveny b6927a2cc2 Removed Gecko from both makefile and CMake build systems. 2020-02-14 13:53:13 +01:00
camierjs a6befda705 Remove Umpire config variables and cleanup. 2020-02-12 12:31:29 -08:00
camierjs 68f5a585b5 Merge branch 'master' into x86 2020-02-07 16:35:11 -08:00
camierjs 78a3e0c6d2 Merge branch 'master' into okina-mmu 2020-01-15 11:09:20 -08:00
Tzanio f78bbccbf5 Styling unification between libCEED, Ginkgo, HIOP and GSLIB 2020-01-08 16:57:18 -08:00
Yohann Dudouit c7953aa673 Change AssembleDiagonal to work with libCEED.
Merge branch 'master' into yohann/okina-gpu-libceed

Conflicts:
	INSTALL
	makefile
2020-01-08 09:37:28 -08:00
camierjs b1a3126b68 Merge branch 'master' into x86 2020-01-06 11:03:39 -08:00
camierjs 6a61e78bf9 Merge branch 'master' into okina-mmu 2020-01-06 11:01:36 -08:00
Tzanio 4886cb45bd Merge branch 'master' into yohann/okina-gpu-libceed
Conflicts:
	CHANGELOG
	CMakeLists.txt
	makefile
2019-12-29 14:48:44 -08:00
Tzanio 0b6f3b31b4 Merge branch 'master' into findpts-gslib-dev
Conflicts:
	CHANGELOG
	makefile
2019-12-29 14:42:43 -08:00
Tzanio a901601ba1 Merge branch 'master' into ginkgo-interface-dev
Conflicts:
	CMakeLists.txt
	linalg/linalg.hpp
	makefile
2019-12-27 12:17:51 -08:00
Tzanio d466d0dd7c Merge branch 'master' into findpts-gslib-dev
Conflicts:
	CHANGELOG
	config/config.hpp.in
	config/defaults.mk
	makefile
2019-12-27 09:47:59 -08:00
Tzanio f329c1cfe4 Final adjustments 2019-12-26 18:07:01 -08:00
Veselin Dobrev dc5765cf14 Merge branch 'master' into yohann/okina-gpu-libceed 2019-12-19 13:45:32 -08:00
Tzanio eed87d6778 Merge branch 'master' into findpts-gslib-dev
Conflicts:
	CHANGELOG
2019-12-18 18:42:29 -08:00
camierjs 47f2aa0de7 Merge branch 'master' into okina-mmu 2019-12-16 17:59:40 -08:00
Tzanio ae4f5805ac Merge branch 'master' into hiop-dev 2019-12-15 20:43:36 -08:00
Tzanio Kolev 1c629d61c6 Merge pull request #937 from mfem/gpu/appfixes
Application fixes [gpu/appfixes]
2019-12-15 12:04:30 -08:00
Aaron Fisher f2d923a8e2 Added the ginko example to the make system and removed the attempt to link to HIP. 2019-12-13 14:51:46 -08:00
Pratik Nayak d14287dd47 Review update.
+ Fix an include issue.
+ Fix some issues with the makefile build system.
2019-12-04 08:49:15 +01:00
Veselin Dobrev a26d308c73 Add Conduit-blueprint to the list of libraries needed for
linking with Axom.

In INSTALL, mention the Axom/Sidre options in the CMake section.
2019-11-21 20:38:55 -08:00
camierjs 85c3e485b6 Memory controller setup to avoid static inits 2019-11-05 10:21:57 -08:00
Ketan Mittal 7dbfbb2b33 merging with master 2019-11-04 16:14:14 -08:00
camierjs 6895d39bf7 Merge branch 'master' into x86 2019-10-25 10:37:20 -07:00
camierjs 73ed1b8db7 Merge branch 'master' into okina-mmu 2019-10-25 10:31:58 -07:00
camierjs d0f98d1619 MFEM_UMPIRE_HOST & MFEM_UMPIRE_DEVICE names 2019-10-24 18:34:39 -07:00
Tzanio 8bd488a331 Merge branch 'master' into hiop-dev
Conflicts:
	config/config.hpp.in
	makefile
2019-10-24 12:42:21 -07:00
Pratik Nayak 2bf1517453 Add Ginkgo library CMake detection and linking. 2019-10-21 17:28:39 +02:00
Yohann 675b507a7c Merge branch 'master' into yohann/okina-gpu-libceed 2019-10-17 15:46:30 -07:00
Aaron Fisher ddac9ed690 Updated the default locations for packages in the mk files. 2019-10-16 15:59:03 -07:00
camierjs 840158ddc7 Merge branch 'master' into okina-mmu 2019-09-23 10:39:06 -07:00
camierjs d48c1c8cf4 Merge branch 'master' into x86 2019-09-23 10:24:18 -07:00
Yohann Dudouit 689c259c80 Add MFEM_USE_CEED option 2019-09-11 17:56:08 -07:00
artv3 996f97689b fixed conflicts in mesh.cpp 2019-09-05 15:47:18 -07:00
Tzanio Kolev dc68d860f6 Merge branch 'master' into sundials-interface 2019-08-29 15:16:26 -07:00
camierjs 2def41540d X86 => SIMD 2019-08-28 10:47:17 -07:00
camierjs b4f1ef6ca9 Merge branch 'master' into x86 2019-08-28 10:17:32 -07:00
Tzanio 5b9ca638ec minor 2019-08-21 17:19:34 -07:00
Vladimir Tomov 52c90d03cb Merge branch 'master' into hiop-dev
Conflicts:
	CMakeLists.txt
	config/cmake/config.hpp.in
	config/config.hpp.in
	config/defaults.cmake
	config/defaults.mk
	makefile
2019-08-20 15:17:19 -07:00