 Patrick Zulian
|
0b7faae94c
|
fixed conflicts with master
|
2022-03-23 08:45:31 +01:00 |
|
|
Veselin Dobrev
|
3fe71947a9
|
Update version numbers to 4.4.1 -- a new development version
|
2022-03-22 14:10:00 -07:00 |
|
|
Patrick Zulian
|
ebbcdfee4f
|
fixed conflicts with master branch
|
2022-03-22 09:01:16 +01:00 |
|
|
Veselin Dobrev
|
ec9e8fb0b8
|
In 'make style', include headers in tests/unit, excluding the
Catch2 header.
|
2022-03-21 10:23:37 -07:00 |
|
|
Tzanio
|
c39ba9381f
|
More small adjustments before the release
|
2022-03-21 10:16:50 -07:00 |
|
|
Tzanio
|
5393b1dc34
|
Version is 4.4
|
2022-03-07 18:54:33 -08:00 |
|
|
Tzanio
|
6d2530775b
|
Extended copyright to 2022
|
2022-02-25 10:24:50 -08:00 |
|
|
zulianp
|
28a9f5c8fc
|
removed spurious newlines
|
2021-12-24 10:31:40 +01:00 |
|
|
zulianp
|
cfc0936a7a
|
Fixed conflicts with master
|
2021-12-03 19:39:37 +01:00 |
|
|
blaz
|
293acb99d9
|
small amendments
|
2021-11-24 17:32:44 -08:00 |
|
|
Tzanio
|
e5e4a7e753
|
Merge branch 'master' into pr_autodiff
|
2021-11-14 12:08:07 -08:00 |
|
|
Tzanio
|
4cc03b4238
|
Small adjustments
|
2021-11-14 11:54:02 -08:00 |
|
|
Will Pazner
|
acbe45ea91
|
Allow for customizing compiler flags for generating dependencies
On Mac, by default, add the flag -Wno-unused-command-line-argument
|
2021-11-10 14:34:52 -08:00 |
|
|
blaz
|
269eb6b7d1
|
fix in the makefile configuration
|
2021-11-02 17:51:24 -07:00 |
|
|
blaz
|
eeb0ede002
|
Merge branch 'master' into pr_autodiff
|
2021-10-29 11:21:47 -07:00 |
|
|
Tzanio Kolev
|
f66ddbc394
|
Merge pull request #2335 from mfem/fe-split-dev
Splitting fe.[ch]pp
|
2021-09-28 13:49:04 -07:00 |
|
|
camierjs
|
b705c964d6
|
Merge branch 'master' into google-benchmark
|
2021-09-26 18:13:48 -07:00 |
|
|
Tzanio
|
6c56ad3d7a
|
Merge branch 'master' into fe-split-dev
|
2021-09-26 18:05:36 -07:00 |
|
|
Tzanio Kolev
|
a303bcdf0a
|
Merge branch 'master' into pr_autodiff
|
2021-09-26 17:28:25 -07:00 |
|
|
Tzanio
|
d5d7828285
|
Merge branch 'master' into parelag_miniapps
|
2021-09-16 08:27:13 -07:00 |
|
|
camierjs
|
5c02f574e7
|
Merge master in google-benchmark
|
2021-09-14 12:08:28 -07:00 |
|
|
Stowell, Mark L
|
3c0b0896e6
|
Merge remote-tracking branch 'origin/master' into fe-split-dev
# Conflicts:
# fem/fe.cpp
# fem/fe.hpp
|
2021-09-14 12:00:07 -07:00 |
|
|
Adrien M. Bernede
|
89fdb3c909
|
Bump astyle version
|
2021-09-03 12:13:56 -07:00 |
|
|
Kalchev, Delyan
|
67b6f6ecfb
|
Merge conflicts resolved.
|
2021-08-31 17:58:19 -07:00 |
|
|
camierjs
|
83dcf7f4d0
|
Merge master in google-benchmark
|
2021-08-20 14:22:48 -07:00 |
|
|
Veselin Dobrev
|
88082dc136
|
Add caliper to the list of sub-directories under examples.
Apply 'make style'.
|
2021-08-18 16:40:25 -07:00 |
|
|
camierjs
|
5df0a0e2a1
|
Merge master in google-benchmark
|
2021-08-16 08:28:56 -07:00 |
|
|
blaz
|
09b67ab18d
|
Merge branch 'master' into pr_autodiff
|
2021-08-06 11:01:22 -07:00 |
|
|
zulianp
|
8688be26fe
|
moved new code location to fem/moonolith, added polynomial order as argument for examples
|
2021-08-03 11:12:19 +02:00 |
|
|
zulianp
|
38b196ea5c
|
Addressed review comments: Support for serial MFEM, collapsed two examples in one, added hints and link to documentation for Makefile users
|
2021-08-02 12:51:41 +02:00 |
|
|
zulianp
|
430e63c693
|
fixed conflicts with master
|
2021-08-02 09:41:46 +02:00 |
|
|
Stowell, Mark L
|
685f94888f
|
merge with master
|
2021-07-30 13:30:20 -07:00 |
|
|
Veselin Dobrev
|
cb0e7a5068
|
Update version numbers to 4.3.1 -- a new development version.
|
2021-07-29 16:09:30 -07:00 |
|
|
Veselin Dobrev
|
cbd8f1f478
|
Merge branch 'master' into mfem-4.3-dev
|
2021-07-28 17:05:46 -07:00 |
|
|
Veselin Dobrev
|
378b658fbe
|
Merge pull request #1709 from mfem/Add_FMS_support
Add support for FMS in memory conversion and I/O via data collections.
|
2021-07-28 17:03:46 -07:00 |
|
|
Tzanio
|
8c6feba024
|
Merge branch 'master' into mfem-4.3-dev
Conflicts:
CHANGELOG
|
2021-07-26 16:00:17 -07:00 |
|
|
Veselin Dobrev
|
483cb581b9
|
Merge branch 'master' into Add_FMS_support
|
2021-07-26 08:47:45 -07:00 |
|
|
Kalchev, Delyan
|
b7b9693e0f
|
Merge branch 'master' into parelag_miniapps
|
2021-07-22 14:57:48 -07:00 |
|
|
Veselin Dobrev
|
ae1445e9ca
|
Merge branch 'master' into hypre-cuda-dev
Resolved conflicts:
general/mem_manager.cpp
|
2021-07-22 06:59:42 -07:00 |
|
|
camierjs
|
4624662515
|
Merge master in google-benchmark
|
2021-07-15 14:20:31 -07:00 |
|
|
Stowell, Mark L
|
901eebd9e2
|
Merge remote-tracking branch 'origin/master' into fe-split-dev
# Conflicts:
# fem/fe.cpp
# fem/fe.hpp
|
2021-07-08 01:04:31 -07:00 |
|
|
Stowell, Mark L
|
2cffb578e2
|
Moving fe* files into subdirectory
|
2021-07-07 20:33:19 -07:00 |
|
|
zulianp
|
0b61783e7f
|
fixed confilics with master
|
2021-07-07 08:52:42 +02:00 |
|
|
Veselin Dobrev
|
15465cf610
|
More tweaks and updates for hypre built with cuda.
|
2021-07-03 22:24:57 -07:00 |
|
|
blaz
|
1382ed617a
|
Merge remote-tracking branch 'origin/master' into pr_autodiff
|
2021-07-02 15:08:41 -07:00 |
|
|
blaz
|
4d834ca852
|
cleaned code
|
2021-07-02 15:05:28 -07:00 |
|
|
Tzanio
|
b7ee8ff1f8
|
Merge branch 'master' into mfem-4.3-dev
Conflicts:
CHANGELOG
|
2021-06-30 13:58:19 -07:00 |
|
|
Tzanio
|
f45fbc53da
|
minor
|
2021-06-29 13:59:56 -07:00 |
|
|
Adrien M. Bernede
|
39e7705da1
|
Add a make target to setup hooks
|
2021-06-29 13:35:29 -07:00 |
|
|
Veselin Dobrev
|
26c2dd70f9
|
Merge branch 'master' into hypre-cuda-dev
|
2021-06-25 12:36:31 -07:00 |
|