Commit Graph
410 Commits
Author SHA1 Message Date
Tzanio 6d2530775b Extended copyright to 2022 2022-02-25 10:24:50 -08: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
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
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
Tzanio f73314c3fb Merge branch 'master' into mfem-4.3-dev
Conflicts:
	CHANGELOG
	fem/estimators.hpp
2021-06-10 16:34:02 -07:00
Jacob Faibussowitsch 1b03792030 indented to 80 cols, changed to inclusive regex, and moved phony declaration 2021-06-09 14:18:15 -04:00
Jacob FaibussowitschandTzanio Kolev 4b94765873 Update makefile
Co-authored-by: Tzanio Kolev <tzanio@llnl.gov>
2021-06-08 21:24:34 -04:00
Jacob Faibussowitsch 8912f8a82b Added makefile rule to generate TAGS tables in $MFEM_DIR/TAGS 2021-06-08 15:08:30 -04:00
Veselin Dobrev 135964b3ba Revert some changes in general/mem_manager.cpp
Fix warnings in linalg/hypre.hpp

Simplify and fix a warning in GetMinElt in fem/restriction.cpp

Fix a warning in miniapps/navier/navier_tgv.cpp

Fix out-of-source build in miniapps/solvers/makefile

In makefile, do not modify the value of MFEM_HOST_CXX if it
is already defined, e.g. read from config.mk.
2021-06-08 09:45:43 -07:00
Will Pazner 08bf2f02ad Squashing commits on parelag_miniapps 2021-06-03 11:51:47 -07:00
camierjs cc6bb3ac35 Use Google benchmark to add unit tests 2021-05-27 16:39:06 -07:00
blaz 476e642935 added cmake and make files for Eigen and CoDiPack 2021-05-25 17:53:33 -07:00
blaz 0da14179f7 initial copy frm fadg branch 2021-05-25 16:38:32 -07:00
Tzanio 80c175c8a0 Merge branch 'master' into mfem-4.3-dev 2021-05-21 16:18:30 -07:00
camierjs 5c92b71373 Renamed fem/quadinterpolator/quadinterpolator_ => fem/qinterp/
Renamed fem/tmop/tmop_pa_jt3_datc.cpp -> fem/tmop/tmop_pa_da3.cpp
Renamed fem/tmop/tmop_pa_jt2_tc.cpp -> fem/tmop/tmop_pa_tc2.cpp
Renamed fem/tmop/tmop_pa_jt3_tc.cpp -> fem/tmop/tmop_pa_tc3.cpp
Update tests/unit/makefile with new tmop_pa name
2021-05-18 12:29:32 -07:00
camierjs 0998ca927d Merge master in tmopt 2021-05-12 08:40:10 -07:00