remove legacy module

FlexibleSUSY · Dec 22, 2016 · 95b7567 · 95b7567
1 parent 8031562
commit 95b7567
Show file tree

Hide file tree

Showing 30 changed files with 140 additions and 202 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -14,8 +14,6 @@ examples/lattice_numerical_fmssm.cpp        export-ignore
 examples/lattice_numerical_fmssm_fmssmn.cpp export-ignore
 examples/switch_MSSM.cpp                    export-ignore
 
-legacy                          export-ignore
-
 model_files/BetaSM              export-ignore
 model_files/cCMSSM              export-ignore
 model_files/complexMSSM         export-ignore

diff --git a/config/Makefile.customized-betas.in b/config/Makefile.customized-betas.in
@@ -95,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)
@@ -129,7 +129,6 @@ showbuild:
 	@echo "FLEXIDIR           = $(FLEXIDIR)"
 	@echo "LIBMODEL           = $(LIBMODEL)"
 	@echo "LIBFLEXI           = $(LIBFLEXI)"
-	@echo "LIBLEGACY          = $(LIBLEGACY)"
 	@echo ""
 	@echo "# compilation information"
 	@echo "CXX                = $(CXX)"

diff --git a/config/Makefile.standalone.in b/config/Makefile.standalone.in
@@ -90,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)
@@ -124,7 +124,6 @@ showbuild:
 	@echo "FLEXIDIR           = $(FLEXIDIR)"
 	@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
@@ -98,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,7 +135,6 @@ showbuild:
 	@echo "LIBMODEL1          = $(LIBMODEL1)"
 	@echo "LIBMODEL2          = $(LIBMODEL2)"
 	@echo "LIBFLEXI           = $(LIBFLEXI)"
-	@echo "LIBLEGACY          = $(LIBLEGACY)"
 	@echo ""
 	@echo "# compilation information"
 	@echo "CXX                = $(CXX)"

diff --git a/legacy/module.mk b/legacy/module.mk
diff --git a/legacy/conversion.cpp → models/SoftsusyMSSM/conversion.cpp b/legacy/conversion.cpp → models/SoftsusyMSSM/conversion.cpp
diff --git a/legacy/conversion.hpp → models/SoftsusyMSSM/conversion.hpp b/legacy/conversion.hpp → models/SoftsusyMSSM/conversion.hpp
diff --git a/legacy/def.cpp → models/SoftsusyMSSM/def.cpp b/legacy/def.cpp → models/SoftsusyMSSM/def.cpp
diff --git a/legacy/def.h → models/SoftsusyMSSM/def.h b/legacy/def.h → models/SoftsusyMSSM/def.h
diff --git a/legacy/diagonalization.cpp → models/SoftsusyMSSM/diagonalization.cpp b/legacy/diagonalization.cpp → models/SoftsusyMSSM/diagonalization.cpp
diff --git a/legacy/diagonalization.hpp → models/SoftsusyMSSM/diagonalization.hpp b/legacy/diagonalization.hpp → models/SoftsusyMSSM/diagonalization.hpp
diff --git a/legacy/linalg.cpp → models/SoftsusyMSSM/linalg.cpp b/legacy/linalg.cpp → models/SoftsusyMSSM/linalg.cpp
diff --git a/legacy/linalg.h → models/SoftsusyMSSM/linalg.h b/legacy/linalg.h → models/SoftsusyMSSM/linalg.h
diff --git a/legacy/lowe_legacy.cpp → models/SoftsusyMSSM/lowe_legacy.cpp b/legacy/lowe_legacy.cpp → models/SoftsusyMSSM/lowe_legacy.cpp
diff --git a/legacy/lowe_legacy.h → models/SoftsusyMSSM/lowe_legacy.h b/legacy/lowe_legacy.h → models/SoftsusyMSSM/lowe_legacy.h
diff --git a/models/SoftsusyMSSM/module.mk b/models/SoftsusyMSSM/module.mk
@@ -2,11 +2,35 @@ DIR          := models/SoftsusyMSSM
 MODNAME      := SoftsusyMSSM
 WITH_$(MODNAME) := yes
 
+LIBSoftsusyMSSM_HDR  := \
+		$(DIR)/conversion.hpp \
+		$(DIR)/def.h \
+		$(DIR)/diagonalization.hpp \
+		$(DIR)/linalg.h \
+		$(DIR)/lowe_legacy.h \
+		$(DIR)/mycomplex.h \
+		$(DIR)/numerics_legacy.h \
+		$(DIR)/rge.h \
+		$(DIR)/rk_legacy.hpp \
+		$(DIR)/utils.h \
+		$(DIR)/xpr-base.h \
+		$(DIR)/xpr-matrix.h \
+		$(DIR)/xpr-vector.h
+
 LIBSoftsusyMSSM_SRC  := \
+		$(DIR)/conversion.cpp \
+		$(DIR)/def.cpp \
+		$(DIR)/diagonalization.cpp \
+		$(DIR)/linalg.cpp \
+		$(DIR)/lowe_legacy.cpp \
 		$(DIR)/mssmUtils.cpp \
+		$(DIR)/numerics_legacy.cpp \
 		$(DIR)/physpars.cpp \
