Veselin Dobrev
a95474b1e5
Proposed updates for the 'x86' branch.
2020-05-03 01:19:08 -07:00
William F Godoy
9c379891bf
Resolving conflicts with latest master
2020-03-18 09:41:46 -04:00
Jakub Cerveny
a2cf6022ed
Merge branch 'master' into gecko-integration2-dev
2020-03-11 09:23:38 +01:00
Julian Andrej
cb9c073e50
Add gslib to cmake
2020-03-06 09:26:07 -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
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
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
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
a901601ba1
Merge branch 'master' into ginkgo-interface-dev
...
Conflicts:
CMakeLists.txt
linalg/linalg.hpp
makefile
2019-12-27 12:17:51 -08:00
Veselin Dobrev
dc5765cf14
Merge branch 'master' into yohann/okina-gpu-libceed
2019-12-19 13:45:32 -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
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
Yohann Dudouit
e03e973342
Add libCEED to CMake.
2019-11-06 15:38:17 -08:00
camierjs
73ed1b8db7
Merge branch 'master' into okina-mmu
2019-10-25 10:31:58 -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
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
Aaron Fisher
e3cb07a4ec
Swapped the locations of the x,b parameters in SUNImplicitSolve and SUNMassSolve. Also updated the build system defaults to point to the proper place in for SUNDIALS5.0.
2019-08-08 14:47:35 -07:00
camierjs
ec429a89fe
Merge branch 'master' into okina-mmu
2019-07-08 11:51:22 +02:00
Tzanio
3d88be85bc
Removed MFEM_USE_MM -- it is no longer necessary
2019-05-21 19:18:50 -07:00
camierjs
34668ca4cd
UMPIRE addon
2019-04-29 09:10:58 -07:00
Tzanio Kolev
ffc2dfc70b
Merge pull request #862 from mfem/okina-cmake
...
Okina-CMake: CUDA, OCCA, RAJA + MPI [okina-cmake]
2019-04-24 13:54:24 -07:00
Veselin Dobrev
aa027c2b8d
In the CMake build system, define CUDA_ARCH in defaults.cmake.
2019-04-19 21:06:57 -07:00
Veselin Dobrev
8a8d9419d1
Some small modifications in the build systems.
2019-04-19 20:51:16 -07:00
Veselin Dobrev
4e48ebc0cf
Merge pull request #837 from rcarson3/hypre-dep-dev
...
Update hypre version and point users to the LLNL repository for hypre [rcarson3:hypre-dep-dev]
2019-04-17 19:41:39 -07:00
camierjs
16ca9883eb
Use CMake 3.8 CUDA native support to compile MFEM + examples
2019-04-17 16:15:26 -07:00
camierjs
21edf56417
First cmake MFEM_USE_CUDA/OCCA/RAJA pass
2019-04-16 18:54:01 -07:00
Veselin Dobrev
d9d72b60af
Some small adjustments.
2019-04-05 16:28:55 -07:00
Johann Dahm
aceb2e43cb
Add MFEM_USE_OPENMP back in a few other necessary locations
2019-04-05 12:59:04 -07:00
Johann Dahm
a2614ad20f
MFEM_USE_OPENMP -> MFEM_USE_LEGACY_OPENMP
2019-04-04 20:26:38 -07:00
Johann Dahm
8409f6e819
Revert "Renamed the old OpenMP support option to MFEM_LEGACY_USE_OPENP, so"
...
This reverts commit 575f351419 .
2019-04-04 20:25:45 -07:00
Tzanio
575f351419
Renamed the old OpenMP support option to MFEM_LEGACY_USE_OPENP, so
...
MFEM_LEGACY_OPENMP can be used for OpenMP support in the Okina kernels.
2019-04-04 19:50:46 -07:00
rcarson3
311f538fd5
Update hypre dependency version and point to github source
...
The hypre dependency version has been updated to now be the latest available on the LLNL github repository for hypre. The INSTALL file has also been updated to point people to the github page to have them download/clone the repository. Next, the build make/cmake files have also been updated to reflect that the hypre directory is now just hypre rather than hypre-2.10.0b.
2019-04-04 15:34:26 -07:00
Veselin Dobrev
2178159103
Add comments in a few places that starting with STRUMPACK v2.2.0,
...
ParMETIS and Scotch are optional dependencies.
2019-02-08 14:59:55 -08:00
Vladimir Tomov
2544806e9f
Merge branch 'master' into hiop-dev
2018-11-14 18:21:52 -08:00
Veselin Dobrev
0133e81953
In defaults.cmake, HiOp depends BLAS and LAPACK.
2018-10-23 20:54:17 -07:00
Veselin Dobrev
27e5c13ec4
A few tweaks in the build systems.
2018-10-23 20:28:39 -07:00
Veselin Dobrev
3b69137064
Move the code for generating 'config.mk' from CMakeLists.txt to
...
a function in MfemCmakeUtilities.cmake, applying various tweaks.
Use the new cmake variable MFEM_MPI_NP when running the parallel
tests.
Remove the config variable MFEM_CPPFLAGS - it is not really used
anywhere. Also, remove the variables MFEM_MPIEXEC and
MFEM_MPIEXEC_NP since these values are autodetected by CMake.
Fix a warning in ex18.hpp.
In the makefile buidl system set MFEM_LIB_FILE to the versioned
shared library (when building shared) instead of the non-versioned
link.
2018-10-23 17:35:49 -07:00
Cameron Smith
14143faa88
create config.mk, install config.mk and test.mk
2018-06-01 13:52:31 -05:00
Veselin Dobrev
75f47a3deb
Fix a few issues in the CMake build system.
...
Set suitable number of processors for running the PUMI parallel
examples.
2018-05-21 17:39:11 -07:00
KazemKamran
7763533785
Make changes required after review
2018-03-12 11:49:03 -04:00
Tzanio
caeae60c12
Merge branch 'master' into pumi-dev
...
Conflicts:
config/cmake/config.hpp.in
config/defaults.cmake
config/defaults.mk
makefile
2018-03-07 11:22:44 -08:00
Tzanio
0e08df02df
Merge branch 'master' into task/2017_12_conduit_support
...
Conflicts:
CHANGELOG
makefile
2018-03-06 08:50:16 -08:00