Calculate semi-analytic solutions earlier

in order to use them in solving the EWSB equations
FlexibleSUSY · Jan 20, 2017 · a49cf32 · a49cf32
1 parent 566f944
commit a49cf32
Showing 1 changed file with 22 additions and 18 deletions.
diff --git a/meta/FlexibleSUSY.m b/meta/FlexibleSUSY.m
@@ -2711,6 +2711,27 @@ corresponding tadpole is real or imaginary (only in models with CP
            FlexibleSUSY`HighScaleFirstGuess = FlexibleSUSY`HighScaleFirstGuess /.
                lesHouchesInputParameterReplacementRules;
 
+           If[HaveBVPSolver[FlexibleSUSY`SemiAnalyticSolver],
+              SemiAnalytic`SetSemiAnalyticParameters[BetaFunction`GetName[#]& /@ susyBreakingBetaFunctions];
+
+              (* @note currently require all semi-analytic parameters to be set at same scale *)
+              If[!SemiAnalytic`CheckSemiAnalyticBoundaryConditions[{FlexibleSUSY`LowScaleInput,
+                                                                    FlexibleSUSY`SUSYScaleInput,
+                                                                    FlexibleSUSY`HighScaleInput}],
+                 Print["Error: the requested boundary conditions are not"];
+                 Print["   supported by the semi-analytic solver."];
+                 Print["   Please modify the boundary conditions or disable"];
+                 Print["   the semi-analytic solver."];
+                 Quit[1];
+                ];
+
+              semiAnalyticBCs = SemiAnalytic`SelectSemiAnalyticConstraint[{FlexibleSUSY`LowScaleInput,
+                                                                           FlexibleSUSY`SUSYScaleInput,
+                                                                           FlexibleSUSY`HighScaleInput}];
+
+              semiAnalyticSolns = SemiAnalytic`GetSemiAnalyticSolutions[semiAnalyticBCs];
+             ];
+
            PrintHeadline["Creating model parameter classes"];
            Print["Creating class for susy parameters ..."];
            WriteRGEClass[susyBetaFunctions, anomDim,
@@ -3074,26 +3095,9 @@ corresponding tadpole is real or imaginary (only in models with CP
            If[HaveBVPSolver[FlexibleSUSY`SemiAnalyticSolver],
               PrintHeadline["Creating semi-analytic solver"];
 
-              SemiAnalytic`SetSemiAnalyticParameters[BetaFunction`GetName[#]& /@ susyBreakingBetaFunctions];
-
-              (* @note currently require all semi-analytic parameters to be set at same scale *)
-              If[!SemiAnalytic`CheckSemiAnalyticBoundaryConditions[{FlexibleSUSY`LowScaleInput,
-                                                                    FlexibleSUSY`SUSYScaleInput,
-                                                                    FlexibleSUSY`HighScaleInput}],
-                 Print["Error: the requested boundary conditions are not"];
-                 Print["   supported by the semi-analytic solver."];
-                 Print["   Please modify the boundary conditions or disable"];
-                 Print["   the semi-analytic solver."];
-                 Quit[1];
-                ];
-
-              semiAnalyticBCs = SemiAnalytic`SelectSemiAnalyticConstraint[{FlexibleSUSY`LowScaleInput,
-                                                                           FlexibleSUSY`SUSYScaleInput,
-                                                                           FlexibleSUSY`HighScaleInput}];
-
-              semiAnalyticSolns = SemiAnalytic`GetSemiAnalyticSolutions[semiAnalyticBCs];
               Parameters`AddExtraParameters[SemiAnalytic`CreateBoundaryValueParameters[semiAnalyticSolns]];
               Parameters`AddExtraParameters[SemiAnalytic`CreateCoefficientParameters[semiAnalyticSolns]];
+
               semiAnalyticSolnsOutputFile = FileNameJoin[{FSOutputDir,
                                                           FlexibleSUSY`FSModelName <> "_semi_analytic_solutions.m"}];
               Print["Writing semi-analytic solutions to ", semiAnalyticSolnsOutputFile];