Merge remote-tracking branch 'organization/development' into feature-…

…tachyons
FlexibleSUSY · Mar 22, 2018 · 64d53a7 · 64d53a7
2 parents 2cd0ccf + 8a5dc1c
commit 64d53a7
Show file tree

Hide file tree

Showing 36 changed files with 927 additions and 413 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -28,7 +28,9 @@ meta/SM/extract_*.m             export-ignore
 model_files/BetaSM              export-ignore
 model_files/cCMSSM              export-ignore
 model_files/complexMSSM         export-ignore
+model_files/CMSSMSemiAnalyticMW export-ignore
 model_files/CMSSMCPVSemiAnalytic export-ignore
+model_files/CMSSMCPVSemiAnalyticMW export-ignore
 model_files/CMSSMFPIAbsolute    export-ignore
 model_files/CMSSMFPIRelative    export-ignore
 model_files/CMSSMFPITadpole     export-ignore

diff --git a/README b/README
@@ -25,13 +25,13 @@ Requirements
  * Boost (version 1.37.0 or higher)   http://www.boost.org
  * Eigen 3 (version 3.1 or higher)    http://eigen.tuxfamily.org
  * GNU scientific library             http://www.gnu.org/software/gsl/
- * Lapack / Blas                      http://www.netlib.org/lapack/
 
 Optional:
 
  * BLAS                               http://www.netlib.org/blas/
  * LAPACK                             http://www.netlib.org/lapack/
  * LoopTools (version 2.8 or higher)  http://www.feynarts.de/looptools/
+ * Himalaya                           https://github.com/Himalaya-Library/Himalaya
 
 
 Installation of SARAH
@@ -468,3 +468,51 @@ remove model-specific files:
    $ make clean-<model>-obj # deletes .o files
 
    $ make clean-<model>-src # deletes generated files
+
+
+Package content
+===============
+
+In the following all sub-directories within the FlexibleSUSY package
+are listed:
+
+ * addons/ contains addons for FlexibleSUSY, such as GM2Calc
+
+ * config/ contains helper scripts and makefile modules for the build
+   system
+
+ * doc/ contains the FlexibleSUSY documentation
+
+ * examples/ contains examples how to build you own spectrum generator
+   based on FlexibleSUSY
+
+ * fflite/ contains an alternative implementation of the
+   Passarino-Veltman loop functions, based on FF
+
+ * meta/ contains the Mathematica meta code which generates the
+   spectrum generators
+
+ * model_files/ contains default model files for some frequently used
+   models (SM, SplitMSSM, MSSM, NMSSM, SMSSM, UMSSM, etc.)
+
+ * model_specific/ contains model-specific higher order corrections
+   for the MSSM, NMSSM, SM and SplitMSSM from the literature
+
+ * models/ This is the output directory where the generated C++ code
+   for the spectrum generators will be stored.
+
+ * Output/ contains SARAHs model-specific output files
+
+ * sarah/ contains SARAH model files shipped with FlexibleSUSY
+
+ * slhaea/ contains the SLHA reader library from
+   https://github.com/fthomas/slhaea
+
+ * src/ contains non-model specific FlexibleSUSY C++ source code
+
+ * templates/ contains C++ template files for the spectrum generators
+
+ * test/ contains the FlexibleSUSY test suite
+
+ * utils/ contains some utility scripts to perform scans or extract
+   data from SLHA files
diff --git a/addons/test_call_tsil/call_tsil.c b/addons/test_call_tsil/call_tsil.c
diff --git a/addons/test_call_tsil/call_tsil_cpp.cpp → addons/test_call_tsil/call_tsil.cpp b/addons/test_call_tsil/call_tsil_cpp.cpp → addons/test_call_tsil/call_tsil.cpp
@@ -1,12 +1,7 @@
 #include "call_tsil.hpp"
-
-// <complex> must be included before tsil_cpp.h
-#include <complex>
-
-// Warning: tsil_cpp.h does `using namespace std'
 #include "tsil_cpp.h"
 
