Only fill EWSB solution vector when a tree-level solution is found

FlexibleSUSY · Feb 2, 2017 · f787c41 · f787c41
1 parent 4b3d746
commit f787c41
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/meta/EWSB.m b/meta/EWSB.m
@@ -804,7 +804,6 @@
               (* save old parameters *)
               For[i = 1, i <= Length[reducedSolution], i++,
                   par  = reducedSolution[[i,1]];
-                  expr = reducedSolution[[i,2]];
                   type = CConversion`CreateCType[CConversion`GetScalarElementType[Parameters`GetType[par]]];
                   parStr = CConversion`ToValidCSymbolString[par];
                   result = result <> type <> " " <> parStr <> ";\n";

diff --git a/meta/FlexibleSUSY.m b/meta/FlexibleSUSY.m
@@ -1163,7 +1163,9 @@ corresponding tadpole is real or imaginary (only in models with CP
            setTreeLevelSolution         = EWSB`SetTreeLevelSolution[ewsbSolution, ewsbSubstitutions];
            EWSBSolvers                  = EWSB`CreateEWSBRootFinders[FlexibleSUSY`FSEWSBSolvers];
            setEWSBSolution              = EWSB`SetEWSBSolution[parametersFixedByEWSB, freePhases, "solution", "model."];
-           fillArrayWithEWSBParameters  = EWSB`FillArrayWithParameters["ewsb_parameters", parametersFixedByEWSB];
+           If[ewsbSolution =!= {},
+              fillArrayWithEWSBParameters  = EWSB`FillArrayWithParameters["ewsb_parameters", parametersFixedByEWSB];
+             ];
            solveEwsbWithTadpoles        = EWSB`CreateEwsbSolverWithTadpoles[ewsbSolution];
            getEWSBParametersFromVector  = EWSB`GetEWSBParametersFromVector[parametersFixedByEWSB, freePhases, "ewsb_pars"];
            setEWSBParametersFromLocalCopies = EWSB`SetEWSBParametersFromLocalCopies[parametersFixedByEWSB, "model."];
@@ -1225,7 +1227,9 @@ corresponding tadpole is real or imaginary (only in models with CP
            solveEwsbWithTadpoles        = SemiAnalytic`ReplacePreprocessorMacros[solveEwsbWithTadpoles, solutions];
            EWSBSolvers                  = EWSB`CreateEWSBRootFinders[FlexibleSUSY`FSEWSBSolvers];
            setEWSBSolution              = EWSB`SetEWSBSolution[parametersFixedByEWSB, freePhases, "solution", "model."];
-           fillArrayWithEWSBParameters  = EWSB`FillArrayWithParameters["ewsb_parameters", parametersFixedByEWSB];
+           If[ewsbSolution =!= {},
+              fillArrayWithEWSBParameters  = EWSB`FillArrayWithParameters["ewsb_parameters", parametersFixedByEWSB];
+             ];
            getEWSBParametersFromVector  = EWSB`GetEWSBParametersFromVector[parametersFixedByEWSB, freePhases, "ewsb_pars"];
            setEWSBParametersFromLocalCopies = EWSB`SetEWSBParametersFromLocalCopies[parametersFixedByEWSB, "model."];
            setModelParametersFromEWSB   = EWSB`SetModelParametersFromEWSB[parametersFixedByEWSB, ewsbSubstitutions, "model."];