paboyle 4908b77d46 Fixed conflicts. PLEASE avoid making wholesale cosmetic only changes, this created ...

a HUGE amount of difficult to resolve and understand conflicts .

Wholesale formatting, reordering functions etc... in a central file like Tensor_class
or Grid_vector_types while others are also editing without making substantial functionality
changes creates pain.

2016-07-15 20:59:07 +01:00

..

Tensor_arith_add.h

Global edit adding copyright and license info to every source file.

2016-01-02 14:51:32 +00:00

Tensor_arith_mac.h

Global edit adding copyright and license info to every source file.

2016-01-02 14:51:32 +00:00

Tensor_arith_mul.h

Global edit adding copyright and license info to every source file.

2016-01-02 14:51:32 +00:00

Tensor_arith_scalar.h

Global edit adding copyright and license info to every source file.

2016-01-02 14:51:32 +00:00

Tensor_arith_sub.h

Global edit adding copyright and license info to every source file.

2016-01-02 14:51:32 +00:00

Tensor_arith.h

Open up dependency on Eigen and FFTW

2016-07-07 22:31:07 +01:00

Tensor_class.h

Fixed conflicts. PLEASE avoid making wholesale cosmetic only changes, this created

2016-07-15 20:59:07 +01:00

Tensor_determinant.h

Global edit adding copyright and license info to every source file.

2016-01-02 14:51:32 +00:00

Tensor_exp.h

Global edit adding copyright and license info to every source file.

2016-01-02 14:51:32 +00:00

Tensor_extract_merge.h

Implemented mixed precision CG. Fixed filelist to exclude lib/Old directory and include Config.h.

2016-07-06 15:57:04 -04:00

Tensor_index.h

Fix to iVector and iMatrix pokeIndex and checkerboard local site indexing.

2016-07-11 17:15:22 -04:00

Tensor_inner.h

Global edit adding copyright and license info to every source file.

2016-01-02 14:51:32 +00:00

Tensor_logical.h

Global edit adding copyright and license info to every source file.

2016-01-02 14:51:32 +00:00

Tensor_outer.h

Global edit adding copyright and license info to every source file.

2016-01-02 14:51:32 +00:00

Tensor_reality.h

Global edit adding copyright and license info to every source file.

2016-01-02 14:51:32 +00:00

Tensor_Ta.h

Global edit adding copyright and license info to every source file.

2016-01-02 14:51:32 +00:00

Tensor_trace.h

Global edit adding copyright and license info to every source file.

2016-01-02 14:51:32 +00:00

Tensor_traits.h

Implemented mixed precision CG. Fixed filelist to exclude lib/Old directory and include Config.h.

2016-07-06 15:57:04 -04:00

Tensor_transpose.h

Global edit adding copyright and license info to every source file.

2016-01-02 14:51:32 +00:00

Tensor_unary.h

Corrected a bug in the Expression Templates (acso and asin were wrong)

2016-07-03 12:28:25 +01:00