adding missing function needed for new convergence tester

FlexibleSUSY · Nov 23, 2016 · 027565d · 027565d
1 parent 3412562
commit 027565d
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 3 deletions.
diff --git a/models/SoftsusyMSSM/SoftsusyMSSM_two_scale.hpp b/models/SoftsusyMSSM/SoftsusyMSSM_two_scale.hpp
@@ -39,6 +39,7 @@ class SoftsusyMSSM<Two_scale>: public Two_scale_model, public softsusy::MssmSoft
    virtual void print(std::ostream& s) const { s << static_cast<softsusy::MssmSoftsusy>(*this); }
    virtual void set_precision(double p) { precision = p; }
 
+   void calculate_DRbar_masses() { calcDrBarPars(); }
    void set_scale(double scale) { setMu(scale); }
    double get_scale() const { return displayMu(); }
    SoftsusyMSSM calc_beta() const { return beta2(); }

diff --git a/models/SoftsusyMSSM/SoftsusyMSSM_two_scale_convergence_tester.cpp b/models/SoftsusyMSSM/SoftsusyMSSM_two_scale_convergence_tester.cpp
@@ -31,7 +31,7 @@ SoftsusyMSSM_convergence_tester::~SoftsusyMSSM_convergence_tester()
 
 double SoftsusyMSSM_convergence_tester::max_rel_diff() const
 {
-   return sumTol(get_model(), get_last_iteration_model());
+   return sumTol(get_current_iteration_model(), get_last_iteration_model());
 }
 
 double SoftsusyMSSM_convergence_tester::sumTol(const SoftsusyMSSM<Two_scale>& in, const SoftsusyMSSM<Two_scale>& out) const

diff --git a/models/SoftsusyNMSSM/SoftsusyNMSSM_two_scale.hpp b/models/SoftsusyNMSSM/SoftsusyNMSSM_two_scale.hpp
@@ -39,6 +39,7 @@ class SoftsusyNMSSM<Two_scale>: public Two_scale_model, public softsusy::NmssmSo
    virtual void print(std::ostream& s) const { s << static_cast<softsusy::NmssmSoftsusy>(*this); }
    virtual void set_precision(double p) { precision = p; }
 
+   void calculate_DRbar_masses() { calcDrBarPars(); }
    void set_scale(double scale) { setMu(scale); }
    double get_scale() const { return displayMu(); }
    SoftsusyNMSSM calc_beta() const { return beta2(); }

diff --git a/models/SoftsusyNMSSM/SoftsusyNMSSM_two_scale_convergence_tester.cpp b/models/SoftsusyNMSSM/SoftsusyNMSSM_two_scale_convergence_tester.cpp
@@ -31,7 +31,7 @@ SoftsusyNMSSM_convergence_tester::~SoftsusyNMSSM_convergence_tester()
 
 double SoftsusyNMSSM_convergence_tester::max_rel_diff() const
 {
-   return sumTol(get_model(), get_last_iteration_model());
+   return sumTol(get_current_iteration_model(), get_last_iteration_model());
 }
 
 double SoftsusyNMSSM_convergence_tester::sumTol(const SoftsusyNMSSM<Two_scale>& in, const SoftsusyNMSSM<Two_scale>& out) const

diff --git a/models/sm/sm_two_scale.hpp b/models/sm/sm_two_scale.hpp
@@ -60,6 +60,8 @@ class StandardModel<Two_scale>: public Two_scale_model, protected softsusy::RGE
    /// sets object to be equal to another
    const StandardModel & operator=(const StandardModel<Two_scale>& s);
 
+   void calculate_DRbar_masses() {}
+
    /// Sets Yukawa matrix element
    void setYukawaElement(yukawa, int, int, double);
    /// Sets whole Yukawa matrix

diff --git a/models/smcw/smcw_two_scale.hpp b/models/smcw/smcw_two_scale.hpp
@@ -54,6 +54,8 @@ class StandardModelCW<Two_scale>: public StandardModel<Two_scale> {
    /// sets object to be equal to another
    const StandardModelCW<Two_scale> & operator=(const StandardModelCW<Two_scale>& s);
 
+   void calculate_DRbar_masses() {}
+
    /// Set a single gauge coupling
    virtual void setGaugeCoupling(int, double);
    /// Set all gauge couplings

diff --git a/models/smcw/smcw_two_scale_convergence_tester.cpp b/models/smcw/smcw_two_scale_convergence_tester.cpp
@@ -31,7 +31,7 @@ StandardModelCW_convergence_tester::~StandardModelCW_convergence_tester()
 
 double StandardModelCW_convergence_tester::max_rel_diff() const
 {
-   const StandardModelCW<Two_scale>& model = get_model();
+   const StandardModelCW<Two_scale>& model = get_current_iteration_model();
    const StandardModelCW<Two_scale>& last_iteration_model = get_last_iteration_model();
 
    const double dg4 = std::fabs(model.displayGaugeCoupling(4)