Merge branch 'development' into lattice

.gitattributes

@@ -20,7 +20,6 @@ model_files/MSSMCPV             export-ignore
 model_files/minMSSM             export-ignore
 model_files/NoYukawaMSSM        export-ignore
 model_files/rootMSSM            export-ignore
-model_files/SM                  export-ignore
 model_files/YukawaCMSSM         export-ignore
 
 models/fmssm                    export-ignore

config/Makefile.customized-betas.in

@@ -41,6 +41,7 @@ FC              := @FC@
 FFLAGS          := @FFLAGS@
 FLIBS           := @FLIBS@
 FOR_DEP_GEN     := @FOR_DEP_GEN@
+BLASLIBS        := @BLASLIBS@
 BOOSTTESTLIBS   := @BOOSTTESTLIBS@
 BOOSTTHREADLIBS := @BOOSTTHREADLIBS@
 BOOSTFLAGS      := @BOOSTFLAGS@
@@ -105,7 +106,7 @@ $(CUSTOMBETAS_DEP) $(CUSTOMBETAS_OBJ): CPPFLAGS += $(LOOPFUNCFLAGS)
 endif
 
 $(CUSTOMBETAS_EXE): $(CUSTOMBETAS_OBJ) $(LIBMODEL) $(LIBFLEXI) $(LIBLEGACY) $(filter-out -%,$(LOOPFUNCLIBS))
-		$(CXX) -o $@ $(call abspathx,$^) $(filter -%,$(LOOPFUNCLIBS)) $(GSLLIBS) $(BOOSTTHREADLIBS) $(THREADLIBS) $(LAPACKLIBS) $(FLIBS)
+		$(CXX) -o $@ $(call abspathx,$^) $(filter -%,$(LOOPFUNCLIBS)) $(GSLLIBS) $(BOOSTTHREADLIBS) $(THREADLIBS) $(LAPACKLIBS) $(BLASLIBS) $(FLIBS)
 
 ifneq ($(MAKECMDGOALS),clean)
 ifneq ($(MAKECMDGOALS),clean-dep)
@@ -154,6 +155,7 @@ showbuild:
 	@echo "FLIBS              = $(FLIBS)"
 	@echo "FOR_DEP_GEN        = $(FOR_DEP_GEN)"
 	@echo "LIBEXT             = $(LIBEXT)"
+	@echo "BLASLIBS           = $(BLASLIBS)"
 	@echo "BOOSTTESTLIBS      = $(BOOSTTESTLIBS)"
 	@echo "BOOSTTHREADLIBS    = $(BOOSTTHREADLIBS)"
 	@echo "BOOSTFLAGS         = $(BOOSTFLAGS)"

config/Makefile.in

@@ -51,6 +51,7 @@ FLIBS              := @FLIBS@
 FOR_DEP_GEN        := @FOR_DEP_GEN@
 MAKELIB            := @MAKELIB@
 LIBEXT             := @LIBEXT@
+BLASLIBS           := @BLASLIBS@
 BOOSTTESTLIBS      := @BOOSTTESTLIBS@
 BOOSTTHREADLIBS    := @BOOSTTHREADLIBS@
 BOOSTFLAGS         := @BOOSTFLAGS@
@@ -104,7 +105,8 @@ CONVERT_DOS_PATHS := \
 README_FILE := $(ABSBASEDIR)/README
 
 .PHONY:  all allsrc allexec alllib alltest clean-executables \
-	 clean clean-dep depend distclean showbuild tag release
+	 clean clean-dep depend distclean showbuild tag \
+	 release-tag release-head
 
 all:
 ifeq ($(ENABLE_META),yes)
@@ -136,13 +138,14 @@ ifneq ($(MAKECMDGOALS),distclean)
 ifneq ($(MAKECMDGOALS),install-src)
 ifneq ($(MAKECMDGOALS),showbuild)
 ifneq ($(MAKECMDGOALS),tag)
