Commit Graph
157 Commits
Author SHA1 Message Date
Tzanio Kolev f8174fa8cd Merge pull request #1454 from mortezah/pumi2mfem_field_transfer
Pumi2mfem field transfer updates [pumi2mfem_field_transfer]
2020-05-31 16:20:48 -07:00
Morteza HS a9bcd488cb Adds the new pumi version 2.2.3 2020-05-26 13:14:52 -04:00
Morteza HS 8d458616a7 Updates PUMI version 2020-05-25 14:03:08 -04:00
Tzanio 2274d411f7 New COPYRIGHT banner, minor edits 2020-05-17 11:30:15 -07:00
Veselin Dobrev d0221b980c Move the SIMD headers from 'config' to 'linalg'. 2020-05-16 08:14:38 -07:00
Morteza HS b0935c7f63 Updates MFEM_USE_PUMI instructions in INSTALL 2020-05-13 20:22:37 -04:00
Veselin Dobrev a95474b1e5 Proposed updates for the 'x86' branch. 2020-05-03 01:19:08 -07:00
camierjs 249cbb3274 Merge branch 'master' into x86 2020-04-16 15:45:09 -07:00
Veselin Dobrev f9b8eae266 In INSTALL, add version requirements for some external libraries. 2020-04-08 19:39:48 -07:00
camierjs 2567c2bf75 Merge branch 'master' into x86 2020-03-30 10:18:16 -07:00
Tzanio 0ef6573c30 small edits 2020-03-25 21:46:07 -07:00
camierjs 333e5a8701 Merge branch 'master' into x86 2020-03-15 14:55:03 -07:00
Tzanio 0a41477cbf Mention that we need newer compilers 2020-03-09 15:36:25 -07:00
Yohann Dudouit 0cc443cf61 Merge branch 'mfem-4.1-dev' into yohann/libCEED-strided 2020-03-06 15:36:42 -08:00
Yohann Dudouit a5ff20782f Update libCEED version requirements. 2020-03-06 13:01:57 -08:00
Tzanio fd598e8643 Final changes 2020-03-04 19:40:18 -08: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
Julian Andrej d6dd084cfc replaced gzstream with modified zstr 2020-02-27 14:32:04 -08:00
camierjs 68f5a585b5 Merge branch 'master' into x86 2020-02-07 16:35:11 -08:00
camierjs 525aff065b INSTALL line skip 2020-01-29 21:13:26 -08:00
camierjs 3535f57a67 Rename UMPIRE to Umpire 2020-01-15 11:18:00 -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 fda21fe590 Final adjustments 2019-12-27 13:23:01 -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
Tzanio f9efa202c1 Fixed CMake, gitignore, doxygen. Some wordsmithing 2019-12-21 23:54:26 -08:00
Ketan Mittal 6c5db44182 addressed more comments 2019-12-19 17:14:14 -08:00
Veselin Dobrev dc5765cf14 Merge branch 'master' into yohann/okina-gpu-libceed 2019-12-19 13:45:32 -08:00
Tzanio ef3eb57978 No need to include "gslib.hpp" in examples.
Less warnings when building with GSLib (none with GCC)

Other small corrections.
2019-12-18 22:21:26 -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
camierjs c9c75d8529 Merge branch 'master' into x86 2019-12-12 11:45:31 -08:00
Veselin Dobrev fb8ae593bf Merge branch 'master' into yohann/okina-gpu-libceed 2019-12-10 21:39:00 -08:00
Veselin Dobrev 2562bcda20 Update the minimal needed git-hash for libCEED.
Small cleanup of #include directives.
2019-12-10 20:21:14 -08:00
camierjs 34e6d92ace Merge branch 'master' into okina-mmu 2019-11-26 19:10:03 -08:00
Ketan Mittal 9b5609310d resolving conflict in CHANGELOG 2019-11-25 10:50:35 -08:00
k10 d17bbb583b Merge branch 'master' into findpts-gslib-dev 2019-11-25 10:41:48 -08: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
Veselin Dobrev fc2e5fe938 In INSTALL, update Axom url and add version requirement. 2019-11-21 19:09:19 -08:00
Veselin Dobrev a42d209056 Fix libCEED's version requirement. 2019-11-18 20:28:46 -08:00
Veselin Dobrev b87ec735d2 Apply 'make style' and other small tweaks. 2019-11-18 16:34:52 -08:00