Daniel Richtmann
a414430817
Merge remote-tracking branch 'upstream/develop' into feature/ddalphaamg
2018-01-29 18:32:31 +01:00
Daniel Richtmann
f20728baa9
WilsonMG: Some further steps towards a three level method
...
Currently this is very "manual" as we are still testing stuff. Will refactor
and make it an algorithm once everything works.
What currently does work:
- All tests in MultiGridPreconditioner::runChecks for the first coarse grid
- The tests for the intergrid operators going from the first to the second
coarse grid
- (1 - P R) v == 0
- (1 - R P) v_c == 0
- A full solve with VPGCR and a two-level MG preconditioner
What hinders the rest of the tests from passing with a three-level method is the
absence of implementations of CoarsenedMatrix::Mdir and CoarsenedMatrix::Mdiag.
2018-01-29 18:29:49 +01:00
Daniel Richtmann
d2e68c4355
WilsonMG: Perform some minor cleanup
2018-01-29 18:07:10 +01:00
Daniel Richtmann
1cb745c8dc
Add function to return full type as std::string
...
Also works for nested templates. I find it useful for debugging.
Possible usage:
std::cout << "getTypename<AType>() = " << getTypename<Atype>() << std::endl;
std::cout << "getTypename<decltype(AnInstance)>() = " << getTypename<decltype(AnInstance)>() << std::endl;
2018-01-29 17:39:19 +01:00
Daniel Richtmann
faf4278019
Use 2 passes of GS in coarse operator construction
2018-01-29 17:21:42 +01:00
Daniel Richtmann
194e4b94bb
Make MG checking function work level-wise
2018-01-29 17:18:20 +01:00
Daniel Richtmann
bfc1411c1f
Use more iterations in subspace creation
2018-01-29 17:11:29 +01:00
Daniel Richtmann
161637e573
Turn on orthogonality checking temporarily
2018-01-29 17:10:05 +01:00
Guido Cossu
fb24e3a7d2
Adding utilities for perf profiling
2018-01-29 11:11:45 +01:00
Guido Cossu
655a69259a
Added support for GCC compilation for Skylake AVX512
2018-01-28 17:02:46 +01:00
James Harrison
4e0cf0cc28
QedFVol: Fix bug in ScalarVP.cc due to double use of temporary object. Still getting mpi3 errors when configured with enable-comms=mpi[-auto].
2018-01-27 15:15:25 +00:00
Guido Cossu
507c4e9efc
Correcting an missing semicolumn in avx512
2018-01-27 10:59:55 +01:00
James Harrison
cdf550845f
QedFVol: Fix bugs in StochEm.cc and ChargedProp.cc (still only works without MPI).
2018-01-26 21:25:20 +00:00
James Harrison
3db7a5387b
BROKEN: Adapted scalarVP, UnitEm and VPCounterTerms modules to new Hadrons. Currently getting an assertion error from Communicator_mpi3.cc when I try to run.
2018-01-26 16:33:48 +00:00
Guido Cossu
f8a5194c70
Merge branch 'develop' of https://github.com/paboyle/Grid into develop
2018-01-25 13:46:37 +01:00
Guido Cossu
cff3bae155
Adding support for general Nc in the benchmark outputs
2018-01-25 13:46:31 +01:00
James Harrison
90dffc73c8
Merge branch 'feature/hadrons' into feature/qed-fvol
...
# Conflicts:
# extras/Hadrons/Modules.hpp
# extras/Hadrons/Modules/MGauge/StochEm.cc
# extras/Hadrons/Modules/MScalar/ChargedProp.cc
# extras/Hadrons/Modules/MScalar/ChargedProp.hpp
# extras/Hadrons/modules.inc
# lib/communicator/Communicator_mpi.cc
2018-01-24 16:41:44 +00:00
a1151fc734
Hadrons: MPI-safe serial IO
2018-01-23 17:26:50 +00:00
James Harrison
ab3baeb38f
Implement contractions and data output in functions; calculate diagrams S, X and 4C separately; output 2E and 2T instead of sunset_shifted, sunset_unshifted, tadpole_shifted, tadpole_unshifted; add comments.
2018-01-23 17:07:45 +00:00
Vera Guelpers
389731d373
changed SeqConservedSummed.hpp to work with new hadrons interface
2018-01-23 10:11:33 +00:00
6e3ce7423e
Hadrons: don't display module list at startup (too long)
2018-01-22 20:04:05 +00:00
15f15a7cfd
Merge branch 'develop' into feature/hadrons
...
# Conflicts:
# extras/Hadrons/Modules.hpp
# extras/Hadrons/modules.inc
2018-01-22 20:03:36 +00:00
0e5f626226
Hadrons: module for scalar operator divergence
2018-01-22 19:38:19 +00:00
Daniel Richtmann
04f92ccddf
WilsonMG: Provide a fix for the previous commit; compiles and runs successfully now
...
I don't like the solution with the temporary very much though ...
2018-01-22 14:56:48 +01:00
Daniel Richtmann
3b2d805398
WilsonMG: Some first steps towards coarse spin dofs; not compiling yet
...
A failing conversion from the innermost type (Grid::Simd<...>) to a coarse
scalar (triple iScalar) in blockPromote prohibits this commit from working.
2018-01-22 12:45:51 +01:00
Azusa Yamaguchi
97b9c6f03d
No option for interior/exterior split of asm kernels since different directions get interleaved
2018-01-22 11:04:19 +00:00
Azusa Yamaguchi
63982819c6
No option to overlap comms and compute for asm implementation since different directions are interleaved
...
in the kernels, introducing if else structure would be too painful
2018-01-22 11:03:39 +00:00
Vera Guelpers
6fec507bef
merged new hadrons interface
2018-01-22 10:09:20 +00:00
James Harrison
219b3bd34f
Remove freeVpTensor object
2018-01-19 17:14:11 +00:00
Daniel Richtmann
9dc885d297
Fix a bug in Wilson MG
...
The calculation of the lattice size of a second coarse level was incorrect.
2018-01-18 17:02:04 +01:00
Daniel Richtmann
a70c1feecc
Remove some unnecessary stuff in Wilson MG
2018-01-18 15:48:28 +01:00
Daniel Richtmann
38328100c9
Implement correctness checks for Wilson MG
2018-01-18 15:43:15 +01:00
Daniel Richtmann
9732519c41
Apply clang-format to Wilson MG
...
I can provide the configuration file I used if people want that.
2018-01-18 15:14:37 +01:00
Daniel Richtmann
fa4eeb28c4
Save current state in Wilson MG test file
2018-01-17 17:56:34 +01:00
Guido Cossu
b00d2d2c39
Correction of Representations compilation and small compilation error for Intel 17
2018-01-17 13:46:12 +00:00
Guido Cossu
f1b3e21830
Merge branch 'feature/clover' into develop
2018-01-17 10:07:42 +00:00
Guido Cossu
b7f8c5b823
Modify test to merge with the new Lanczos interface
2018-01-12 14:38:27 +00:00
Guido Cossu
3923683e9b
Updating the feature/clover branch with the newest Hadron package
2018-01-12 13:35:51 +00:00
Guido Cossu
e199fda9dc
Merge pull request #136 from pretidav/feature/clover
...
Feature/clover
2018-01-12 11:57:08 +00:00
7bb405e790
Merge branch 'develop' into feature/hadrons
...
# Conflicts:
# lib/communicator/Communicator_mpi3_leader.cc
# lib/communicator/Communicator_shmem.cc
2018-01-11 18:50:15 +00:00
Daniel Richtmann
10f7a17ae4
Make timing in VPGCR more detailed
2018-01-11 13:42:18 +01:00
Daniel Richtmann
26f14d7dd7
Adapt output format of non-herm solvers to the one of VPGCR
2018-01-11 13:36:30 +01:00
ec16eacc6a
Hadrons: scalar SU(N) 2-pt function
2018-01-10 22:12:21 +00:00
pretidav
cf858deb16
Lanczos with 2 reps fixed (tobe tested)
2018-01-10 18:43:02 +01:00
David Preti
a3affac963
SU3 restored + output filename for mesons and baryons fixed.
2018-01-10 14:56:54 +01:00
d9d1f43ba2
Hadrons: code cleaning
2018-01-10 11:31:24 +00:00
b7cd721308
Hadrons: scalar SU(N) tr(mag^n)
2018-01-10 11:25:59 +00:00
29f026c375
Hadrons: scalar SU(N) tr(phi^n) 1-pt function
2018-01-10 11:01:03 +00:00
58c7a13d54
Hadrons: result file macro with trajectory number
2018-01-10 10:59:58 +00:00
Azusa Yamaguchi
24162c9ead
Staggered overlap comms comput
2018-01-09 13:02:52 +00:00