diff --git a/extras/Hadrons/Application.cc b/extras/Hadrons/Application.cc index c746fa7e..0490c222 100644 --- a/extras/Hadrons/Application.cc +++ b/extras/Hadrons/Application.cc @@ -41,6 +41,9 @@ using namespace Hadrons; * Application implementation * ******************************************************************************/ // constructors //////////////////////////////////////////////////////////////// +#define MACOUT(macro) macro << " (" << #macro << ")" +#define MACOUTS(macro) HADRONS_STR(macro) << " (" << #macro << ")" + Application::Application(void) { initLogger(); @@ -57,21 +60,16 @@ Application::Application(void) LOG(Message) << "MPI partition : " << mpi << std::endl; LOG(Message) << "Local lattice : " << loc << std::endl; LOG(Message) << std::endl; - LOG(Message) << "** Default parameters (associated C macro)" << std::endl; - LOG(Message) << "ASCII output precision (DEFAULT_ASCII_PREC) : " - << DEFAULT_ASCII_PREC << std::endl; - LOG(Message) << "Fermion implementation (FIMPL) : " - << HADRONS_STR(FIMPL) << std::endl; - LOG(Message) << "Fermion complex implementation (ZFIMPL) : " - << HADRONS_STR(ZFIMPL) << std::endl; - LOG(Message) << "Scalar implementation (SIMPL) : " - << HADRONS_STR(SIMPL) << std::endl; - LOG(Message) << "Gauge implementation (GIMPL) : " - << HADRONS_STR(GIMPL) << std::endl; - LOG(Message) << "Eigenvector base size (HADRONS_DEFAULT_LANCZOS_NBASIS): " - << HADRONS_DEFAULT_LANCZOS_NBASIS << std::endl; - LOG(Message) << "Schur decomposition (HADRONS_DEFAULT_SCHUR) : " - << HADRONS_STR(HADRONS_DEFAULT_SCHUR) << std::endl; + LOG(Message) << "** Default parameters (and associated C macro)" << std::endl; + LOG(Message) << "ASCII output precision : " << MACOUT(DEFAULT_ASCII_PREC) << std::endl; + LOG(Message) << "Fermion implementation : " << MACOUTS(FIMPL) << std::endl; + LOG(Message) << "z-Fermion implementation: " << MACOUTS(ZFIMPL) << std::endl; + LOG(Message) << "Scalar implementation : " << MACOUTS(SIMPL) << std::endl; + LOG(Message) << "Gauge implementation : " << MACOUTS(GIMPL) << std::endl; + LOG(Message) << "Eigenvector base size : " + << MACOUT(HADRONS_DEFAULT_LANCZOS_NBASIS) << std::endl; + LOG(Message) << "Schur decomposition : " << MACOUTS(HADRONS_DEFAULT_SCHUR) << std::endl; + LOG(Message) << std::endl; } Application::Application(const Application::GlobalPar &par)