-double call_A_cpp(double m, double q)
+double call_A(double m, double q)
 {
    TSIL_REAL m2 = m*m;
    TSIL_REAL q2 = q*q;

diff --git a/addons/test_call_tsil/call_tsil.h b/addons/test_call_tsil/call_tsil.h
diff --git a/addons/test_call_tsil/call_tsil.hpp b/addons/test_call_tsil/call_tsil.hpp
@@ -1,6 +1,6 @@
 #ifndef CALL_TSIL_HPP
 #define CALL_TSIL_HPP
 
-double call_A_cpp(double m, double q);
+double call_A(double m, double q);
 
 #endif
diff --git a/addons/test_call_tsil/module.mk b/addons/test_call_tsil/module.mk
@@ -6,16 +6,14 @@ LIBtest_call_tsil_MK  := $(DIR)/module.mk
 
 # source files
 LIBtest_call_tsil_SRC := \
-		$(DIR)/call_tsil.c \
-		$(DIR)/call_tsil_cpp.cpp
+		$(DIR)/call_tsil.cpp
 
 # main()
 EXEtest_call_tsil_SRC := \
 		$(DIR)/run.cpp
 
 # header files
 LIBtest_call_tsil_HDR := \
-		$(DIR)/call_tsil.h \
 		$(DIR)/call_tsil.hpp
 
 LIBtest_call_tsil_OBJ := \

diff --git a/addons/test_call_tsil/run.cpp b/addons/test_call_tsil/run.cpp
@@ -1,11 +1,9 @@
-#include "call_tsil.h"
 #include "call_tsil.hpp"
 #include <iostream>
 
 int main()
 {
-   std::cout << "C  : A0(100,100) = " << call_A(100., 100.) << '\n';
-   std::cout << "C++: A0(100,100) = " << call_A_cpp(100., 100.) << '\n';
+   std::cout << "C++: A0(100,100) = " << call_A(100., 100.) << '\n';
 
    return 0;
 }
diff --git a/config/Makefile.customized-betas.in b/config/Makefile.customized-betas.in
@@ -72,6 +72,12 @@ CUSTOMBETAS_DEP := \
 CUSTOMBETAS_EXE := \
 		custombetas.x
 
+# set default shell
+SHELL = /bin/sh
+
+# disable built-in rules to improve speed
+MAKEFLAGS += -rR --include-dir=$(CURDIR)
+
 # returns file name with absolute path, taking whitespace in directory
 # names into account
 abspathx        = $(foreach name,$(1),\
@@ -121,6 +127,9 @@ endif
 	$(FOR_DEP_GEN) $(CPPFLAGS) -cpp -MM -MP -MG $^ -MT '$*.o' | \
 	sed 's|.*\.o:|$*.o:|' > $@
 
+%.o: %.cpp
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
+
 showbuild:
 	@echo "# package information"
 	@echo "PKGNAME            = $(PKGNAME)"

diff --git a/config/Makefile.in b/config/Makefile.in
@@ -230,9 +230,6 @@ depend:  $(ALLDEP)
 %.d: %.F | $(DEPGEN)
 	$(DEPGEN) $(CPPFLAGS) -MM -MI -o '$@' -MT '$*.o' $^
 
-%.o: %.c
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
-
 %.o: %.cpp
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
 

diff --git a/config/Makefile.standalone.in b/config/Makefile.standalone.in
@@ -67,6 +67,12 @@ STANDALONE_DEP := \
 STANDALONE_EXE := \
 		standalone.x
 
+# set default shell
+SHELL = /bin/sh
+
+# disable built-in rules to improve speed
+MAKEFLAGS += -rR --include-dir=$(CURDIR)
+
 # returns file name with absolute path, taking whitespace in directory
 # names into account
 abspathx        = $(foreach name,$(1),\
@@ -116,6 +122,9 @@ endif
 	$(FOR_DEP_GEN) $(CPPFLAGS) -cpp -MM -MP -MG $^ -MT '$*.o' | \
 	sed 's|.*\.o:|$*.o:|' > $@
 
+%.o: %.cpp
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
+
 showbuild:
 	@echo "# package information"
 	@echo "PKGNAME            = $(PKGNAME)"

diff --git a/config/Makefile.tower.in b/config/Makefile.tower.in
@@ -73,6 +73,12 @@ TOWER_DEP := \
 TOWER_EXE := \
 		run_tower.x
 
+# set default shell
+SHELL = /bin/sh
+
+# disable built-in rules to improve speed
+MAKEFLAGS += -rR --include-dir=$(CURDIR)
+
 # returns file name with absolute path, taking whitespace in directory
 # names into account
 abspathx        = $(foreach name,$(1),\
@@ -122,6 +128,9 @@ endif
 	$(FOR_DEP_GEN) $(CPPFLAGS) -cpp -MM -MP -MG $^ -MT '$*.o' | \
 	sed 's|.*\.o:|$*.o:|' > $@
 
+%.o: %.cpp
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
+
 showbuild:
 	@echo "# package information"
 	@echo "PKGNAME            = $(PKGNAME)"

diff --git a/doc/building.dox b/doc/building.dox
@@ -13,13 +13,13 @@
  - Boost (version 1.37.0 or higher)   http://www.boost.org
  - Eigen 3 (version 3.1 or higher)    http://eigen.tuxfamily.org
  - GNU scientific library             http://www.gnu.org/software/gsl/
- - Lapack / Blas                      http://www.netlib.org/lapack/
 
 Optional:
 
  - BLAS                               http://www.netlib.org/blas/
  - LAPACK                             http://www.netlib.org/lapack/
  - LoopTools (version 2.8 or higher)  http://www.feynarts.de/looptools/
+ - Himalaya                           https://github.com/Himalaya-Library/Himalaya
 
 \subsection generation Generating a spectrum generator
 

diff --git a/doc/module.mk b/doc/module.mk
@@ -107,6 +107,7 @@ $(INDEX_PAGE):
 		        $(TEST_SRC) $(TEST_META)"; \
 		  echo "EXCLUDE_PATTERNS = */meta/* */test/*"; \
 		  echo "IMAGE_PATH = $(IMAGE_DIR)"; \
+		  echo "INCLUDE_PATH = $(MODULES)"; \
 		  echo "EXAMPLE_PATH = $(EXAMPLES_DIR)"; \
 		) | doxygen -
 
@@ -118,6 +119,7 @@ $(MAN_PAGE):
 		        $(TEST_SRC) $(TEST_META)"; \
 		  echo "EXCLUDE_PATTERNS = */meta/* */test/*"; \
 		  echo "IMAGE_PATH = $(IMAGE_DIR)"; \
+		  echo "INCLUDE_PATH = $(MODULES)"; \
 		  echo "EXAMPLE_PATH = $(EXAMPLES_DIR)"; \
 		  echo "GENERATE_MAN = YES"; \
 		  echo "GENERATE_HTML = NO"; \

diff --git a/doc/package.dox b/doc/package.dox
@@ -4,27 +4,38 @@
 
 \section Directories
 
+ - <code>addons/</code> contains addons for FlexibleSUSY, such as
+   GM2Calc
+
  - <code>config/</code> contains helper scripts and makefile modules
    for the build system
 
  - <code>doc/</code> contains the FlexibleSUSY documentation
 
- - <code>examples/</code> contains some example spectrum generators
+ - <code>examples/</code> contains examples how to build you own
+   spectrum generator based on FlexibleSUSY
 
  - <code>fflite/</code> contains an alternative implementation of the
    Passarino-Veltman loop functions, based on FF
 
- - <code>meta/</code> contains the @ref meta_code "Mathematica meta code"
+ - <code>meta/</code> contains the @ref meta_code "Mathematica meta
+   code" which generates the spectrum generators
 
  - <code>model_files/</code> contains default model files for some
-   frequently used models (MSSM, NMSSM, SMSSM, UMSSM, etc.)
+   frequently used models (SM, SplitMSSM, MSSM, NMSSM, SMSSM, UMSSM,
+   etc.)
+
+ - <code>model_specific/</code> contains model-specific higher order
+   corrections for the MSSM, NMSSM, SM and SplitMSSM from the
+   literature
 
  - <code>models/</code> This is the output directory where the
    generated C++ code for the spectrum generators will be stored.
 
  - <code>Output/</code> contains SARAH's model-specific output files
 
- - <code>sarah/</code> contains extra SARAH model files
+ - <code>sarah/</code> contains SARAH model files shipped with
+   FlexibleSUSY
 
  - <code>slhaea/</code> contains the SLHA reader library from
    https://github.com/fthomas/slhaea
@@ -38,6 +49,6 @@
  - <code>test/</code> contains the FlexibleSUSY test suite
 
  - <code>utils/</code> contains some utility scripts to perform scans
-   or extract data from SLHA files.
+   or extract data from SLHA files
 
 */
diff --git a/meta/FlexibleSUSY.m b/meta/FlexibleSUSY.m
@@ -2076,7 +2076,6 @@ corresponding tadpole is real or imaginary (only in models with CP
             setInputParameterArguments,
             numberOfSpectrumEntries, putSpectrum, setInputParameters,
             numberOfObservables, putObservables,
-            listOfInputParameters, listOfModelParameters, listOfOutputParameters,
             inputPars, outPars, requestedObservables, defaultSolverType,
             solverIncludes = "", runEnabledSolvers = ""},
            inputPars = {#[[1]], #[[3]]}& /@ inputParameters;
@@ -2091,9 +2090,6 @@ corresponding tadpole is real or imaginary (only in models with CP
                      FlexibleSUSY`M2 -> FlexibleSUSY`M;
            outPars = Join[outPars, FlexibleSUSY`Pole /@ outPars, Parameters`GetModelParameters[],
                           Parameters`GetExtraParameters[], {FlexibleSUSY`SCALE}];
-           listOfInputParameters = ToString[First /@ inputParameters];
-           listOfOutputParameters = ToString[outPars];
-           listOfModelParameters = ToString[Parameters`GetModelParameters[]];
            numberOfSpectrumEntries = FSMathLink`GetNumberOfSpectrumEntries[outPars];
            putSpectrum = FSMathLink`PutSpectrum[outPars, "link"];
            (* get observables *)
@@ -2118,9 +2114,6 @@ corresponding tadpole is real or imaginary (only in models with CP
                             "@putSpectrum@" -> IndentText[putSpectrum],
                             "@numberOfObservables@" -> ToString[numberOfObservables],
                             "@putObservables@" -> IndentText[putObservables],
-                            "@listOfInputParameters@" -> listOfInputParameters,
-                            "@listOfModelParameters@" -> listOfModelParameters,
-                            "@listOfOutputParameters@" -> listOfOutputParameters,
                             "@solverIncludes@" -> solverIncludes,
                             "@runEnabledSolvers@" -> runEnabledSolvers,
                             "@defaultSolverType@" -> defaultSolverType,