+		$(DIR)/rge.cpp \
+		$(DIR)/rk_legacy.cpp \
 		$(DIR)/susy.cpp \
-		$(DIR)/tensor.cpp
+		$(DIR)/tensor.cpp \
+		$(DIR)/utils.cpp
 
 ifneq ($(findstring two_scale,$(ALGORITHMS)),)
 LIBSoftsusyMSSM_SRC  += \
@@ -67,7 +91,7 @@ $(LIBSoftsusyMSSM_DEP) $(EXESoftsusyMSSM_DEP) $(LIBSoftsusyMSSM_OBJ) $(EXESoftsu
 $(LIBSoftsusyMSSM): $(LIBSoftsusyMSSM_OBJ)
 		$(MODULE_MAKE_LIB_CMD) $@ $^
 
-$(RUN_SoftsusyMSSM_EXE): $(EXESoftsusyMSSM_OBJ) $(LIBSoftsusyMSSM) $(LIBLEGACY) $(LIBFLEXI) $(filter-out -%,$(LOOPFUNCLIBS))
+$(RUN_SoftsusyMSSM_EXE): $(EXESoftsusyMSSM_OBJ) $(LIBSoftsusyMSSM) $(LIBFLEXI) $(filter-out -%,$(LOOPFUNCLIBS))
 		$(CXX) -o $@ $(call abspathx,$^) $(filter -%,$(LOOPFUNCLIBS)) $(FLIBS)
 
 ALLDEP += $(LIBSoftsusyMSSM_DEP) $(EXESoftsusyMSSM_DEP)

diff --git a/legacy/mycomplex.h → models/SoftsusyMSSM/mycomplex.h b/legacy/mycomplex.h → models/SoftsusyMSSM/mycomplex.h
diff --git a/legacy/numerics_legacy.cpp → models/SoftsusyMSSM/numerics_legacy.cpp b/legacy/numerics_legacy.cpp → models/SoftsusyMSSM/numerics_legacy.cpp
diff --git a/legacy/numerics_legacy.h → models/SoftsusyMSSM/numerics_legacy.h b/legacy/numerics_legacy.h → models/SoftsusyMSSM/numerics_legacy.h
diff --git a/legacy/rge.cpp → models/SoftsusyMSSM/rge.cpp b/legacy/rge.cpp → models/SoftsusyMSSM/rge.cpp
diff --git a/legacy/rge.h → models/SoftsusyMSSM/rge.h b/legacy/rge.h → models/SoftsusyMSSM/rge.h
diff --git a/legacy/rk_legacy.cpp → models/SoftsusyMSSM/rk_legacy.cpp b/legacy/rk_legacy.cpp → models/SoftsusyMSSM/rk_legacy.cpp
diff --git a/legacy/rk_legacy.hpp → models/SoftsusyMSSM/rk_legacy.hpp b/legacy/rk_legacy.hpp → models/SoftsusyMSSM/rk_legacy.hpp
diff --git a/legacy/utils.cpp → models/SoftsusyMSSM/utils.cpp b/legacy/utils.cpp → models/SoftsusyMSSM/utils.cpp
diff --git a/legacy/utils.h → models/SoftsusyMSSM/utils.h b/legacy/utils.h → models/SoftsusyMSSM/utils.h
diff --git a/legacy/xpr-base.h → models/SoftsusyMSSM/xpr-base.h b/legacy/xpr-base.h → models/SoftsusyMSSM/xpr-base.h
diff --git a/legacy/xpr-matrix.h → models/SoftsusyMSSM/xpr-matrix.h b/legacy/xpr-matrix.h → models/SoftsusyMSSM/xpr-matrix.h
diff --git a/legacy/xpr-vector.h → models/SoftsusyMSSM/xpr-vector.h b/legacy/xpr-vector.h → models/SoftsusyMSSM/xpr-vector.h
diff --git a/models/SoftsusyNMSSM/module.mk b/models/SoftsusyNMSSM/module.mk
@@ -74,7 +74,7 @@ $(LIBSoftsusyNMSSM_DEP) $(EXESoftsusyNMSSM_DEP) $(LIBSoftsusyNMSSM_OBJ) $(EXESof
 $(LIBSoftsusyNMSSM): $(LIBSoftsusyNMSSM_OBJ)
 		$(MODULE_MAKE_LIB_CMD) $@ $^
 
-$(RUN_SOFTPOINT_EXE): $(DIR)/run_softpoint.o $(LIBSoftsusyNMSSM) $(LIBSoftsusyMSSM) $(LIBLEGACY) $(LIBFLEXI) $(filter-out -%,$(LOOPFUNCLIBS))
+$(RUN_SOFTPOINT_EXE): $(DIR)/run_softpoint.o $(LIBSoftsusyNMSSM) $(LIBSoftsusyMSSM) $(LIBFLEXI) $(filter-out -%,$(LOOPFUNCLIBS))
 		$(CXX) -o $@ $(call abspathx,$^) $(filter -%,$(LOOPFUNCLIBS)) $(FLIBS)
 
 ALLDEP += $(LIBSoftsusyNMSSM_DEP) $(EXESoftsusyNMSSM_DEP)