Merge branch 'feature-2.0' into feature-2.0-ewsb-substitutions

Conflicts: meta/FlexibleSUSY.m
FlexibleSUSY · Dec 29, 2016 · 9af9c48 · 9af9c48
2 parents 406cda4 + e34fe43
commit 9af9c48
Show file tree

Hide file tree

Showing 155 changed files with 4,249 additions and 3,301 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -15,6 +15,8 @@ examples/lattice_numerical_fmssm_fmssmn.cpp export-ignore
 examples/switch_MSSM.cpp                    export-ignore
 
 model_files/BetaSM              export-ignore
+model_files/cCMSSM              export-ignore
+model_files/complexMSSM         export-ignore
 model_files/CMSSMFPIAbsolute    export-ignore
 model_files/CMSSMFPIRelative    export-ignore
 model_files/CMSSMFPITadpole     export-ignore
@@ -23,21 +25,29 @@ model_files/CMSSMGSLHybrid      export-ignore
 model_files/CMSSMGSLHybridS     export-ignore
 model_files/CMSSMGSLNewton      export-ignore
 model_files/CMSSMLowPrecision   export-ignore
+model_files/CMSSMMatchedAtMTDRbar export-ignore
+model_files/CMSSMMatchedAtMTPole  export-ignore
 model_files/CMSSMMediumPrecision export-ignore
 model_files/CMSSMHighPrecision  export-ignore
 model_files/CMSSMMassWInput     export-ignore
 model_files/CMSSMConvergenceTester export-ignore
+model_files/cSM                 export-ignore
 model_files/BLSMlightZp         export-ignore
 model_files/InertMSSM           export-ignore
 model_files/LHInputMSSM         export-ignore
 model_files/MDM                 export-ignore
+model_files/MRSSM2              export-ignore
+model_files/MSSMNoEWVEVs        export-ignore
+model_files/MSSMNoFVSLHA2       export-ignore
 model_files/minMSSM             export-ignore
 model_files/NoInputParameters   export-ignore
 model_files/NoYukawaMSSM        export-ignore
 model_files/NSM                 export-ignore
 model_files/rootMSSM            export-ignore
 model_files/YukawaCMSSM         export-ignore
 model_files/UnbrokenMSSM        export-ignore
+model_files/SMEWSBAtMZ          export-ignore
+model_files/SMHighScale         export-ignore
 model_files/SMHighPrecision     export-ignore
 model_files/SMnoGUT             export-ignore
 model_files/SMNoRGEs            export-ignore
@@ -50,16 +60,21 @@ models/fmssm                    export-ignore
 models/fmssmn                   export-ignore
 models/sm                       export-ignore
 models/smcw                     export-ignore
+models/SoftsusyMSSM             export-ignore
+models/SoftsusyNMSSM            export-ignore
+models/SoftsusyFlavourMSSM      export-ignore
 
 release                         export-ignore
 
 sarah/B-L-SM-lightZp            export-ignore
 sarah/InertMSSM                 export-ignore
 sarah/MDM                       export-ignore
+sarah/MSSMNoEWVEVs              export-ignore
 sarah/NoYukawaMSSM              export-ignore
 sarah/NSM                       export-ignore
 sarah/UnbrokenMSSM              export-ignore
 sarah/SMnoGUT                   export-ignore
+sarah/SM2                       export-ignore
 sarah/TensorCoupling            export-ignore
 
 src/SM.cpp                           export-ignore

diff --git a/.gitignore b/.gitignore
@@ -61,6 +61,7 @@ models/**/
 !models/smcw/
 !models/SoftsusyMSSM/
 !models/SoftsusyNMSSM/