-ifneq ($(MAKECMDGOALS),release)
 ifneq ($(MAKECMDGOALS),depend)
 ifneq ($(MAKECMDGOALS),doc)
 ifeq ($(ENABLE_COMPILE),yes)
 ifeq ($(findstring clean-,$(MAKECMDGOALS)),)
 ifeq ($(findstring distclean-,$(MAKECMDGOALS)),)
 ifeq ($(findstring doc-,$(MAKECMDGOALS)),)
+ifeq ($(findstring pack-,$(MAKECMDGOALS)),)
+ifeq ($(findstring release-,$(MAKECMDGOALS)),)
 -include $(ALLDEP)
 endif
 endif
@@ -156,6 +159,7 @@ endif
 endif
 endif
 endif
+endif
 
 allsrc:   $(ALLSRC)
 allexec:  $(ALLEXE)
@@ -217,6 +221,7 @@ showbuild:
 	@echo "FOR_DEP_GEN        = $(FOR_DEP_GEN)"
 	@echo "MAKELIB            = $(MAKELIB)"
 	@echo "LIBEXT             = $(LIBEXT)"
+	@echo "BLASLIBS           = $(BLASLIBS)"
 	@echo "BOOSTTESTLIBS      = $(BOOSTTESTLIBS)"
 	@echo "BOOSTTHREADLIBS    = $(BOOSTTHREADLIBS)"
 	@echo "BOOSTFLAGS         = $(BOOSTFLAGS)"
@@ -246,12 +251,18 @@ showbuild:
 tag:
 	git tag $(FLEXIBLESUSY_TAG)
 
-release:
-	git archive --worktree-attributes --prefix=$(FLEXIBLESUSY_PKG)/ \
+release-tag:
+	git archive --worktree-attributes \
+		--prefix=$(FLEXIBLESUSY_PKG)/ \
 		--output=$(FLEXIBLESUSY_PKG).tar.gz $(FLEXIBLESUSY_TAG)
-	md5sum $(FLEXIBLESUSY_PKG).tar.gz > $(FLEXIBLESUSY_PKG).tar.gz.md5
+	md5sum $(FLEXIBLESUSY_PKG).tar.gz \
+		> $(FLEXIBLESUSY_PKG).tar.gz.md5
 
 release-head:
-	git archive --worktree-attributes --prefix=$(PKGNAME)/ \
-		--output=$(PKGNAME).tar.gz HEAD
-	md5sum $(PKGNAME).tar.gz > $(PKGNAME).tar.gz.md5
+	$(eval GIT_HEAD_DESCR := $(shell git describe --tags HEAD))
+	$(eval FLEXIBLESUSY_HEAD_PKG := $(PKGNAME)-$(GIT_HEAD_DESCR))
+	git archive --worktree-attributes \
+		--prefix=$(FLEXIBLESUSY_HEAD_PKG)/ \
+		--output=$(FLEXIBLESUSY_HEAD_PKG).tar.gz HEAD
+	md5sum $(FLEXIBLESUSY_HEAD_PKG).tar.gz \
+		> $(FLEXIBLESUSY_HEAD_PKG).tar.gz.md5

config/Makefile.standalone.in

@@ -39,6 +39,7 @@ FC              := @FC@
 FFLAGS          := @FFLAGS@
 FLIBS           := @FLIBS@
 FOR_DEP_GEN     := @FOR_DEP_GEN@
+BLASLIBS        := @BLASLIBS@
 BOOSTTESTLIBS   := @BOOSTTESTLIBS@
 BOOSTTHREADLIBS := @BOOSTTHREADLIBS@
 BOOSTFLAGS      := @BOOSTFLAGS@
@@ -100,7 +101,7 @@ $(STANDALONE_DEP) $(STANDALONE_OBJ): CPPFLAGS += $(LOOPFUNCFLAGS)
 endif
 
 $(STANDALONE_EXE): $(STANDALONE_OBJ) $(LIBMODEL) $(LIBFLEXI) $(LIBLEGACY) $(filter-out -%,$(LOOPFUNCLIBS))
