Merge branch 'master' into magma-dev

Conflicts:
Makefile
tests/tap.sh

Merge branch 'master' into nek5k_updates

Merge branch 'occa-dev' [PR #42]

* occa-dev: (70 commits)
Makefile: explicitly use bash because shell script does not have conforming shebang
make okl-cache: simplify caching call and fix to fin

Merge branch 'occa-dev' [PR #42]

* occa-dev: (70 commits)
Makefile: explicitly use bash because shell script does not have conforming shebang
make okl-cache: simplify caching call and fix to find OCCA executable
Cache OCCA kernels in PETSc examples makefile
[occa] PETSc example with ctx inout, qfdatasize & offsets
[occa] device from ressource, OpenCL TILE size tied to 1
[occa] fixed /ocl/occa
Couple more OKL kernel fixes in example Makefiles
Comment-out the restrict kernels using atomicAdd(double), so we can build the OCCA backends on GPU cards with lower SMs.
[occa] occaPropertiesSet to match new C wrapper API
[occa] dbg macros + ceed argument moved down to occa backend
[occa] Makefile targets comments, occa source debug cleanup
[test] t30 output removed, added V vector 0.0 check
[occa] examples Makefile occa cache
[occa] basis & restrict stat logic to test out of source examples
[occa] pushing backends/occa/*.okl to install prefix/lib/okl and use them if needed
[occa] style
[occa] CeedDebug output when CEED_DEBUG or DBG are non null
[occa] Updated to 1.0 C API
[occa] make style
[occa] cleanup + OCL but tests that use ex1-volume-annulus.okl
...

show more ...

[occa] QFunction from OKL files

Merge remote-tracking branch 'thilina/fortran_interface' [PR #19]

* thilina/fortran_interface: (71 commits)
Makefile: remove redundant prerequisite statement
make astyle
t20-qfunction-f: comme

Merge remote-tracking branch 'thilina/fortran_interface' [PR #19]

* thilina/fortran_interface: (71 commits)
Makefile: remove redundant prerequisite statement
make astyle
t20-qfunction-f: comment dummy argument
Makefile FFLAGS: -Wno-unused-dummy-argument
Makefile: set FC=gfortran because make defines FC=f77 by default
Nek5000 example: add support for NEK5K_DIR and edit README
Undo conversion from CeedScalar to double
Update README
Update run-nek-example script
Comment out exitti call
Add a README for Nek5000 examples
Enumerate QFunctionFortranStub call with arguments
Replace %val(0) by ceed_null
Convert CeedScalar-s to double
Convert CeedInt-s to int
Update Nek5000 example: working now !!!
Update scripts: generate-boxes, make-nek-examples
Update Nek5000 example
Add a batch script to run Nek5000 example
Update Nek5000 example
...

show more ...

Merge branch 'master' into fortran_interface

Merge branch 'ceed-ex1-dev' [PR #30]

* ceed-ex1-dev:
Add examples to test suite
Rename examples/ex1 -> examples/ex1-volume-annulus
make: remove tst target because it reorders output (invalid T

Merge branch 'ceed-ex1-dev' [PR #30]

* ceed-ex1-dev:
Add examples to test suite
Rename examples/ex1 -> examples/ex1-volume-annulus
make: remove tst target because it reorders output (invalid TAP)
make: link examples/%.c into build/%
examples/ex1: make -t (test) select smaller test case and print less
In examples/ex1.c, add parsing of command line options.
In examples/ex1.c, set the mesh node coordinates using the appropriate non-uniform spacing (Lobatto points) instead of uniform spacing.
Remove explicit linking with OCCA from examples/Makefile.
Fixing the build on my Linux box
Add examples/ex1.c which does not have external dependencies.

show more ...

In examples/ex1.c, add parsing of command line options.

Trigger "make clean" in examples/ from the clean target in the main
Makefile.

In .gitignore, add Mac specific files to ignore.

Add file exam

In examples/ex1.c, add parsing of command line options.

Trigger "make clean" in examples/ from the clean target in the main
Makefile.

In .gitignore, add Mac specific files to ignore.

Add file examples/.gitignore.

show more ...

Add Fortran tests

Add pkg-config ceed.pc (generated for build directory)

Add basic doxygen docs (slightly incomplete)

Put build products in build/ to clean up source directories

Add .gitignore