test new FPI solver

FlexibleSUSY · Dec 20, 2014 · afe80b7 · afe80b7
1 parent 001f12a
commit afe80b7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/test/module.mk b/test/module.mk
@@ -155,7 +155,7 @@ TEST_SH += \
 		$(DIR)/test_lowMSSM.sh
 endif
 
-ifeq ($(shell $(FSCONFIG) --with-CMSSMGSLHybrid --with-CMSSMGSLHybridS --with-CMSSMGSLBroyden --with-CMSSMGSLNewton --with-CMSSMFPIRelative --with-CMSSMFPIAbsolute),yes yes yes yes yes yes)
+ifeq ($(shell $(FSCONFIG) --with-CMSSMGSLHybrid --with-CMSSMGSLHybridS --with-CMSSMGSLBroyden --with-CMSSMGSLNewton --with-CMSSMFPIRelative --with-CMSSMFPIAbsolute --with-CMSSMFPITadpole),yes yes yes yes yes yes yes)
 TEST_SRC += \
 		$(DIR)/test_compare_ewsb_solvers.cpp
 endif

diff --git a/test/test_compare_ewsb_solvers.cpp b/test/test_compare_ewsb_solvers.cpp
@@ -98,6 +98,7 @@ BOOST_AUTO_TEST_CASE( test_tanbeta_scan )
       {"GSLNewton"  , "./models/CMSSMGSLNewton/run_CMSSMGSLNewton.x"    , 0., 0},
       {"FPIRelative", "./models/CMSSMFPIRelative/run_CMSSMFPIRelative.x", 0., 0},
       {"FPIAbsolute", "./models/CMSSMFPIAbsolute/run_CMSSMFPIAbsolute.x", 0., 0},
+      {"FPITadpole" , "./models/CMSSMFPITadpole/run_CMSSMFPITadpole.x"  , 0., 0},
    };
 
    const unsigned number_of_solvers = sizeof(solvers)/sizeof(*solvers);

diff --git a/test/test_ewsb_solver.cpp b/test/test_ewsb_solver.cpp
@@ -185,7 +185,8 @@ BOOST_AUTO_TEST_CASE( test_perturbation )
       new Minimizer<dimension>(Perturbation::chi2, NULL, max_iterations, precision, gsl_multimin_fminimizer_nmsimplex2),
       new Minimizer<dimension>(Perturbation::chi2, NULL, max_iterations, precision, gsl_multimin_fminimizer_nmsimplex2rand),
       new Fixed_point_iterator<dimension,fixed_point_iterator::Convergence_tester_relative>(Perturbation::update, NULL, max_iterations, precision),
-      new Fixed_point_iterator<dimension,fixed_point_iterator::Convergence_tester_absolute>(Perturbation::update, NULL, max_iterations, precision)
+      new Fixed_point_iterator<dimension,fixed_point_iterator::Convergence_tester_absolute>(Perturbation::update, NULL, max_iterations, precision),
+      new Fixed_point_iterator<dimension,fixed_point_iterator::Convergence_tester_tadpole>(Perturbation::update, NULL, max_iterations, fixed_point_iterator::Convergence_tester_tadpole(precision, Perturbation::func, NULL))
    };
 
    for (int i = 0; i < sizeof(solvers)/sizeof(solvers[0]); i++) {