-		$(CXX) -o $@ $(call abspathx,$^) $(filter -%,$(LOOPFUNCLIBS)) $(GSLLIBS) $(BOOSTTHREADLIBS) $(THREADLIBS) $(LAPACKLIBS) $(FLIBS)
+		$(CXX) -o $@ $(call abspathx,$^) $(filter -%,$(LOOPFUNCLIBS)) $(GSLLIBS) $(BOOSTTHREADLIBS) $(THREADLIBS) $(LAPACKLIBS) $(BLASLIBS) $(FLIBS)
 
 ifneq ($(MAKECMDGOALS),clean)
 ifneq ($(MAKECMDGOALS),clean-dep)
@@ -149,6 +150,7 @@ showbuild:
 	@echo "FLIBS              = $(FLIBS)"
 	@echo "FOR_DEP_GEN        = $(FOR_DEP_GEN)"
 	@echo "LIBEXT             = $(LIBEXT)"
+	@echo "BLASLIBS           = $(BLASLIBS)"
 	@echo "BOOSTTESTLIBS      = $(BOOSTTESTLIBS)"
 	@echo "BOOSTTHREADLIBS    = $(BOOSTTHREADLIBS)"
 	@echo "BOOSTFLAGS         = $(BOOSTFLAGS)"

config/Makefile.tower.in

@@ -10,7 +10,7 @@ ENABLE_THREADS   := @ENABLE_THREADS@
 
 LIBEXT          := @LIBEXT@
 
-MODEL1          := MSSM
+MODEL1          := MSSMD5O
 MODEL2          := MSSMRHN
 
 MODEL1DIR       := $(ABSBASEDIR)/models/$(MODEL1)
@@ -45,6 +45,7 @@ FC              := @FC@
 FFLAGS          := @FFLAGS@
 FLIBS           := @FLIBS@
 FOR_DEP_GEN     := @FOR_DEP_GEN@
+BLASLIBS        := @BLASLIBS@
 BOOSTTESTLIBS   := @BOOSTTESTLIBS@
 BOOSTTHREADLIBS := @BOOSTTHREADLIBS@
 BOOSTFLAGS      := @BOOSTFLAGS@
@@ -67,8 +68,8 @@ endif
 
 TOWER_SRC := \
 		run_tower.cpp \
-		MSSM_MSSMRHN_two_scale_matching.cpp \
-		MSSM_MSSMRHN_two_scale_initial_guesser.cpp
+		MSSMD5O_MSSMRHN_two_scale_matching.cpp \
+		MSSMD5O_MSSMRHN_two_scale_initial_guesser.cpp
 
 TOWER_OBJ := \
 		$(patsubst %.cpp, %.o, $(filter %.cpp, $(TOWER_SRC))) \
@@ -108,7 +109,7 @@ $(TOWER_DEP) $(TOWER_OBJ): CPPFLAGS += $(LOOPFUNCFLAGS)
 endif
 
 $(TOWER_EXE): $(TOWER_OBJ) $(LIBMODEL1) $(LIBMODEL2) $(LIBFLEXI) $(LIBLEGACY) $(filter-out -%,$(LOOPFUNCLIBS))
-		$(CXX) -o $@ $(call abspathx,$^) $(filter -%,$(LOOPFUNCLIBS)) $(GSLLIBS) $(BOOSTTHREADLIBS) $(THREADLIBS) $(LAPACKLIBS) $(FLIBS)
+		$(CXX) -o $@ $(call abspathx,$^) $(filter -%,$(LOOPFUNCLIBS)) $(GSLLIBS) $(BOOSTTHREADLIBS) $(THREADLIBS) $(LAPACKLIBS) $(BLASLIBS) $(FLIBS)
 
 ifneq ($(MAKECMDGOALS),clean)
 ifneq ($(MAKECMDGOALS),clean-dep)
@@ -160,6 +161,7 @@ showbuild:
 	@echo "FLIBS              = $(FLIBS)"
 	@echo "FOR_DEP_GEN        = $(FOR_DEP_GEN)"
 	@echo "LIBEXT             = $(LIBEXT)"