+!models/SoftsusyFlavourMSSM/
 
 model_files/*/LesHouches.out.*
 

diff --git a/ChangeLog b/ChangeLog
@@ -25,6 +25,12 @@ FlexibleSUSY 2.0.0 [not released yet]
    given parameter point.  The third one formats the output according
    to the SLHA standard.
 
+ * Feature: 3-loop beta functions (if available) are calculated in
+   parallel if multi-threading is enabled.  This leads to a ~25% speed
+   improvement in the MSSM when 3-loop RG running is used.
+
+ * Feature: Support for SLHA-2 input block IMEXTPAR.
+
  * Change: The interface for adding constraints and matching
    conditions to the Two_scale_solver class has been simplified.
    Constrains and matching conditions are now added using the add()
@@ -55,6 +61,22 @@ FlexibleSUSY 2.0.0 [not released yet]
       { <model> -> { model parameters ... },
         StandardModel -> { ... } }
 
+ * Change: In multi-threading mode pole masses are calculated using a
+   thread pool instead of spawning threads manually.  This avoids over
+   subscription on machines with very few CPU cores.
+
+ * Change: The performance of FlexibleEFTHiggs has been improved by
+   around 20% by using a faster implementation of the B1 loop function
+   in the limit of vanishing momentum and non-zero masses.
+
+ * Change (commit b5cad9e): Automatically chose the maximum number of
+   EWSB and pole mass iterations based on the user-defined precision
+   goal.  This change leads to a performance improvement for some
+   parameter points where the EWSB equations cannot be fulfilled.
+
+ * Change: The legacy module and most SOFTSUSY components have been
+   removed.
+
  * Bugfix (commits be8f35b, 3432967): Improve the stability of the
    algorithm which solves the EWSB conditions.  The more stable
    algorithm leads to a faster convergece of the overall iteration in
@@ -76,19 +98,20 @@ FlexibleSUSY-1.7.2 [not released yet]
    very large SUSY scales.  In such a case FlexibleSUSY[23] could be
    set to 0 to suppress the calculation of the non-SM pole masses.
 
+ * Feature (commit 998f11e): Slightly improved speed of the RG
+   running.
+
  * Change (commit 189f508): Speed-up the calculation of the 2L Higgs
    mass corrections in the MSSM and NMSSM, if multi-threading is used,
    by locking the mutex only for the O(at*at) corrections.
 
  * Change: The limits sin(2*theta) = 0 and m_stop1 = m_stop2 have been
    implemented for the 2L O(at*as) Higgs pole mass corrections in the
-   MSSM.
-
- * Bugfix (commit c35dcb2): Fix linking problem of LibraryLink on Mac.
+   MSSM to avoid numeric instabilities.
 
  * Bugfix (commit 20f169f): Re-calculate W pole mass in
    FlexibleEFTHiggs.  Before this commit the electroweak gauge
-   couplings in FlexibleEFTHiggs are be wrong in scenarios with very
+   couplings in FlexibleEFTHiggs are wrong in scenarios with very
    small alpha_em(MZ) (< 1/1000) and/or a small Z pole mass (< 10
    GeV).
 
@@ -97,8 +120,8 @@ FlexibleSUSY-1.7.2 [not released yet]
    the running BSM masses (at the SUSY scale) have been used as
    convergence criterion.  However, they tend to converge very fast,
    compared to the running SM masses at the electroweak scale.  For a
-   more reliable convergence criterion, both the running BSM and SM
-   masses have to be used.
+   more reliable convergence criterion, now both the running BSM and
+   SM masses are used.
 
  * Bugfix (commits 5e1b6b3, cc5bfae): Correction of the 2-loop and
    3-loop QCD corrections to the top pole mass in the Standard Model
@@ -108,14 +131,29 @@ FlexibleSUSY-1.7.2 [not released yet]
    top pole mass.  Before these commits, FlexibleSUSY used the
    expressions from theses references, but wrote result in terms of
    Log[Q^2/mt^2], where mt is the MS-bar mass, while not accounting
-   for the difference between Mt and mt in the logarithms.
+   for the difference between Mt and mt in the logarithms.  This
+   bugfix affects the Higgs pole mass at the 3-loop level.
 
  * Bugfix (commit cecff4b): Flag scalar or vector boson gauge singlet
    tachyons.
 
  * Bugfix (commit 4a3fb5b): Input tan(beta) at the SUSY scale, instead
-   of the matching scale.  This matters when the (unphysical) matching
-   is varied through FlexibleSUSY[19].
+   of at the matching scale in the FlexibleEFTHiggs model files.  This
+   difference matters when the (unphysical) matching scale is varied
+   through FlexibleSUSY[19].
+
+ * Bugfix (commit c35dcb2): Fixed linking problem of the LibraryLink
+   on Mac.
+
+ * Bugfix (commits a643be5, cc9ebf1): Avoid function call ambiguities
+   when multiple LibraryLink libraries are loaded into Mathematica at
+   the same time.
+
+ * Bugfix (commit 1f8e135): Correcting FS<model>Set[] function for
+   models with matrix-valued parameters.
+
+ * Bugfix (commit 4097708): The generated LibraryLink files are now
+   added to the model tarball created by `make pack-<model>-src'.
 
 FlexibleSUSY-1.7.1 [October, 15 2016]
 

diff --git a/addons/GM2Calc/module.mk b/addons/GM2Calc/module.mk
@@ -110,7 +110,7 @@ $(LIBGM2Calc_DEP) $(EXEGM2Calc_DEP) $(LIBGM2Calc_OBJ) $(EXEGM2Calc_OBJ): CPPFLAG
 $(LIBGM2Calc): $(LIBGM2Calc_OBJ)
 		$(MODULE_MAKE_LIB_CMD) $@ $^
 
-$(DIR)/%.x: $(DIR)/%.o $(LIBGM2Calc) $(LIBFLEXI) $(LIBLEGACY)
+$(DIR)/%.x: $(DIR)/%.o $(LIBGM2Calc) $(LIBFLEXI)
 		$(CXX) -o $@ $(call abspathx,$^)
 
 ALLDEP += $(LIBGM2Calc_DEP) $(EXEGM2Calc_DEP)

diff --git a/addons/test_call_tsil/module.mk b/addons/test_call_tsil/module.mk
@@ -103,7 +103,7 @@ endif
 $(LIBtest_call_tsil): $(LIBtest_call_tsil_OBJ)
 		$(MODULE_MAKE_LIB_CMD) $@ $^
 
-$(EXEtest_call_tsil_EXE): $(EXEtest_call_tsil_OBJ) $(LIBtest_call_tsil) $(LIBFLEXI) $(LIBLEGACY) $(filter-out -%,$(LOOPFUNCLIBS))
+$(EXEtest_call_tsil_EXE): $(EXEtest_call_tsil_OBJ) $(LIBtest_call_tsil) $(LIBFLEXI) $(filter-out -%,$(LOOPFUNCLIBS))
 		$(CXX) -o $@ $(call abspathx,$^) $(filter -%,$(LOOPFUNCLIBS)) $(GSLLIBS) $(BOOSTTHREADLIBS) $(THREADLIBS) $(LAPACKLIBS) $(BLASLIBS) $(TSILLIBS) $(FLIBS)
 
 ALLDEP += $(LIBtest_call_tsil_DEP) $(EXEtest_call_tsil_DEP)

diff --git a/config/Makefile.customized-betas.in b/config/Makefile.customized-betas.in
@@ -15,24 +15,21 @@ MODEL           := CMSSM
 MODELDIR        := $(ABSBASEDIR)/models/$(MODEL)
 CONFIGDIR       := $(ABSBASEDIR)/config
 FLEXIDIR        := $(ABSBASEDIR)/src
-LEGACYDIR       := $(ABSBASEDIR)/legacy
 FFLITEDIR       := $(ABSBASEDIR)/fflite
 SLHAEADIR       := $(ABSBASEDIR)/slhaea
 
 INCMODEL        := -I$(MODELDIR)
 INCCONFIG       := -I$(CONFIGDIR)
 INCFLEXI        := -I$(FLEXIDIR)
-INCLEGACY       := -I$(LEGACYDIR)
 INCFFLITE       := -I$(FFLITEDIR)
 INCSLHAEA       := -I$(SLHAEADIR)
 LIBMODEL        := $(MODELDIR)/lib$(MODEL)$(MODULE_LIBEXT)
 LIBFLEXI        := $(FLEXIDIR)/libflexisusy$(MODULE_LIBEXT)
-LIBLEGACY       := $(LEGACYDIR)/liblegacy$(MODULE_LIBEXT)
 LIBFFLITE       := $(FFLITEDIR)/libfflite$(MODULE_LIBEXT)
 
 # Variables for compilation
 CXX             := @CXX@
-CPPFLAGS        := @CPPFLAGS@ -I. $(INCCONFIG) $(INCFLEXI) $(INCLEGACY) \
+CPPFLAGS        := @CPPFLAGS@ -I. $(INCCONFIG) $(INCFLEXI) \
                    $(INCSLHAEA) $(INCMODEL)
 CXXFLAGS        := @CXXFLAGS@
 CXX_DEP_GEN     := $(CXX)
@@ -98,7 +95,7 @@ ifneq (,$(findstring yes,$(ENABLE_LOOPTOOLS)$(ENABLE_FFLITE)))
 $(CUSTOMBETAS_DEP) $(CUSTOMBETAS_OBJ): CPPFLAGS += $(LOOPFUNCFLAGS)
 endif
 
-$(CUSTOMBETAS_EXE): $(CUSTOMBETAS_OBJ) $(LIBMODEL) $(LIBFLEXI) $(LIBLEGACY) $(filter-out -%,$(LOOPFUNCLIBS))
+$(CUSTOMBETAS_EXE): $(CUSTOMBETAS_OBJ) $(LIBMODEL) $(LIBFLEXI) $(filter-out -%,$(LOOPFUNCLIBS))
 		$(CXX) -o $@ $(call abspathx,$^) $(filter -%,$(LOOPFUNCLIBS)) $(GSLLIBS) $(BOOSTTHREADLIBS) $(THREADLIBS) $(LAPACKLIBS) $(BLASLIBS) $(FLIBS) $(SQLITELIBS)
 
 ifneq ($(MAKECMDGOALS),clean)
@@ -130,10 +127,8 @@ showbuild:
 	@echo "MODEL              = $(MODEL)"
 	@echo "MODELDIR           = $(MODELDIR)"
 	@echo "FLEXIDIR           = $(FLEXIDIR)"
-	@echo "LEGACYDIR          = $(LEGACYDIR)"
 	@echo "LIBMODEL           = $(LIBMODEL)"
 	@echo "LIBFLEXI           = $(LIBFLEXI)"
-	@echo "LIBLEGACY          = $(LIBLEGACY)"
 	@echo ""
 	@echo "# compilation information"
 	@echo "CXX                = $(CXX)"

diff --git a/config/Makefile.in b/config/Makefile.in
@@ -34,7 +34,7 @@ ENABLE_VERBOSE        := @ENABLE_VERBOSE@
 # Makefile modules
 MODELS             := @MODELS@
 ADDONS             := @ADDONS@
-MODULES            := config src fflite legacy slhaea doc
+MODULES            := config src fflite slhaea doc
 # BEGIN: NOT EXPORTED ##########################################
 MODULES            += meta templates
 # END:   NOT EXPORTED ##########################################

diff --git a/config/Makefile.standalone.in b/config/Makefile.standalone.in
@@ -15,22 +15,19 @@ MODEL           := MSSM
 MODELDIR        := $(ABSBASEDIR)/models/$(MODEL)
 CONFIGDIR       := $(ABSBASEDIR)/config
 FLEXIDIR        := $(ABSBASEDIR)/src
-LEGACYDIR       := $(ABSBASEDIR)/legacy
 FFLITEDIR       := $(ABSBASEDIR)/fflite
 
 INCMODEL        := -I$(MODELDIR)
 INCCONFIG       := -I$(CONFIGDIR)
 INCFLEXI        := -I$(FLEXIDIR)
-INCLEGACY       := -I$(LEGACYDIR)
 INCFFLITE       := -I$(FFLITEDIR)
 LIBMODEL        := $(MODELDIR)/lib$(MODEL)$(MODULE_LIBEXT)
 LIBFLEXI        := $(FLEXIDIR)/libflexisusy$(MODULE_LIBEXT)
-LIBLEGACY       := $(LEGACYDIR)/liblegacy$(MODULE_LIBEXT)
 LIBFFLITE       := $(FFLITEDIR)/libfflite$(MODULE_LIBEXT)
 
 # Variables for compilation
 CXX             := @CXX@
-CPPFLAGS        := @CPPFLAGS@ -I. $(INCCONFIG) $(INCFLEXI) $(INCLEGACY) \
+CPPFLAGS        := @CPPFLAGS@ -I. $(INCCONFIG) $(INCFLEXI) \
                    $(INCMODEL)
 CXXFLAGS        := @CXXFLAGS@
 CXX_DEP_GEN     := $(CXX)
@@ -93,7 +90,7 @@ ifneq (,$(findstring yes,$(ENABLE_LOOPTOOLS)$(ENABLE_FFLITE)))
 $(STANDALONE_DEP) $(STANDALONE_OBJ): CPPFLAGS += $(LOOPFUNCFLAGS)
 endif
 
-$(STANDALONE_EXE): $(STANDALONE_OBJ) $(LIBMODEL) $(LIBFLEXI) $(LIBLEGACY) $(filter-out -%,$(LOOPFUNCLIBS))
+$(STANDALONE_EXE): $(STANDALONE_OBJ) $(LIBMODEL) $(LIBFLEXI) $(filter-out -%,$(LOOPFUNCLIBS))
 		$(CXX) -o $@ $(call abspathx,$^) $(filter -%,$(LOOPFUNCLIBS)) $(GSLLIBS) $(BOOSTTHREADLIBS) $(THREADLIBS) $(LAPACKLIBS) $(BLASLIBS) $(FLIBS) $(SQLITELIBS)
 
 ifneq ($(MAKECMDGOALS),clean)
@@ -125,10 +122,8 @@ showbuild:
 	@echo "MODEL              = $(MODEL)"
 	@echo "MODELDIR           = $(MODELDIR)"
 	@echo "FLEXIDIR           = $(FLEXIDIR)"
-	@echo "LEGACYDIR          = $(LEGACYDIR)"
 	@echo "LIBMODEL           = $(LIBMODEL)"
 	@echo "LIBFLEXI           = $(LIBFLEXI)"
-	@echo "LIBLEGACY          = $(LIBLEGACY)"
 	@echo ""
 	@echo "# compilation information"
 	@echo "CXX                = $(CXX)"

diff --git a/config/Makefile.tower.in b/config/Makefile.tower.in
@@ -17,26 +17,23 @@ MODEL1DIR       := $(ABSBASEDIR)/models/$(MODEL1)
 MODEL2DIR       := $(ABSBASEDIR)/models/$(MODEL2)
 CONFIGDIR       := $(ABSBASEDIR)/config
 FLEXIDIR        := $(ABSBASEDIR)/src
-LEGACYDIR       := $(ABSBASEDIR)/legacy
 FFLITEDIR       := $(ABSBASEDIR)/fflite
 SLHAEADIR       := $(ABSBASEDIR)/slhaea
 
 INCMODEL1       := -I$(MODEL1DIR)
 INCMODEL2       := -I$(MODEL2DIR)
 INCCONFIG       := -I$(CONFIGDIR)
 INCFLEXI        := -I$(FLEXIDIR)
-INCLEGACY       := -I$(LEGACYDIR)
 INCFFLITE       := -I$(FFLITEDIR)
 INCSLHAEA       := -I$(SLHAEADIR)
 LIBMODEL1       := $(MODEL1DIR)/lib$(MODEL1)$(MODULE_LIBEXT)
 LIBMODEL2       := $(MODEL2DIR)/lib$(MODEL2)$(MODULE_LIBEXT)
 LIBFLEXI        := $(FLEXIDIR)/libflexisusy$(MODULE_LIBEXT)
-LIBLEGACY       := $(LEGACYDIR)/liblegacy$(MODULE_LIBEXT)
 LIBFFLITE       := $(FFLITEDIR)/libfflite$(MODULE_LIBEXT)
 
 # Variables for compilation
 CXX             := @CXX@
-CPPFLAGS        := @CPPFLAGS@ -I. $(INCCONFIG) $(INCFLEXI) $(INCLEGACY) \
+CPPFLAGS        := @CPPFLAGS@ -I. $(INCCONFIG) $(INCFLEXI) \
                    $(INCSLHAEA) $(INCMODEL1) $(INCMODEL2)
 CXXFLAGS        := @CXXFLAGS@
 CXX_DEP_GEN     := $(CXX)
@@ -101,7 +98,7 @@ ifneq (,$(findstring yes,$(ENABLE_LOOPTOOLS)$(ENABLE_FFLITE)))
 $(TOWER_DEP) $(TOWER_OBJ): CPPFLAGS += $(LOOPFUNCFLAGS)
 endif
 
-$(TOWER_EXE): $(TOWER_OBJ) $(LIBMODEL1) $(LIBMODEL2) $(LIBFLEXI) $(LIBLEGACY) $(filter-out -%,$(LOOPFUNCLIBS))
+$(TOWER_EXE): $(TOWER_OBJ) $(LIBMODEL1) $(LIBMODEL2) $(LIBFLEXI) $(filter-out -%,$(LOOPFUNCLIBS))
 		$(CXX) -o $@ $(call abspathx,$^) $(filter -%,$(LOOPFUNCLIBS)) $(GSLLIBS) $(BOOSTTHREADLIBS) $(THREADLIBS) $(LAPACKLIBS) $(BLASLIBS) $(FLIBS) $(SQLITELIBS)
 
 ifneq ($(MAKECMDGOALS),clean)
@@ -135,11 +132,9 @@ showbuild:
 	@echo "MODEL1DIR          = $(MODEL1DIR)"
 	@echo "MODEL2DIR          = $(MODEL2DIR)"
 	@echo "FLEXIDIR           = $(FLEXIDIR)"
-	@echo "LEGACYDIR          = $(LEGACYDIR)"
 	@echo "LIBMODEL1          = $(LIBMODEL1)"
 	@echo "LIBMODEL2          = $(LIBMODEL2)"
 	@echo "LIBFLEXI           = $(LIBFLEXI)"
-	@echo "LIBLEGACY          = $(LIBLEGACY)"
 	@echo ""
 	@echo "# compilation information"
 	@echo "CXX                = $(CXX)"

diff --git a/config/config.h.in b/config/config.h.in
@@ -1,6 +1,9 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* generated at @DATE@ */
 
+#ifndef CONFIG_H
+#define CONFIG_H
+
 #define PKGNAME "@PKGNAME@"
 
 #define FLEXIBLESUSY_VERSION  "@FLEXIBLESUSY_VERSION@"
@@ -100,3 +103,5 @@
 
 /* Enable statements for addons */
 @DEFINE_ENABLE_ADDONS@
+
+#endif