Veselin Dobrev
bd14c65b69
In the top makefile, enforce building miniapps/meshing after
...
miniapps/common -- without this the build may fail.
2020-05-29 18:41:28 -07:00
Veselin Dobrev
41e5c9b205
A few small fixes and tweaks.
2020-05-16 15:28:04 -07:00
Veselin Dobrev
c9d9d0f8ff
Various tweaks in the template + SIMD code. Make sure the SIMD
...
interinsics can be used when CUDA is enabled.
A few tweaks related to adios2 when building with GNU make.
2020-05-15 12:33:07 -07:00
Veselin Dobrev
a95474b1e5
Proposed updates for the 'x86' branch.
2020-05-03 01:19:08 -07:00
camierjs
90f1552b94
Merge branch 'master' into x86
2020-04-30 09:52:08 -07:00
Julian Andrej
af07cea014
Merge branch 'master' into navier-miniapp
2020-04-09 08:26:31 -07:00
camierjs
a08e2b2b5e
Meld toward master
2020-04-07 11:33:44 -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
Julian Andrej
ed3ff2fd5b
Merge branch 'master' into navier-miniapp
2020-03-17 15:51:07 -07:00
Julian Andrej
ce80c54b72
Add makefile
2020-03-16 15:45:30 -07:00
camierjs
1ed8afdf93
Merge leftovers fix
2020-03-15 16:03:11 -07:00
camierjs
333e5a8701
Merge branch 'master' into x86
2020-03-15 14:55:03 -07:00
Jakub Cerveny
a2cf6022ed
Merge branch 'master' into gecko-integration2-dev
2020-03-11 09:23:38 +01:00
Veselin Dobrev
65b9632b1a
Update version numbers to 4.1.1 -- a new development version.
2020-03-10 20:10:15 -07:00
Tzanio
05125e19d5
Removed a space
2020-03-09 15:36:41 -07:00
Tzanio
f2bf0a2750
Merge branch 'master' into mfem-4.1-dev
...
Conflicts:
general/device.hpp
2020-03-04 20:33:14 -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
Tzanio
ca55ef0217
The release number for mfem-4.1 is LLNL-CODE-806117
2020-03-02 17:18:46 -08:00
Veselin Dobrev
70f24f7748
A few improvements in 'make style' and in the test scripts:
...
- 'make style' checks for correct astyle version
- 'make style' exits with an error code if there are modifications/errors
- the 'code-style' script will correctly report errors from 'make style'
when run through the 'runtest' script
- the *.err and *.msg files used by the 'runtest' script are placed in
the current directory -- this is expected by 'runtest' and implemented
by the other scripts.
2020-02-28 21:17:29 -08:00
camierjs
2c73f175ee
Update the style makefile target to do the cout and cerr tests
2020-02-28 09:54:14 -08:00
Julian Andrej
d6dd084cfc
replaced gzstream with modified zstr
2020-02-27 14:32:04 -08:00
camierjs
1e8da55823
Merge branch 'master' into okina-mmu
2020-02-27 11:34:06 -08:00
Tzanio
e689fd5b28
Merge branch 'master' into bsd-relicense
2020-02-27 09:29:25 -08:00
Tzanio Kolev
b137b29e99
Merge pull request #1267 from mfem/make-style-cout-cerr-check
...
Check cout and cerr usage in make style + Improved script messages [make-style-cout-cerr-check]
2020-02-27 09:24:28 -08:00
Tzanio
7ce7f86f1a
Set release version
2020-02-23 17:53:19 -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
Tzanio
b43ca2d0b9
Improved messaging in make style
2020-02-16 14:49:37 -08:00
Jakub Cerveny
b6927a2cc2
Removed Gecko from both makefile and CMake build systems.
2020-02-14 13:53:13 +01:00
camierjs
40ca8ee556
Fix makefile race for lib-common
2020-02-12 13:54:31 -08: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
aead91f0e9
Merge branch 'master' into okina-mmu
2020-02-03 10:44:39 -08:00
Ido Akkerman
a6685df4b1
Add hint that list should be empty
2020-01-28 11:21:28 +01:00
Ido Akkerman
f8ad163d4b
Check cout and cerr usage in make style
2020-01-28 11:17:04 +01:00
Tzanio
c6d4e1f1c4
Merge branch 'master' into toys-dev
...
Conflicts:
CHANGELOG
2020-01-24 17:53:52 -08:00
camierjs
0825ea7140
Merge branch 'master' into okina-mmu
2020-01-23 16:41:42 -08:00
Tzanio
99bbaea60a
Merge branch 'master' into toys-dev
2020-01-20 17:56:57 -08:00
Tzanio
0e2201a0f9
Made the Travis gitignore check more useful by adding a new make target,
...
test-noclean, that runs the test without cleaning the output (via clean-exec).
2020-01-17 20:20:54 -08:00
camierjs
bda839d3db
Merge branch 'master' into okina-mmu
2020-01-17 10:30:53 -08:00
Tzanio
045fe4b024
Merge branch 'master' into binary_file_test-tk
...
Conflicts:
makefile
2020-01-16 19:22:48 -08:00
Tzanio
69e370ea17
Travis-proof make clean
2020-01-16 19:21:24 -08:00
Adrien M. Bernede
bb0a5aa7d6
Revert "Added a style-check target to the makefile."
...
This reverts commit 3fc8ee9ec4 .
2020-01-16 13:54:26 -08:00
Adrien M. Bernede
cafc2ce55f
Revert "Adding context in style results to print directory"
...
This reverts commit 3e22f0a061 .
2020-01-16 13:53:25 -08:00
Tzanio
52f2701899
Merge branch 'master' into binary_file_test-tk
...
Conflicts:
CHANGELOG
2020-01-16 08:25:48 -08:00
Stowell, Mark L
e46ec77ebe
Merge remote-tracking branch 'origin/master' into toys-dev
...
# Conflicts:
# miniapps/common/mesh_extras.cpp
# miniapps/common/mesh_extras.hpp
2020-01-15 13:31:55 -08:00
camierjs
78a3e0c6d2
Merge branch 'master' into okina-mmu
2020-01-15 11:09:20 -08:00
Veselin Dobrev
0724286729
Merge branch 'master' into nc-tet-dev
...
Resolved conflicts:
makefile
2020-01-13 20:37:06 -08:00