+	@echo "BLASLIBS           = $(BLASLIBS)"
 	@echo "BOOSTTESTLIBS      = $(BOOSTTESTLIBS)"
 	@echo "BOOSTTHREADLIBS    = $(BOOSTTHREADLIBS)"
 	@echo "BOOSTFLAGS         = $(BOOSTFLAGS)"

config/config.h.in

@@ -21,6 +21,7 @@
 #define KERNEL_VERSION        "@KERNEL_VERSION@"
 
 /* Build variables */
+#define BLASLIBS              "@BLASLIBS@"
 #define BOOSTFLAGS            "@BOOSTFLAGS@"
 #define BOOSTTESTLIBS         "@BOOSTTESTLIBS@"
 #define BOOSTTHREADLIBS       "@BOOSTTHREADLIBS@"

configure

@@ -20,7 +20,7 @@ ABSBASEDIR=$(cd $BASEDIR; pwd)
 CONFIGDIR="${BASEDIR}/config"
 
 # current date
-DATE="`(date --rfc-2822) 2>/dev/null || echo unknown`"
+DATE="`date 2>/dev/null || echo unknown`"
 
 # platform information
 debmultiarch=""
@@ -137,6 +137,7 @@ boost_inc_dir=""
 eigen_inc_dir=""
 BOOSTFLAGS=""
 gsl_config="gsl-config"
+blas_lib_dir=""
 lapack_lib_dir=""
 looptools_lib_dir=""
 looptools_inc_dir=""
@@ -157,6 +158,7 @@ FC="gfortran"
 FOR_DEP_GEN="${FC}"
 GSLLIBS=""
 INSTALL_DIR=""
+BLASLIBS=""
 LAPACKLIBS=""
 MAKELIB="ar cru"
 MATH="math"
@@ -994,9 +996,8 @@ check_boost() {
         message "   see http://www.boost.org"
         exit 1
     else
-        # assume that the compiler will look in the default paths
-        if [ -n "$boost_inc_dir" ]; then
-            BOOSTFLAGS="-I$boost_inc_dir"
+        if contains_not "${BOOSTFLAGS}" "-I$found_dir"; then
+            BOOSTFLAGS="${BOOSTFLAGS} -I$found_dir"
         fi
     fi
 }
@@ -1106,9 +1107,8 @@ check_boost_thread_incl() {
         message "  You can disable the lattice method with the --with-algorithms= flag."
         exit 1
     else
-        # assume that the compiler will look in the default paths
-        if [ -n "$boost_inc_dir" ]; then
-            BOOSTFLAGS="-I$boost_inc_dir"
+        if contains_not "${BOOSTFLAGS}" "-I$found_dir"; then
+            BOOSTFLAGS="${BOOSTFLAGS} -I$found_dir"
         fi
     fi
 }
@@ -1497,8 +1497,8 @@ check_fflags() {
 #_____________________________________________________________________
 check_fortran_libs() {
     case "$FC" in
-        gfortran)
-            gfortran_lib_search_paths=`gfortran -print-search-dirs | sed -n -e '/libraries:/s/libraries: *=//p' | tr ':' ' '`
+        gfortran*)
+            gfortran_lib_search_paths=`${FC} -print-search-dirs | sed -n -e '/libraries:/s/libraries: *=//p' | tr ':' ' '`
             check_library "libgfortran" "$gfortran_lib_search_paths" "$default_lib_paths"
             if test "x$found_lib" = "x" ; then
                 message "Error: libgfortran not found in $gfortran_lib_search_paths $default_lib_paths"
@@ -1528,6 +1528,28 @@ check_fortran_dep_gen() {
     fi
 }
 
