diff --git a/.clang-tidy b/.clang-tidy new file mode 100644 index 00000000..59a6916d --- /dev/null +++ b/.clang-tidy @@ -0,0 +1,46 @@ +--- +Checks: 'clang-diagnostic-*,clang-analyzer-*,readability-braces-around-statements' +WarningsAsErrors: '' +HeaderFilterRegex: '' +AnalyzeTemporaryDtors: false +FormatStyle: none +User: user +CheckOptions: + - key: llvm-else-after-return.WarnOnConditionVariables + value: 'false' + - key: modernize-loop-convert.MinConfidence + value: reasonable + - key: modernize-replace-auto-ptr.IncludeStyle + value: llvm + - key: cert-str34-c.DiagnoseSignedUnsignedCharComparisons + value: 'false' + - key: google-readability-namespace-comments.ShortNamespaceLines + value: '10' + - key: cert-err33-c.CheckedFunctions + value: '::aligned_alloc;::asctime_s;::at_quick_exit;::atexit;::bsearch;::bsearch_s;::btowc;::c16rtomb;::c32rtomb;::calloc;::clock;::cnd_broadcast;::cnd_init;::cnd_signal;::cnd_timedwait;::cnd_wait;::ctime_s;::fclose;::fflush;::fgetc;::fgetpos;::fgets;::fgetwc;::fopen;::fopen_s;::fprintf;::fprintf_s;::fputc;::fputs;::fputwc;::fputws;::fread;::freopen;::freopen_s;::fscanf;::fscanf_s;::fseek;::fsetpos;::ftell;::fwprintf;::fwprintf_s;::fwrite;::fwscanf;::fwscanf_s;::getc;::getchar;::getenv;::getenv_s;::gets_s;::getwc;::getwchar;::gmtime;::gmtime_s;::localtime;::localtime_s;::malloc;::mbrtoc16;::mbrtoc32;::mbsrtowcs;::mbsrtowcs_s;::mbstowcs;::mbstowcs_s;::memchr;::mktime;::mtx_init;::mtx_lock;::mtx_timedlock;::mtx_trylock;::mtx_unlock;::printf_s;::putc;::putwc;::raise;::realloc;::remove;::rename;::scanf;::scanf_s;::setlocale;::setvbuf;::signal;::snprintf;::snprintf_s;::sprintf;::sprintf_s;::sscanf;::sscanf_s;::strchr;::strerror_s;::strftime;::strpbrk;::strrchr;::strstr;::strtod;::strtof;::strtoimax;::strtok;::strtok_s;::strtol;::strtold;::strtoll;::strtoul;::strtoull;::strtoumax;::strxfrm;::swprintf;::swprintf_s;::swscanf;::swscanf_s;::thrd_create;::thrd_detach;::thrd_join;::thrd_sleep;::time;::timespec_get;::tmpfile;::tmpfile_s;::tmpnam;::tmpnam_s;::tss_create;::tss_get;::tss_set;::ungetc;::ungetwc;::vfprintf;::vfprintf_s;::vfscanf;::vfscanf_s;::vfwprintf;::vfwprintf_s;::vfwscanf;::vfwscanf_s;::vprintf_s;::vscanf;::vscanf_s;::vsnprintf;::vsnprintf_s;::vsprintf;::vsprintf_s;::vsscanf;::vsscanf_s;::vswprintf;::vswprintf_s;::vswscanf;::vswscanf_s;::vwprintf_s;::vwscanf;::vwscanf_s;::wcrtomb;::wcschr;::wcsftime;::wcspbrk;::wcsrchr;::wcsrtombs;::wcsrtombs_s;::wcsstr;::wcstod;::wcstof;::wcstoimax;::wcstok;::wcstok_s;::wcstol;::wcstold;::wcstoll;::wcstombs;::wcstombs_s;::wcstoul;::wcstoull;::wcstoumax;::wcsxfrm;::wctob;::wctrans;::wctype;::wmemchr;::wprintf_s;::wscanf;::wscanf_s;' + - key: cert-oop54-cpp.WarnOnlyIfThisHasSuspiciousField + value: 'false' + - key: cert-dcl16-c.NewSuffixes + value: 'L;LL;LU;LLU' + - key: google-readability-braces-around-statements.ShortStatementLines + value: '1' + - key: cppcoreguidelines-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic + value: 'true' + - key: google-readability-namespace-comments.SpacesBeforeComments + value: '2' + - key: modernize-loop-convert.MaxCopySize + value: '16' + - key: modernize-pass-by-value.IncludeStyle + value: llvm + - key: modernize-use-nullptr.NullMacros + value: 'NULL' + - key: llvm-qualified-auto.AddConstToQualified + value: 'false' + - key: modernize-loop-convert.NamingStyle + value: CamelCase + - key: llvm-else-after-return.WarnOnUnfixable + value: 'false' + - key: google-readability-function-size.StatementThreshold + value: '800' +... + diff --git a/.github/workflows/cpp-linter.yml b/.github/workflows/cpp-linter.yml index 7ce03b3d..8883f3c5 100644 --- a/.github/workflows/cpp-linter.yml +++ b/.github/workflows/cpp-linter.yml @@ -1,28 +1,24 @@ -# Workflow syntax: -# https://help.github.com/en/articles/workflow-syntax-for-github-actions name: cpp-linter on: - push: - paths-ignore: "docs/**" pull_request: - paths-ignore: "docs/**" + branches: [master] jobs: cpp-linter: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: shenxianpeng/cpp-linter-action@master + - uses: cpp-linter/cpp-linter-action@v2 id: linter env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: style: file + tidy-checks: '-*' - name: Fail fast?! if: steps.linter.outputs.checks-failed > 0 run: | echo "Some files failed the linting checks!" - # for actual deployment - # run: exit 1 + exit 1 diff --git a/src/WallThickness/WallThicknessLib.cpp b/src/WallThickness/WallThicknessLib.cpp index 119f07d6..e4fd55aa 100644 --- a/src/WallThickness/WallThicknessLib.cpp +++ b/src/WallThickness/WallThicknessLib.cpp @@ -78,36 +78,39 @@ double calculate_wall_thickness_plane( const std::vector &a_vcritical, std::shared_ptr a_modelPointer, const double &a_Temp, - const int &a_WhichMinimizer) { - while (mDataIndex < a_BasePoints.size()) - { - const auto data = a_BasePoints.at(mDataIndex++); - auto MinimumPlaneResult = Minimizer::MinimizePlane(data.second, - a_vevsymmetric, - a_vcritical, - a_modelPointer, - a_Temp, - a_WhichMinimizer); - { - std::unique_lock lock(mWriteResultLock); - Data_min.at(data.first) = -MinimumPlaneResult.PotVal; - } - } - }; + const int &a_WhichMinimizer) + { + while (mDataIndex < a_BasePoints.size()) + { + const auto data = a_BasePoints.at(mDataIndex++); + auto MinimumPlaneResult = Minimizer::MinimizePlane(data.second, + a_vevsymmetric, + a_vcritical, + a_modelPointer, + a_Temp, + a_WhichMinimizer); + { + std::unique_lock lock(mWriteResultLock); + Data_min.at(data.first) = -MinimumPlaneResult.PotVal; + } + } + }; for (auto &thr : Data_min_threads) { - thr = std::thread([&]() { - thread_Job(DataIndex, - BasePoints, - Data_min_negative, - WriteLock, - vevsymmetric, - vcritical, - modelPointer, - Temp, - WhichMinimizer); - }); + thr = std::thread( + [&]() + { + thread_Job(DataIndex, + BasePoints, + Data_min_negative, + WriteLock, + vevsymmetric, + vcritical, + modelPointer, + Temp, + WhichMinimizer); + }); } for (auto &thr : Data_min_threads) diff --git a/src/baryo_calculation/Fluid_Type/gen_calc.cpp b/src/baryo_calculation/Fluid_Type/gen_calc.cpp index 2f5af99a..bcad60e0 100644 --- a/src/baryo_calculation/Fluid_Type/gen_calc.cpp +++ b/src/baryo_calculation/Fluid_Type/gen_calc.cpp @@ -1,5 +1,6 @@ // Copyright (C) 2020 Philipp Basler, Margarete Mühlleitner and Jonas Müller -// SPDX-FileCopyrightText: 2021 Philipp Basler, Margarete Mühlleitner and Jonas Müller +// SPDX-FileCopyrightText: 2021 Philipp Basler, Margarete Mühlleitner and Jonas +// Müller // // SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/baryo_calculation/Fluid_Type/top_source.cpp b/src/baryo_calculation/Fluid_Type/top_source.cpp index 37c9ae21..8ef25d98 100644 --- a/src/baryo_calculation/Fluid_Type/top_source.cpp +++ b/src/baryo_calculation/Fluid_Type/top_source.cpp @@ -1,5 +1,6 @@ // Copyright (C) 2020 Philipp Basler, Margarete Mühlleitner and Jonas Müller -// SPDX-FileCopyrightText: 2021 Philipp Basler, Margarete Mühlleitner and Jonas Müller +// SPDX-FileCopyrightText: 2021 Philipp Basler, Margarete Mühlleitner and Jonas +// Müller // // SPDX-License-Identifier: GPL-3.0-or-later @@ -68,14 +69,14 @@ void top_source::operator()(const state_type &omega, theta_vec[1]; // derivative of the phase factor of the top quark // Calculation of kappa_t Calc_kappa_obj.set_class(Temp, mt); - double num_int = NIntegrate_kappa(Calc_kappa_obj); - double kappa_q = kappa_QL_0 * num_int; // left-handed kappa + double num_int = NIntegrate_kappa(Calc_kappa_obj); + double kappa_q = kappa_QL_0 * num_int; // left-handed kappa double kappa_tR = kappa_QR_0 * num_int; // right-handed kappa // Rescaled chemical potential like in 1811.11104 double mu_M = (omega[1] / kappa_tR - omega[0] / kappa_q); double bR = -(omega[1] + omega[0]); // local baryon conservation used to - // expresse the right-handed b density + // expresse the right-handed b density double mu_SS = 2 * omega[0] / kappa_q - omega[1] / kappa_tR - bR / kappa_QR_0; double mu_Y = omega[1] / kappa_tR - omega[0] / kappa_q - omega[2] / kappa_H_0 - omega[3] / kappa_H_0; diff --git a/src/minimizer/LibCMAES/MinimizeLibCMAES.cpp b/src/minimizer/LibCMAES/MinimizeLibCMAES.cpp index 28926f08..cb525d96 100644 --- a/src/minimizer/LibCMAES/MinimizeLibCMAES.cpp +++ b/src/minimizer/LibCMAES/MinimizeLibCMAES.cpp @@ -54,7 +54,8 @@ LibCMAESReturn min_cmaes_gen_all(const Class_Potential_Origin &model, // cmaparams.set_noisy(); cmaparams.set_ftolerance(ftol); - FitFunc cmafunc = [&](const double *v, const int &N) { + FitFunc cmafunc = [&](const double *v, const int &N) + { (void)N; std::vector vev; for (std::size_t i{0}; i < dim; ++i) @@ -109,7 +110,8 @@ CMAES_Minimize_Plane_gen_all(const struct PointerContainerMinPlane ¶ms, cmaparams.set_algo(aCMAES); cmaparams.set_ftolerance(ftol); - FitFunc CMAES_VEFF_Minimize_Plane = [=](const double *v, const int &N) { + FitFunc CMAES_VEFF_Minimize_Plane = [=](const double *v, const int &N) + { (void)N; std::size_t nVEVs = params.modelPointer->get_nVEV(); diff --git a/src/minimizer/Minfunc_gen.cpp b/src/minimizer/Minfunc_gen.cpp index 903310b6..e95f3524 100644 --- a/src/minimizer/Minfunc_gen.cpp +++ b/src/minimizer/Minfunc_gen.cpp @@ -1,5 +1,6 @@ // Copyright (C) 2018 Philipp Basler and Margarete Mühlleitner -// SPDX-FileCopyrightText: 2021 Philipp Basler, Margarete Mühlleitner and Jonas Müller +// SPDX-FileCopyrightText: 2021 Philipp Basler, Margarete Mühlleitner and Jonas +// Müller // // SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/minimizer/MinimizeGSL.cpp b/src/minimizer/MinimizeGSL.cpp index 8a6be0ac..333de73b 100644 --- a/src/minimizer/MinimizeGSL.cpp +++ b/src/minimizer/MinimizeGSL.cpp @@ -200,7 +200,8 @@ GSL_Minimize_gen_all(const Class_Potential_Origin &model, GSL_params &mparams, std::mutex &mWriteResultLock, std::queue> &mResults, - bool UseLock = true) { + bool UseLock = true) + { while (mFoundSolutions < mMaxSol and not mStartingPoints.empty()) { std::vector start; @@ -234,14 +235,16 @@ GSL_Minimize_gen_all(const Class_Potential_Origin &model, for (std::size_t i = 0; i < Num_threads; ++i) { - MinThreads.push_back(std::thread([&]() { - thread_Job(FoundSolutions, - MaxSol, - StartingPoints, - params, - WriteResultLock, - Results); - })); + MinThreads.push_back(std::thread( + [&]() + { + thread_Job(FoundSolutions, + MaxSol, + StartingPoints, + params, + WriteResultLock, + Results); + })); } for (auto &thr : MinThreads) diff --git a/src/minimizer/Minimizer.cpp b/src/minimizer/Minimizer.cpp index 105ada94..6ecf51fc 100644 --- a/src/minimizer/Minimizer.cpp +++ b/src/minimizer/Minimizer.cpp @@ -125,8 +125,9 @@ Minimize_gen_all(const std::shared_ptr &modelPointer, { if (UseMultithreading) { - thread_GSL = - std::thread([&solGSLMin, &gslMinSuc, &modelPointer, &Temp]() { + thread_GSL = std::thread( + [&solGSLMin, &gslMinSuc, &modelPointer, &Temp]() + { std::tie(solGSLMin, gslMinSuc) = GSL_Minimize_gen_all( *modelPointer, Temp, @@ -146,7 +147,8 @@ Minimize_gen_all(const std::shared_ptr &modelPointer, if (UseMultithreading) { thread_GSL = std::thread( - [&solGSLMin, &gslMinSuc, &modelPointer, &Temp, &MaxSol]() { + [&solGSLMin, &gslMinSuc, &modelPointer, &Temp, &MaxSol]() + { std::tie(solGSLMin, gslMinSuc) = GSL_Minimize_gen_all(*modelPointer, Temp, 5, MaxSol); }); @@ -165,9 +167,10 @@ Minimize_gen_all(const std::shared_ptr &modelPointer, { if (UseMultithreading) { - thread_CMAES = std::thread([&modelPointer, &Temp, &start, &LibCMAES]() { - LibCMAES = LibCMAES::min_cmaes_gen_all(*modelPointer, Temp, start); - }); + thread_CMAES = std::thread( + [&modelPointer, &Temp, &start, &LibCMAES]() { + LibCMAES = LibCMAES::min_cmaes_gen_all(*modelPointer, Temp, start); + }); } else { @@ -185,9 +188,9 @@ Minimize_gen_all(const std::shared_ptr &modelPointer, { if (UseMultithreading) { - thread_NLopt = std::thread([&NLOPTResult, &modelPointer, &Temp]() { - NLOPTResult = LibNLOPT::MinimizeUsingNLOPT(*modelPointer, Temp); - }); + thread_NLopt = std::thread( + [&NLOPTResult, &modelPointer, &Temp]() + { NLOPTResult = LibNLOPT::MinimizeUsingNLOPT(*modelPointer, Temp); }); } else { @@ -514,7 +517,8 @@ MinimaDevelopmentWithTemperature( } } - auto StoppingCriteria = [&](const double &Temp) { + auto StoppingCriteria = [&](const double &Temp) + { double epsilon = std::abs((FinalTemperature - StartingTemperature) / StepsizeTemperature) * 1e-2; // because 1+1 = 2.0000000000000001 diff --git a/src/models/ClassPotentialC2HDM.cpp b/src/models/ClassPotentialC2HDM.cpp index 627b6ee3..1d878062 100644 --- a/src/models/ClassPotentialC2HDM.cpp +++ b/src/models/ClassPotentialC2HDM.cpp @@ -2421,9 +2421,9 @@ void Class_Potential_C2HDM::TripleHiggsCouplings() } MatrixXd HiggsRotSort(NHiggs, NHiggs); int posMHCS1 = 0, posMHCS2 = 0; - int posN[3]; - int countposN = 0; - int posG1 = 0, posG2 = 0, posG0 = 0; + std::vector posN(3); + std::size_t countposN = 0; + std::size_t posG1 = 0, posG2 = 0, posG0 = 0; double testsum = 0; const double ZeroThreshold = 1e-5; for (int i = 0; i < 3; i++) @@ -2446,7 +2446,7 @@ void Class_Potential_C2HDM::TripleHiggsCouplings() testsum += std::abs(HiggsRot(i, k)); if (testsum > ZeroThreshold) { - posN[countposN] = i; + posN.at(countposN) = i; countposN++; } } @@ -2460,7 +2460,7 @@ void Class_Potential_C2HDM::TripleHiggsCouplings() double NeutralHiggs[3]; for (int i = 0; i < 3; i++) { - NeutralHiggs[i] = HiggsMasses[posN[i]]; + NeutralHiggs[i] = HiggsMasses[posN.at(i)]; } for (int i = 0; i < 3; i++) { diff --git a/src/models/ClassPotentialCPintheDark.cpp b/src/models/ClassPotentialCPintheDark.cpp index 836301f9..b6ae3aed 100644 --- a/src/models/ClassPotentialCPintheDark.cpp +++ b/src/models/ClassPotentialCPintheDark.cpp @@ -2081,7 +2081,6 @@ void Class_Potential_CPintheDark::SetCurvatureArrays() V32 = C_Vts; V33 = C_Vtb; - Curvature_Quark_F2H1[0][1][4] = 0.1e1 / v1 * C_MassUp; Curvature_Quark_F2H1[0][1][5] = -II / v1 * C_MassUp; Curvature_Quark_F2H1[0][3][0] = 0.1e1 / v1 * C_MassDown * V11; diff --git a/src/models/ClassPotentialCxSM.cpp b/src/models/ClassPotentialCxSM.cpp index c97fbd63..29ea0484 100644 --- a/src/models/ClassPotentialCxSM.cpp +++ b/src/models/ClassPotentialCxSM.cpp @@ -1091,7 +1091,6 @@ void Class_CxSM::SetCurvatureArrays() VC32 = std::conj(C_Vts); VC33 = std::conj(C_Vtb); - Curvature_Lepton_F2H1[0][1][2] = II / vh * C_MassElectron; Curvature_Lepton_F2H1[0][1][3] = 0.1e1 / vh * C_MassElectron; Curvature_Lepton_F2H1[1][0][2] = II / vh * C_MassElectron; diff --git a/src/models/ClassPotentialOrigin.cpp b/src/models/ClassPotentialOrigin.cpp index 3ff0d5fd..510a0019 100644 --- a/src/models/ClassPotentialOrigin.cpp +++ b/src/models/ClassPotentialOrigin.cpp @@ -304,19 +304,16 @@ double Class_Potential_Origin::fbaseTri(double MassSquaredA, else if (mas != 0 and mbs == 0 and mcs == 0) { C = 2; - res = 1.0 / mas * (std::log(mas) - 1); res = 1.0 / mas * (LogA - 1); } else if (mas == 0 and mbs != 0 and mcs == 0) { C = 3; - res = 1.0 / mbs * (std::log(mbs) - 1); res = (LogB - 1) / mbs; } else if (mas == 0 and mbs == 0 and mcs != 0) { C = 4; - res = 1.0 / mcs * (std::log(mcs) - 1); res = (LogC - 1) / mcs; } else if (mas == mbs and mas != 0 and mas != mcs and mcs != 0) @@ -3890,18 +3887,19 @@ double Class_Potential_Origin::CalculateRatioAlpha( const std::vector &vev_broken, const double &Temp) const { - double res = 0; - double PotentialSymmetricPhaseValue = VEff(vev_symmetric, Temp, 0); - double PotentialSymmetricPhaseDeriv = VEff(vev_symmetric, Temp, -1); - double PotentialBrokenPhaseValue = VEff(vev_broken, Temp, 0); - double PotentialBrokenPhaseDeriv = VEff(vev_broken, Temp, -1); - res = -(PotentialBrokenPhaseValue - PotentialSymmetricPhaseValue) + - Temp * (PotentialBrokenPhaseDeriv - PotentialSymmetricPhaseDeriv); + (void)vev_symmetric; + (void)vev_broken; + (void)Temp; + // double res = 0; + // double PotentialSymmetricPhaseValue = VEff(vev_symmetric, Temp, 0); + // double PotentialSymmetricPhaseDeriv = VEff(vev_symmetric, Temp, -1); + // double PotentialBrokenPhaseValue = VEff(vev_broken, Temp, 0); + // double PotentialBrokenPhaseDeriv = VEff(vev_broken, Temp, -1); + // res = -(PotentialBrokenPhaseValue - PotentialSymmetricPhaseValue) + + // Temp * (PotentialBrokenPhaseDeriv - PotentialSymmetricPhaseDeriv); // TODO:: Unfinished! throw std::runtime_error("The CalculateRatioAlpha function is not finished " "and you should not be using it!"); - - return res; } std::vector Class_Potential_Origin::MinimizeOrderVEV( diff --git a/src/models/ClassPotentialR2HDM.cpp b/src/models/ClassPotentialR2HDM.cpp index 427a34cc..f8b9073b 100644 --- a/src/models/ClassPotentialR2HDM.cpp +++ b/src/models/ClassPotentialR2HDM.cpp @@ -783,7 +783,6 @@ void Class_Potential_R2HDM::TripleHiggsCouplings() if (testsum > ZeroThreshold) posMHCS2 = i; testsum = std::abs(HiggsRot(i, 5)) + std::abs(HiggsRot(i, 7)); if (testsum > ZeroThreshold) posA = i; - testsum = 0; testsum = std::abs(HiggsRot(i, 4)) + std::abs(HiggsRot(i, 6)); if (testsum > ZeroThreshold) { diff --git a/src/models/ClassPotentialRN2HDM.cpp b/src/models/ClassPotentialRN2HDM.cpp index 883cf0ea..703aedc3 100644 --- a/src/models/ClassPotentialRN2HDM.cpp +++ b/src/models/ClassPotentialRN2HDM.cpp @@ -811,9 +811,9 @@ void Class_Potential_RN2HDM::TripleHiggsCouplings() MatrixXd HiggsRotSort(NHiggs, NHiggs); int posMHCS1 = 0, posMHCS2 = 0; int posA = 0; - int posN[3]; - int countposN = 0; - int posG1 = 0, posG2 = 0, posG0 = 0; + std::vector posN(3); + std::size_t countposN = 0; + std::size_t posG1 = 0, posG2 = 0, posG0 = 0; double testsum = 0; const double ZeroThreshold = 1e-5; @@ -837,7 +837,7 @@ void Class_Potential_RN2HDM::TripleHiggsCouplings() std::abs(HiggsRot(i, 8)); if (testsum > ZeroThreshold) { - posN[countposN] = i; + posN.at(countposN) = i; countposN++; } testsum = std::abs(HiggsRot(i, 4)) + std::abs(HiggsRot(i, 5)); @@ -850,7 +850,7 @@ void Class_Potential_RN2HDM::TripleHiggsCouplings() double NeutralHiggs[3]; for (int i = 0; i < 3; i++) { - NeutralHiggs[i] = HiggsMasses[posN[i]]; + NeutralHiggs[i] = HiggsMasses[posN.at(i)]; } for (int i = 0; i < 3; i++) { @@ -2937,7 +2937,6 @@ void Class_Potential_RN2HDM::SetCurvatureArrays() YIJSL = MatrixXcd::Zero(NLepton, NLepton); YIJPL = MatrixXcd::Zero(NLepton, NLepton); - double v1 = C_vev0 * C_CosBeta; double v2 = C_vev0 * C_SinBeta; double vL = v2; diff --git a/src/prog/Kfactor_grid.cpp b/src/prog/Kfactor_grid.cpp index 3e316de3..6ec23834 100644 --- a/src/prog/Kfactor_grid.cpp +++ b/src/prog/Kfactor_grid.cpp @@ -1,5 +1,6 @@ // Copyright (C) 2020 Philipp Basler, Margarete Mühlleitner and Jonas -// SPDX-FileCopyrightText: 2021 Philipp Basler, Margarete Mühlleitner and Jonas Müller +// SPDX-FileCopyrightText: 2021 Philipp Basler, Margarete Mühlleitner and Jonas +// Müller // // SPDX-License-Identifier: GPL-3.0-or-later @@ -111,7 +112,7 @@ void CreateKtildeInterpolationData() outputNormalisation << "const std::vector msquaredTsquared{"; //<< - //msquaredTsquared.size() + // msquaredTsquared.size() //<< "] = {"; for (std::size_t i = 0; i < msquaredTsquared.size(); i++) { @@ -133,7 +134,7 @@ void CreateKtildeInterpolationData() outputNormalisation << "const std::vector KtildeNormFermion_grid{"; //<< - //KtildeNormFermion.size() + // KtildeNormFermion.size() //<< "] = {"; for (std::size_t i = 0; i < KtildeNormFermion.size(); i++) { diff --git a/src/prog/TestNewKheader.cpp b/src/prog/TestNewKheader.cpp index b9c9e6f6..a1103756 100644 --- a/src/prog/TestNewKheader.cpp +++ b/src/prog/TestNewKheader.cpp @@ -1,4 +1,5 @@ -// SPDX-FileCopyrightText: 2021 Philipp Basler, Margarete Mühlleitner and Jonas Müller +// SPDX-FileCopyrightText: 2021 Philipp Basler, Margarete Mühlleitner and Jonas +// Müller // // SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/prog/VEVEVO.cpp b/src/prog/VEVEVO.cpp index 22c4be59..f029e7f6 100644 --- a/src/prog/VEVEVO.cpp +++ b/src/prog/VEVEVO.cpp @@ -103,10 +103,8 @@ try outfile << std::setprecision(16); - outfile << "T" << sep << "v"; - for (auto x : modelPointer->addLegendVEV()) - outfile << sep << x; - outfile << sep << "Veff(v,T)" << std::endl; + outfile << "T" << sep << "v" << sep << modelPointer->addLegendVEV() << sep + << "Veff(v,T)" << std::endl; for (double Temp = args.TemperatureStart; Temp <= args.TemperatureEnd; Temp += args.TemperatureStep) diff --git a/src/utility/utility.cpp b/src/utility/utility.cpp index a19e9b9e..5d9b0ab3 100644 --- a/src/utility/utility.cpp +++ b/src/utility/utility.cpp @@ -6,9 +6,9 @@ #include #include -#include #include #include +#include /** * @file