we don't need the mutex definition in the meta code

FlexibleSUSY · Apr 12, 2014 · fcf69f1 · fcf69f1
1 parent 2de2dba
commit fcf69f1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/meta/FlexibleSUSY.m b/meta/FlexibleSUSY.m
@@ -465,8 +465,7 @@
             copyDRbarMassesToPoleMasses = "",
             higgsToEWSBEqAssociation,
             twoLoopHiggsHeaders = "",
-            enablePoleMassThreads = True,
-            mutexDefinition = ""
+            enablePoleMassThreads = True
            },
            For[k = 1, k <= Length[massMatrices], k++,
                massGetters          = massGetters <> TreeMasses`CreateMassGetter[massMatrices[[k]]];
@@ -496,7 +495,6 @@
               FlexibleSUSY`UseHiggs2LoopNMSSM === True,
               calculateTwoLoopTadpoles  = SelfEnergies`FillArrayWithTwoLoopTadpoles[SARAH`HiggsBoson];
               {thirdGenerationHelperPrototypes, thirdGenerationHelperFunctions} = TreeMasses`CreateThirdGenerationHelpers[];
-              mutexDefinition = "static std::mutex mtx_fortran;\n";
              ];
            If[SARAH`UseHiggs2LoopMSSM === True,
               {twoLoopTadpolePrototypes, twoLoopTadpoleFunctions} = SelfEnergies`CreateTwoLoopTadpolesMSSM[SARAH`HiggsBoson];
@@ -591,7 +589,6 @@
                             "@saveSoftHiggsMasses@"          -> IndentText[saveSoftHiggsMasses],
                             "@restoreSoftHiggsMasses@"       -> IndentText[restoreSoftHiggsMasses],
                             "@solveTreeLevelEWSBviaSoftHiggsMasses@" -> IndentText[WrapLines[solveTreeLevelEWSBviaSoftHiggsMasses]],
-                            "@mutexDefinition@"              -> mutexDefinition,
                             Sequence @@ GeneralReplacementRules[]
                           } ];
           ];

diff --git a/templates/two_scale_model.hpp.in b/templates/two_scale_model.hpp.in
@@ -121,6 +121,9 @@ private:
    @ModelName@_physical physical;
    Problems<@ModelName@_info::NUMBER_OF_PARTICLES> problems;
    std::exception_ptr thread_exception;
+#ifdef ENABLE_THREADS
+   static std::recursive_mutex mtx_fortran; /// locks fortran functions
+#endif
 
    int solve_ewsb_iteratively();
    int solve_ewsb_iteratively(unsigned);
@@ -142,9 +145,6 @@ private:
 @physicalMassesDef@
 @mixingMatricesDef@
 @phasesDefinition@
-#ifdef ENABLE_THREADS
-@mutexDefinition@
-#endif
 };
 
 std::ostream& operator<<(std::ostream&, const @ModelName@<Two_scale>&);