+#_____________________________________________________________________
+check_blas_libs_using_options() {
+    check_library "libblas" "$blas_lib_dir" \
+	"$default_lib_paths"
+    if test "x$found_lib" = "x" ; then
+        message "Error: libblas must be installed"
+        message "  to run the lattice algorithm, see http://www.netlib.org/blas"
+        message "  You can disable the lattice algorithm with the"
+        message "  --with-algorithms= flag"
+        exit 1
+    else
+        local BLASLIBS_=-lblas
+        if [ -z "$blas_lib_dir" ]; then
+            # assume that the linker will look in the default paths
+            BLASLIBS="$BLASLIBS_"
+        else
+            BLASLIBS="-L$blas_lib_dir $BLASLIBS_"
+        fi
+	check_symbol ztpsv_ "$found_lib" "$found_dir"
+    fi
+}
+
 #_____________________________________________________________________
 check_lapack_libs_using_options() {
     local symbol
@@ -1627,6 +1649,15 @@ find_symbol_using_pkgconfig() {
     return 0
 }
 
+#_____________________________________________________________________
+check_blas_libs() {
+    if find_symbol_using_pkgconfig blas ztpsv_; then
+	BLASLIBS="$linker_flags"
+    else
+	check_blas_libs_using_options
+    fi
+}
+
 #_____________________________________________________________________
 check_lapack_libs() {
     if find_symbol_using_pkgconfig lapack \
@@ -1937,6 +1968,7 @@ Package directories, compilation settings and model selection
   --with-algorithms=        Comma separated list of RG solver algorithms
                             (default: $ALGORITHMS)
                             possible values: all $available_algorithms
+  --with-blas-libdir=       Path to search for BLAS library
   --with-boost-libdir=      Path to search for BOOST libraries
   --with-boost-incdir=      Path to search for BOOST headers
   --with-cxx=               C++ compiler (default: $CXX)
@@ -1948,7 +1980,7 @@ Package directories, compilation settings and model selection
   --with-fortran-dep-gen=   Fortran file dependency generator (default: $FOR_DEP_GEN)
   --with-gsl-config=        Path to gsl-config (default: $gsl_config)
   --with-install-dir=       Path to source code installation directory
-  --with-lapack-libdir=     Path to search for LAPACK and BLAS libraries
+  --with-lapack-libdir=     Path to search for LAPACK library
   --with-lib-ext=           Library extension (default: $LIBEXT)
   --with-looptools-libdir=  Path to search for LoopTools libraries
   --with-looptools-incdir=  Path to search for LoopTools headers
@@ -2032,6 +2064,7 @@ if test $# -gt 0 ; then
                 fi
                 ;;
             --with-algorithms=*)     ALGORITHMS=$optarg ;;
+            --with-blas-libdir=*)    blas_lib_dir=$optarg ;;
             --with-boost-libdir=*)   boost_lib_dir=$optarg ;;
             --with-boost-incdir=*)   boost_inc_dir=$optarg ;;
             --with-cxx=*)            CXX=$optarg ;;
@@ -2085,6 +2118,7 @@ if test "x${enable_compile}" = "xyes"; then
     check_eigen_incl
     check_fortran_libs
     check_gsl_config
+    check_blas_libs
     check_lapack_libs
     if use_algorithm "lattice"; then
         check_boost_thread_incl
@@ -2122,6 +2156,7 @@ sed -e "s|@FLEXIBLESUSY_VERSION@|$FLEXIBLESUSY_VERSION|" \
     -e "s|@ABSBASEDIR@|$ABSBASEDIR|"   \
     -e "s|@INSTALL_DIR@|$INSTALL_DIR|" \
     -e "s|@ALGORITHMS@|$ALGORITHMS|"   \
+    -e "s|@BLASLIBS@|$BLASLIBS|"       \
     -e "s|@BOOSTTESTLIBS@|$BOOSTTESTLIBS|"     \
     -e "s|@BOOSTTHREADLIBS@|$BOOSTTHREADLIBS|"     \
     -e "s|@BOOSTFLAGS@|$BOOSTFLAGS|"   \
