Skip to content

Commit

Permalink
Add missing macro definition
Browse files Browse the repository at this point in the history
  • Loading branch information
Dylan Harries committed Feb 2, 2017
1 parent 4eb2127 commit 69bb55b
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 11 deletions.
4 changes: 3 additions & 1 deletion templates/semi_analytic_ewsb_solver.cpp.in
Expand Up @@ -31,6 +31,7 @@
#include "@ModelName@_mass_eigenstates.hpp"
#include "@ModelName@_semi_analytic_solutions.hpp"
#include "error.hpp"
#include "ew_input.hpp"
#include "logger.hpp"
#include "root_finder.hpp"
#include "fixed_point_iterator.hpp"
Expand All @@ -48,6 +49,7 @@ namespace flexiblesusy {
#define DERIVEDPARAMETER(parameter) model.parameter()
#define PHASE(p) MODELPARAMETER(p)
#define SEMIANALYTICPARAMETER(p) solutions->get_##p()
#define LowEnergyConstant(p) Electroweak_constants::p
#define CLASSNAME @ModelName@_ewsb_solver<Semi_analytic>

/**
Expand Down Expand Up @@ -262,7 +264,7 @@ CLASSNAME::EWSB_vector_t CLASSNAME::ewsb_step(
return ewsb_parameters;
}

void @ModelName@_ewsb_solver<Semi_analytic>::set_semi_analytic_solutions(
void CLASSNAME::set_semi_analytic_solutions(
@ModelName@_semi_analytic_solutions* s)
{
solutions = s;
Expand Down
22 changes: 12 additions & 10 deletions templates/two_scale_ewsb_solver.cpp.in
Expand Up @@ -45,12 +45,14 @@ namespace flexiblesusy {
#define EXTRAPARAMETER(parameter) model.get_##parameter()
#define DERIVEDPARAMETER(parameter) model.parameter()
#define PHASE(p) MODELPARAMETER(p)
#define LowEnergyConstant(p) Electroweak_constants::p
#define CLASSNAME @ModelName@_ewsb_solver<Two_scale>

/**
* This method solves the EWSB conditions iteratively, trying several
* root finding methods until a solution is found.
*/
int @ModelName@_ewsb_solver<Two_scale>::solve_iteratively(@ModelName@_mass_eigenstates& model_to_solve)
int CLASSNAME::solve_iteratively(@ModelName@_mass_eigenstates& model_to_solve)
{
auto model = model_to_solve;
model.set_ewsb_loop_order(loop_order);
Expand Down Expand Up @@ -123,7 +125,7 @@ int @ModelName@_ewsb_solver<Two_scale>::solve_iteratively(@ModelName@_mass_eigen
*
* @return status of the EWSB solver
*/
int @ModelName@_ewsb_solver<Two_scale>::solve_iteratively_with(
int CLASSNAME::solve_iteratively_with(
@ModelName@_mass_eigenstates& model_to_solve, EWSB_solver* solver, const EWSB_vector_t& x_init)
{
const int status = solver->solve(x_init);
Expand All @@ -140,7 +142,7 @@ int @ModelName@_ewsb_solver<Two_scale>::solve_iteratively_with(
* @param model model to set EWSB output parameters in
* @param solver solver
*/
void @ModelName@_ewsb_solver<Two_scale>::set_ewsb_solution(@ModelName@_mass_eigenstates& model, const EWSB_solver* solver)
void CLASSNAME::set_ewsb_solution(@ModelName@_mass_eigenstates& model, const EWSB_solver* solver)
{
const auto solution = solver->get_solution();

Expand All @@ -158,7 +160,7 @@ void @ModelName@_ewsb_solver<Two_scale>::set_ewsb_solution(@ModelName@_mass_eige
* @param last iterator to last solver
*/
template <typename It>
void @ModelName@_ewsb_solver<Two_scale>::set_best_ewsb_solution(@ModelName@_mass_eigenstates& model, It first, It last)
void CLASSNAME::set_best_ewsb_solution(@ModelName@_mass_eigenstates& model, It first, It last)
{
auto ma(model), mb(model);

Expand All @@ -175,7 +177,7 @@ void @ModelName@_ewsb_solver<Two_scale>::set_best_ewsb_solution(@ModelName@_mass
set_ewsb_solution(model, best_solver->get());
}

int @ModelName@_ewsb_solver<Two_scale>::solve_iteratively_at(@ModelName@_mass_eigenstates& model_to_solve, int l)
int CLASSNAME::solve_iteratively_at(@ModelName@_mass_eigenstates& model_to_solve, int l)
{
// temporarily set `ewsb_loop_order' to `loop_order' and do
// iteration
Expand All @@ -185,15 +187,15 @@ int @ModelName@_ewsb_solver<Two_scale>::solve_iteratively_at(@ModelName@_mass_ei
return solve_iteratively(model_to_solve);
}

int @ModelName@_ewsb_solver<Two_scale>::solve(@ModelName@_mass_eigenstates& model_to_solve)
int CLASSNAME::solve(@ModelName@_mass_eigenstates& model_to_solve)
{
if (loop_order == 0) {
return solve_tree_level(model_to_solve);
}
return solve_iteratively_at(model_to_solve, loop_order);
}

int @ModelName@_ewsb_solver<Two_scale>::solve_tree_level(@ModelName@_mass_eigenstates& model)
int CLASSNAME::solve_tree_level(@ModelName@_mass_eigenstates& model)
{
int error = 0;

Expand All @@ -202,7 +204,7 @@ int @ModelName@_ewsb_solver<Two_scale>::solve_tree_level(@ModelName@_mass_eigens
return error;
}

@ModelName@_ewsb_solver<Two_scale>::EWSB_vector_t @ModelName@_ewsb_solver<Two_scale>::initial_guess(const @ModelName@_mass_eigenstates& model) const
CLASSNAME::EWSB_vector_t CLASSNAME::initial_guess(const @ModelName@_mass_eigenstates& model) const
{
EWSB_vector_t x_init(EWSB_vector_t::Zero());

Expand All @@ -211,7 +213,7 @@ int @ModelName@_ewsb_solver<Two_scale>::solve_tree_level(@ModelName@_mass_eigens
return x_init;
}

@ModelName@_ewsb_solver<Two_scale>::EWSB_vector_t @ModelName@_ewsb_solver<Two_scale>::tadpole_equations(const @ModelName@_mass_eigenstates& model) const
CLASSNAME::EWSB_vector_t CLASSNAME::tadpole_equations(const @ModelName@_mass_eigenstates& model) const
{
return model.tadpole_equations();
}
Expand All @@ -226,7 +228,7 @@ int @ModelName@_ewsb_solver<Two_scale>::solve_tree_level(@ModelName@_mass_eigens
*
* @return new set of EWSB output parameters
*/
@ModelName@_ewsb_solver<Two_scale>::EWSB_vector_t @ModelName@_ewsb_solver<Two_scale>::ewsb_step(const @ModelName@_mass_eigenstates& model) const
CLASSNAME::EWSB_vector_t CLASSNAME::ewsb_step(const @ModelName@_mass_eigenstates& model) const
{
std::array<double, number_of_ewsb_equations> tadpole{};
EWSB_vector_t ewsb_parameters(EWSB_vector_t::Zero());
Expand Down

0 comments on commit 69bb55b

Please sign in to comment.