@@ -2168,6 +2203,7 @@ sed -e "s|@FLEXIBLESUSY_VERSION@|$FLEXIBLESUSY_VERSION|" \
     -e "s|@FLEXIBLESUSY_EXTRA@|$FLEXIBLESUSY_EXTRA|" \
     -e "s|@PKGNAME@|$PROGRAM_NAME|"    \
     -e "s|@ABSBASEDIR@|$ABSBASEDIR|"   \
+    -e "s|@BLASLIBS@|$BLASLIBS|"       \
     -e "s|@BOOSTTESTLIBS@|$BOOSTTESTLIBS|"     \
     -e "s|@BOOSTTHREADLIBS@|$BOOSTTHREADLIBS|"     \
     -e "s|@BOOSTFLAGS@|$BOOSTFLAGS|"   \
@@ -2203,6 +2239,7 @@ sed -e "s|@FLEXIBLESUSY_VERSION@|$FLEXIBLESUSY_VERSION|" \
     -e "s|@FLEXIBLESUSY_EXTRA@|$FLEXIBLESUSY_EXTRA|" \
     -e "s|@PKGNAME@|$PROGRAM_NAME|"    \
     -e "s|@ABSBASEDIR@|$ABSBASEDIR|"   \
+    -e "s|@BLASLIBS@|$BLASLIBS|"       \
     -e "s|@BOOSTTESTLIBS@|$BOOSTTESTLIBS|"     \
     -e "s|@BOOSTTHREADLIBS@|$BOOSTTHREADLIBS|"     \
     -e "s|@BOOSTFLAGS@|$BOOSTFLAGS|"   \
@@ -2238,6 +2275,7 @@ sed -e "s|@FLEXIBLESUSY_VERSION@|$FLEXIBLESUSY_VERSION|" \
     -e "s|@FLEXIBLESUSY_EXTRA@|$FLEXIBLESUSY_EXTRA|" \
     -e "s|@PKGNAME@|$PROGRAM_NAME|"    \
     -e "s|@ABSBASEDIR@|$ABSBASEDIR|"   \
+    -e "s|@BLASLIBS@|$BLASLIBS|"       \
     -e "s|@BOOSTTESTLIBS@|$BOOSTTESTLIBS|"     \
     -e "s|@BOOSTTHREADLIBS@|$BOOSTTHREADLIBS|"     \
     -e "s|@BOOSTFLAGS@|$BOOSTFLAGS|"   \
@@ -2292,6 +2330,7 @@ sed -e "s|@FLEXIBLESUSY_VERSION@|$FLEXIBLESUSY_VERSION|" \
     -e "s|@FLEXIBLESUSY_PATCH@|$FLEXIBLESUSY_PATCH|" \
     -e "s|@FLEXIBLESUSY_EXTRA@|$FLEXIBLESUSY_EXTRA|" \
     -e "s|@PKGNAME@|$PROGRAM_NAME|"                  \
+    -e "s|@BLASLIBS@|$BLASLIBS|"                     \
     -e "s|@BOOSTTESTLIBS@|$BOOSTTESTLIBS|"           \
     -e "s|@BOOSTTHREADLIBS@|$BOOSTTHREADLIBS|"       \
     -e "s|@BOOSTFLAGS@|$BOOSTFLAGS|"                 \

doc/FlexibleFuture.txt

@@ -17,6 +17,10 @@ Planned major extensions:
 
  * Leading two loop mh calculator.    			 
 
+ * MicrOMEGAS interface
+
+ * S, T, U variables as optional output
+
 And Fixes / minor extensions:
 
 * Weinberg angle issues: fix using the approach suggested by Jae-hyeon.

doc/mainpage.dox.in

@@ -64,6 +64,6 @@ with FlexibleSUSY:
 
  -  SoftSUSY
     [<a href="http://arxiv.org/abs/hep-ph/0104145">CPC 143 (2002) 305-331</a>,
-     <a href="http://arxiv.org/abs/1311.7659">arxiv:1311.7659</a>]
+     <a href="http://arxiv.org/abs/1311.7659">CPC 185 (2014) 2322</a>]
 
 */