Browse Source

Modify Makefile; add .gitignores in subfolders

master
J.-S. Caux 6 years ago
parent
commit
7fb3e6d3b4
6 changed files with 84 additions and 84 deletions
  1. 0
    4
      .gitignore
  2. 76
    78
      Makefile
  3. 2
    0
      bin/.gitignore
  4. 2
    0
      lib/.gitignore
  5. 2
    0
      obj/.gitignore
  6. 2
    2
      src/COMBI/Combinatorics.cc

+ 0
- 4
.gitignore View File

3
 *~
3
 *~
4
 
4
 
5
 *tar.gz
5
 *tar.gz
6
-
7
-bin/*
8
-lib/*
9
-obj/*

+ 76
- 78
Makefile View File

11
 #
11
 #
12
 #***********************************************************/
12
 #***********************************************************/
13
 
13
 
14
-VERSION = ABACUS++G_8
14
+VERSION = ABACUS_0a
15
 
15
 
16
-# Base directory, tree of all source files, headers 
16
+# Base directory, tree of all source files, headers
17
 BASEDIR = #/Users/jcaux/WORK/ABACUS++/
17
 BASEDIR = #/Users/jcaux/WORK/ABACUS++/
18
 OBJDIR = $(BASEDIR)obj/
18
 OBJDIR = $(BASEDIR)obj/
19
 HEADDIR = $(BASEDIR)include/
19
 HEADDIR = $(BASEDIR)include/
23
 BINDIR = $(BASEDIR)bin/
23
 BINDIR = $(BASEDIR)bin/
24
 
24
 
25
 #COMPILE = g++ -Wall -I$(BASEDIR)include/ -L$(LIBDIR) -O3 -stdlib=libstdc++
25
 #COMPILE = g++ -Wall -I$(BASEDIR)include/ -L$(LIBDIR) -O3 -stdlib=libstdc++
26
-#COMPILE = g++ -Wall -I$(BASEDIR)include/ -L$(LIBDIR) -O3 
26
+#COMPILE = g++ -Wall -I$(BASEDIR)include/ -L$(LIBDIR) -O3
27
 COMPILE = g++ -I$(BASEDIR)include/ -L$(LIBDIR) -O3 -w -fopenmp
27
 COMPILE = g++ -I$(BASEDIR)include/ -L$(LIBDIR) -O3 -w -fopenmp
28
 #COMPILE_MPI = mpicxx -I$(BASEDIR)include/ -L$(LIBDIR) -O3 -stdlib=libstdc++
28
 #COMPILE_MPI = mpicxx -I$(BASEDIR)include/ -L$(LIBDIR) -O3 -stdlib=libstdc++
29
 COMPILE_MPI = mpicxx -I$(BASEDIR)include/ -L$(LIBDIR) -O3 -w -fopenmp
29
 COMPILE_MPI = mpicxx -I$(BASEDIR)include/ -L$(LIBDIR) -O3 -w -fopenmp
33
 
33
 
34
 vpath %.h $(HEADDIR)
34
 vpath %.h $(HEADDIR)
35
 
35
 
36
-#Headers_JSC = JSC.h JSC_util.h JSC_Bethe.h JSC_Combi.h JSC_Integ.h JSC_Matrix.h JSC_Scan.h JSC_Vect.h JSC_Young.h 
37
 Headers_JSC = JSC.h JSC_util.h JSC_Combi.h JSC_Integ.h JSC_Matrix.h JSC_NRG.h JSC_Spec_Fns.h JSC_Vect.h JSC_Young.h
36
 Headers_JSC = JSC.h JSC_util.h JSC_Combi.h JSC_Integ.h JSC_Matrix.h JSC_NRG.h JSC_Spec_Fns.h JSC_Vect.h JSC_Young.h
38
-#Headers_all = $(Headers_JSC) JSC_LiebLin.h JSC_Heis.h JSC_ODSLF.h JSC_Scan.h JSC_XXX_h0.h JSC_XXZ_h0.h
39
 Headers_all = $(Headers_JSC) JSC_LiebLin.h JSC_Heis.h JSC_Scan.h JSC_State_Ensemble.h JSC_XXX_h0.h JSC_XXZ_h0.h
37
 Headers_all = $(Headers_JSC) JSC_LiebLin.h JSC_Heis.h JSC_Scan.h JSC_State_Ensemble.h JSC_XXX_h0.h JSC_XXZ_h0.h
40
 
38
 
41
-#Objects_BETHE = $(OBJDIR)Bethe_State.o
39
+Objects_LIEBLIN = $(OBJDIR)LiebLin_Bethe_State.o $(OBJDIR)LiebLin_Chem_Pot.o \
40
+	$(OBJDIR)LiebLin_Matrix_Element_Contrib.o $(OBJDIR)LiebLin_ln_Overlap.o \
41
+	$(OBJDIR)LiebLin_Sumrules.o $(OBJDIR)LiebLin_State_Ensemble.o \
42
+	$(OBJDIR)LiebLin_Tgt0.o $(OBJDIR)LiebLin_Twisted_lnnorm.o $(OBJDIR)LiebLin_Twisted_ln_Overlap.o \
43
+	$(OBJDIR)LiebLin_Utils.o $(OBJDIR)ln_Density_ME.o $(OBJDIR)ln_Psi_ME.o $(OBJDIR)ln_g2_ME.o
42
 
44
 
43
-Objects_LIEBLIN = $(OBJDIR)LiebLin_Bethe_State.o $(OBJDIR)LiebLin_Chem_Pot.o $(OBJDIR)LiebLin_Matrix_Element_Contrib.o $(OBJDIR)LiebLin_ln_Overlap.o $(OBJDIR)LiebLin_Sumrules.o $(OBJDIR)LiebLin_State_Ensemble.o \
44
-	$(OBJDIR)LiebLin_Tgt0.o $(OBJDIR)LiebLin_Twisted_lnnorm.o $(OBJDIR)LiebLin_Twisted_ln_Overlap.o $(OBJDIR)LiebLin_Utils.o $(OBJDIR)ln_Density_ME.o $(OBJDIR)ln_Psi_ME.o $(OBJDIR)ln_g2_ME.o
45
-
46
-Objects_HEIS = $(OBJDIR)Heis.o $(OBJDIR)Heis_Chem_Pot.o $(OBJDIR)Heis_Sumrules.o $(OBJDIR)Heis_Matrix_Element_Contrib.o \
47
-	$(OBJDIR)ln_Overlap_XXX.o \
45
+Objects_HEIS = $(OBJDIR)Heis.o $(OBJDIR)Heis_Chem_Pot.o $(OBJDIR)Heis_Sumrules.o \
46
+	$(OBJDIR)Heis_Matrix_Element_Contrib.o $(OBJDIR)ln_Overlap_XXX.o \
48
 	$(OBJDIR)ln_Sz_ME_XXX.o $(OBJDIR)ln_Sz_ME_XXZ.o $(OBJDIR)ln_Sz_ME_XXZ_gpd.o \
47
 	$(OBJDIR)ln_Sz_ME_XXX.o $(OBJDIR)ln_Sz_ME_XXZ.o $(OBJDIR)ln_Sz_ME_XXZ_gpd.o \
49
 	$(OBJDIR)ln_Smin_ME_XXX.o $(OBJDIR)ln_Smin_ME_XXZ.o $(OBJDIR)ln_Smin_ME_XXZ_gpd.o \
48
 	$(OBJDIR)ln_Smin_ME_XXX.o $(OBJDIR)ln_Smin_ME_XXZ.o $(OBJDIR)ln_Smin_ME_XXZ_gpd.o \
50
 	$(OBJDIR)ln_Szz_ME_XXX.o $(OBJDIR)ln_Smm_ME_XXX.o $(OBJDIR)ln_Szm_p_Smz_ME_XXX.o \
49
 	$(OBJDIR)ln_Szz_ME_XXX.o $(OBJDIR)ln_Smm_ME_XXX.o $(OBJDIR)ln_Szm_p_Smz_ME_XXX.o \
51
 	$(OBJDIR)M_vs_H.o \
50
 	$(OBJDIR)M_vs_H.o \
52
-	$(OBJDIR)XXX_Bethe_State.o $(OBJDIR)XXZ_Bethe_State.o $(OBJDIR)XXZ_gpd_Bethe_State.o 
51
+	$(OBJDIR)XXX_Bethe_State.o $(OBJDIR)XXZ_Bethe_State.o $(OBJDIR)XXZ_gpd_Bethe_State.o
53
 
52
 
54
-Objects_ODSLF = $(OBJDIR)ODSLF.o $(OBJDIR)ODSLF_Chem_Pot.o $(OBJDIR)ODSLF_Sumrules.o $(OBJDIR)ODSLF_XXZ_Bethe_State.o $(OBJDIR)ODSLF_Matrix_Element_Contrib.o \
53
+Objects_ODSLF = $(OBJDIR)ODSLF.o $(OBJDIR)ODSLF_Chem_Pot.o $(OBJDIR)ODSLF_Sumrules.o \
54
+	$(OBJDIR)ODSLF_XXZ_Bethe_State.o $(OBJDIR)ODSLF_Matrix_Element_Contrib.o \
55
 	$(OBJDIR)ln_Sz_ME_ODSLF_XXZ.o $(OBJDIR)ln_Smin_ME_ODSLF_XXZ.o
55
 	$(OBJDIR)ln_Sz_ME_ODSLF_XXZ.o $(OBJDIR)ln_Smin_ME_ODSLF_XXZ.o
56
 
56
 
57
 Objects_COMBI = $(OBJDIR)Combinatorics.o
57
 Objects_COMBI = $(OBJDIR)Combinatorics.o
60
 
60
 
61
 Objects_INTEG = $(OBJDIR)Integration.o
61
 Objects_INTEG = $(OBJDIR)Integration.o
62
 
62
 
63
-Objects_MATRIX = $(OBJDIR)balanc.o $(OBJDIR)det_LU.o $(OBJDIR)det_LU_CX.o $(OBJDIR)eigsrt.o $(OBJDIR)elmhes.o $(OBJDIR)gaussj.o $(OBJDIR)hqr.o \
64
-	$(OBJDIR)jacobi.o $(OBJDIR)lndet_LU.o $(OBJDIR)lndet_LU_dstry.o $(OBJDIR)lndet_LU_CX.o $(OBJDIR)lndet_LU_CX_dstry.o $(OBJDIR)lubksb.o \
63
+Objects_MATRIX = $(OBJDIR)balanc.o $(OBJDIR)det_LU.o $(OBJDIR)det_LU_CX.o $(OBJDIR)eigsrt.o \
64
+	$(OBJDIR)elmhes.o $(OBJDIR)gaussj.o $(OBJDIR)hqr.o \
65
+	$(OBJDIR)jacobi.o $(OBJDIR)lndet_LU.o $(OBJDIR)lndet_LU_dstry.o $(OBJDIR)lndet_LU_CX.o \
66
+	$(OBJDIR)lndet_LU_CX_dstry.o $(OBJDIR)lubksb.o \
65
 	$(OBJDIR)lubksb_CX.o $(OBJDIR)ludcmp.o $(OBJDIR)ludcmp_CX.o $(OBJDIR)pythag.o $(OBJDIR)tqli.o $(OBJDIR)tred2.o
67
 	$(OBJDIR)lubksb_CX.o $(OBJDIR)ludcmp.o $(OBJDIR)ludcmp_CX.o $(OBJDIR)pythag.o $(OBJDIR)tqli.o $(OBJDIR)tred2.o
66
 
68
 
67
-Objects_NRG = $(OBJDIR)NRG_State_Selector.o $(OBJDIR)NRG_DME_Matrix_Block_builder.o $(OBJDIR)NRG_K_Weight_integrand.o 
69
+Objects_NRG = $(OBJDIR)NRG_State_Selector.o $(OBJDIR)NRG_DME_Matrix_Block_builder.o $(OBJDIR)NRG_K_Weight_integrand.o
68
 
70
 
69
-#Objects_SCAN = $(OBJDIR)Descendents.o $(OBJDIR)General_Scan.o $(OBJDIR)General_Scan_Parallel.o $(OBJDIR)Particle_Hole_Excitation_Cost.o $(OBJDIR)Scan_Info.o $(OBJDIR)Scan_Thread_List.o
70
-Objects_SCAN = $(OBJDIR)Descendents.o $(OBJDIR)General_Scan.o $(OBJDIR)General_Scan_Parallel.o $(OBJDIR)Particle_Hole_Excitation_Cost.o $(OBJDIR)Scan_Info.o $(OBJDIR)Scan_Thread_Data.o 
71
+Objects_SCAN = $(OBJDIR)Descendents.o $(OBJDIR)General_Scan.o $(OBJDIR)General_Scan_Parallel.o \
72
+	$(OBJDIR)Particle_Hole_Excitation_Cost.o $(OBJDIR)Scan_Info.o $(OBJDIR)Scan_Thread_Data.o
71
 
73
 
72
 Objects_TBA = $(OBJDIR)Root_Density.o $(OBJDIR)TBA_LiebLin.o $(OBJDIR)TBA_XXZ.o $(OBJDIR)TBA_2CBG.o
74
 Objects_TBA = $(OBJDIR)Root_Density.o $(OBJDIR)TBA_LiebLin.o $(OBJDIR)TBA_XXZ.o $(OBJDIR)TBA_2CBG.o
73
 
75
 
74
-#Objects_UTILS = $(OBJDIR)Data_File_Name.o $(OBJDIR)K_and_Omega_Files.o $(OBJDIR)Smoothen_RAW_into_SF.o $(OBJDIR)Smoothen_RAW_into_SF_LiebLin_Scaled.o $(OBJDIR)Sort_RAW_File.o $(OBJDIR)State_Label.o
75
-Objects_UTILS = $(OBJDIR)Data_File_Name.o $(OBJDIR)K_and_Omega_Files.o $(OBJDIR)Smoothen_RAW_into_SF.o $(OBJDIR)Smoothen_RAW_into_SF_LiebLin_Scaled.o $(OBJDIR)Sort_RAW_File.o $(OBJDIR)State_Label.o
76
+Objects_UTILS = $(OBJDIR)Data_File_Name.o $(OBJDIR)K_and_Omega_Files.o $(OBJDIR)Smoothen_RAW_into_SF.o \
77
+	$(OBJDIR)Smoothen_RAW_into_SF_LiebLin_Scaled.o $(OBJDIR)Sort_RAW_File.o $(OBJDIR)State_Label.o
76
 
78
 
77
 Objects_XXX_h0 = $(OBJDIR)XXX_h0.o
79
 Objects_XXX_h0 = $(OBJDIR)XXX_h0.o
78
 
80
 
80
 
82
 
81
 Objects_YOUNG = $(OBJDIR)Young_Tableau.o
83
 Objects_YOUNG = $(OBJDIR)Young_Tableau.o
82
 
84
 
83
-#Objects_ALL = $(Objects_LIEBLIN) $(Objects_HEIS) $(Objects_COMBI) $(Objects_FITTING) $(Objects_INTEG) $(Objects_MATRIX) $(Objects_NRG) $(Objects_ODSLF) $(Objects_SCAN) $(Objects_TBA) $(Objects_UTILS) $(Objects_XXX_h0) $(Objects_XXZ_h0) $(Objects_YOUNG) 
84
-Objects_ALL = $(Objects_LIEBLIN) $(Objects_HEIS) $(Objects_COMBI) $(Objects_FITTING) $(Objects_INTEG) $(Objects_MATRIX) $(Objects_NRG) $(Objects_SCAN) $(Objects_TBA) $(Objects_UTILS) $(Objects_XXX_h0) $(Objects_XXZ_h0) $(Objects_YOUNG) 
85
+Objects_ALL = $(Objects_LIEBLIN) $(Objects_HEIS) $(Objects_COMBI) $(Objects_FITTING) \
86
+	$(Objects_INTEG) $(Objects_MATRIX) $(Objects_NRG) $(Objects_SCAN) $(Objects_TBA) \
87
+	$(Objects_UTILS) $(Objects_XXX_h0) $(Objects_XXZ_h0) $(Objects_YOUNG)
85
 
88
 
86
-#EXECS = $(BINDIR)LiebLin_DSF $(BINDIR)Smoothen_LiebLin_DSF $(BINDIR)Heis_DSF $(BINDIR)Smoothen_Heis_DSF $(BINDIR)Smoothen_Heis_ASF $(BINDIR)Check_RAW_File
87
-#EXECS = $(BINDIR)LiebLin_DSF $(BINDIR)LiebLin_DSF_tester $(BINDIR)Smoothen_LiebLin_DSF $(BINDIR)Smoothen_LiebLin_DSF_DiK $(BINDIR)Heis_DSF $(BINDIR)Smoothen_Heis_DSF $(BINDIR)Smoothen_Heis_ASF $(BINDIR)Check_RAW_File
88
-EXECS = $(BINDIR)LiebLin_DSF $(BINDIR)LiebLin_Data_Daemon $(BINDIR)LiebLin_RAW_File_Stats $(BINDIR)LiebLin_DSF_tester $(BINDIR)LiebLin_DSF_tester_Ix2 $(BINDIR)LiebLin_DSF_MosesState $(BINDIR)LiebLin_DSF_over_Ensemble $(BINDIR)Smoothen_LiebLin_DSF $(BINDIR)Heis_DSF $(BINDIR)Heis_DSF_GeneralState $(BINDIR)Smoothen_Heis_DSF $(BINDIR)Check_RAW_File
89
+EXECS = $(BINDIR)LiebLin_DSF $(BINDIR)LiebLin_Data_Daemon $(BINDIR)LiebLin_RAW_File_Stats \
90
+	$(BINDIR)LiebLin_DSF_tester $(BINDIR)LiebLin_DSF_tester_Ix2 $(BINDIR)LiebLin_DSF_MosesState \
91
+	$(BINDIR)LiebLin_DSF_over_Ensemble $(BINDIR)Smoothen_LiebLin_DSF $(BINDIR)Heis_DSF \
92
+	$(BINDIR)Heis_DSF_GeneralState $(BINDIR)Smoothen_Heis_DSF $(BINDIR)Check_RAW_File
89
 
93
 
90
 
94
 
91
 ##########################################
95
 ##########################################
100
 	$(COMPILE) $(EXECSDIR)LiebLin_Catalogue_Fixed_c_k_Nscaling.cc -o $(BINDIR)LiebLin_Catalogue_Fixed_c_k_Nscaling -l$(VERSION)
104
 	$(COMPILE) $(EXECSDIR)LiebLin_Catalogue_Fixed_c_k_Nscaling.cc -o $(BINDIR)LiebLin_Catalogue_Fixed_c_k_Nscaling -l$(VERSION)
101
 	$(COMPILE) $(EXECSDIR)LiebLin_RAW_File_Stats.cc -o $(BINDIR)LiebLin_RAW_File_Stats -l$(VERSION)
105
 	$(COMPILE) $(EXECSDIR)LiebLin_RAW_File_Stats.cc -o $(BINDIR)LiebLin_RAW_File_Stats -l$(VERSION)
102
 	$(COMPILE) $(EXECSDIR)LiebLin_DSF_GeneralState.cc -o $(BINDIR)LiebLin_DSF_GeneralState -l$(VERSION)
106
 	$(COMPILE) $(EXECSDIR)LiebLin_DSF_GeneralState.cc -o $(BINDIR)LiebLin_DSF_GeneralState -l$(VERSION)
103
-#	$(COMPILE) $(EXECSDIR)LiebLin_DSF_MosesState.cc -o $(BINDIR)LiebLin_DSF_MosesState -l$(VERSION)
107
+	$(COMPILE) $(EXECSDIR)LiebLin_DSF_MosesState.cc -o $(BINDIR)LiebLin_DSF_MosesState -l$(VERSION)
104
 	$(COMPILE) $(EXECSDIR)LiebLin_DSF_over_Ensemble.cc -o $(BINDIR)LiebLin_DSF_over_Ensemble -l$(VERSION)
108
 	$(COMPILE) $(EXECSDIR)LiebLin_DSF_over_Ensemble.cc -o $(BINDIR)LiebLin_DSF_over_Ensemble -l$(VERSION)
105
 	$(COMPILE) $(EXECSDIR)LiebLin_DSF_tester.cc -o $(BINDIR)LiebLin_DSF_tester -l$(VERSION)
109
 	$(COMPILE) $(EXECSDIR)LiebLin_DSF_tester.cc -o $(BINDIR)LiebLin_DSF_tester -l$(VERSION)
106
 	$(COMPILE) $(EXECSDIR)LiebLin_DSF_tester_Ix2.cc -o $(BINDIR)LiebLin_DSF_tester_Ix2 -l$(VERSION)
110
 	$(COMPILE) $(EXECSDIR)LiebLin_DSF_tester_Ix2.cc -o $(BINDIR)LiebLin_DSF_tester_Ix2 -l$(VERSION)
107
-#	$(COMPILE) $(EXECSDIR)LiebLin_Moses_tester.cc -o $(BINDIR)LiebLin_Moses_tester -l$(VERSION)
108
 	$(COMPILE) $(EXECSDIR)Smoothen_LiebLin_DSF.cc -o $(BINDIR)Smoothen_LiebLin_DSF -l$(VERSION)
111
 	$(COMPILE) $(EXECSDIR)Smoothen_LiebLin_DSF.cc -o $(BINDIR)Smoothen_LiebLin_DSF -l$(VERSION)
109
 	$(COMPILE) $(EXECSDIR)Smoothen_LiebLin_DSF_Scaled.cc -o $(BINDIR)Smoothen_LiebLin_DSF_Scaled -l$(VERSION)
112
 	$(COMPILE) $(EXECSDIR)Smoothen_LiebLin_DSF_Scaled.cc -o $(BINDIR)Smoothen_LiebLin_DSF_Scaled -l$(VERSION)
110
 	$(COMPILE) $(EXECSDIR)Smoothen_LiebLin_DSF_over_Ensemble.cc -o $(BINDIR)Smoothen_LiebLin_DSF_over_Ensemble -l$(VERSION)
113
 	$(COMPILE) $(EXECSDIR)Smoothen_LiebLin_DSF_over_Ensemble.cc -o $(BINDIR)Smoothen_LiebLin_DSF_over_Ensemble -l$(VERSION)
111
 	$(COMPILE) $(EXECSDIR)Smoothen_LiebLin_DSF_GeneralState.cc -o $(BINDIR)Smoothen_LiebLin_DSF_GeneralState -l$(VERSION)
114
 	$(COMPILE) $(EXECSDIR)Smoothen_LiebLin_DSF_GeneralState.cc -o $(BINDIR)Smoothen_LiebLin_DSF_GeneralState -l$(VERSION)
112
-#	$(COMPILE) $(EXECSDIR)Smoothen_LiebLin_DSF_MosesState.cc -o $(BINDIR)Smoothen_LiebLin_DSF_MosesState -l$(VERSION)
115
+	$(COMPILE) $(EXECSDIR)Smoothen_LiebLin_DSF_MosesState.cc -o $(BINDIR)Smoothen_LiebLin_DSF_MosesState -l$(VERSION)
113
 	$(COMPILE) $(EXECSDIR)LiebLin_TBA.cc -o $(BINDIR)LiebLin_TBA -l$(VERSION)
116
 	$(COMPILE) $(EXECSDIR)LiebLin_TBA.cc -o $(BINDIR)LiebLin_TBA -l$(VERSION)
114
 	$(COMPILE) $(EXECSDIR)LiebLin_TBA_fixed_nbar.cc -o $(BINDIR)LiebLin_TBA_fixed_nbar -l$(VERSION)
117
 	$(COMPILE) $(EXECSDIR)LiebLin_TBA_fixed_nbar.cc -o $(BINDIR)LiebLin_TBA_fixed_nbar -l$(VERSION)
115
 	$(COMPILE) $(EXECSDIR)LiebLin_TBA_fixed_nbar_ebar.cc -o $(BINDIR)LiebLin_TBA_fixed_nbar_ebar -l$(VERSION)
118
 	$(COMPILE) $(EXECSDIR)LiebLin_TBA_fixed_nbar_ebar.cc -o $(BINDIR)LiebLin_TBA_fixed_nbar_ebar -l$(VERSION)
116
-#	$(COMPILE) $(EXECSDIR)Smoothen_LiebLin_DSF_DiK.cc -o $(BINDIR)Smoothen_LiebLin_DSF_DiK -l$(VERSION)
117
-#	$(COMPILE) $(EXECSDIR)Smoothen_LiebLin_ASF.cc -o $(BINDIR)Smoothen_LiebLin_ASF -l$(VERSION)
118
 	$(COMPILE) $(EXECSDIR)Heis_DSF.cc -o $(BINDIR)Heis_DSF -l$(VERSION)
119
 	$(COMPILE) $(EXECSDIR)Heis_DSF.cc -o $(BINDIR)Heis_DSF -l$(VERSION)
119
 	$(COMPILE) $(EXECSDIR)Heis_DSF_GeneralState.cc -o $(BINDIR)Heis_DSF_GeneralState -l$(VERSION)
120
 	$(COMPILE) $(EXECSDIR)Heis_DSF_GeneralState.cc -o $(BINDIR)Heis_DSF_GeneralState -l$(VERSION)
120
 	$(COMPILE) $(EXECSDIR)Smoothen_Heis_DSF.cc -o $(BINDIR)Smoothen_Heis_DSF -l$(VERSION)
121
 	$(COMPILE) $(EXECSDIR)Smoothen_Heis_DSF.cc -o $(BINDIR)Smoothen_Heis_DSF -l$(VERSION)
121
-#	$(COMPILE) $(EXECSDIR)Smoothen_Heis_ASF.cc -o $(BINDIR)Smoothen_Heis_ASF -l$(VERSION)
122
 	$(COMPILE) $(EXECSDIR)XXZ_gpd_StagSz_h0.cc -o $(BINDIR)XXZ_gpd_StagSz_h0 -l$(VERSION)
122
 	$(COMPILE) $(EXECSDIR)XXZ_gpd_StagSz_h0.cc -o $(BINDIR)XXZ_gpd_StagSz_h0 -l$(VERSION)
123
-#	$(COMPILE) $(EXECSDIR)ODSLF_DSF.cc -o $(BINDIR)ODSLF_DSF -l$(VERSION)
124
-#	$(COMPILE) $(EXECSDIR)Smoothen_ODSLF_DSF.cc -o $(BINDIR)Smoothen_ODSLF_DSF -l$(VERSION)
123
+	$(COMPILE) $(EXECSDIR)ODSLF_DSF.cc -o $(BINDIR)ODSLF_DSF -l$(VERSION)
124
+	$(COMPILE) $(EXECSDIR)Smoothen_ODSLF_DSF.cc -o $(BINDIR)Smoothen_ODSLF_DSF -l$(VERSION)
125
 	$(COMPILE) $(EXECSDIR)Check_RAW_File.cc -o $(BINDIR)Check_RAW_File -l$(VERSION)
125
 	$(COMPILE) $(EXECSDIR)Check_RAW_File.cc -o $(BINDIR)Check_RAW_File -l$(VERSION)
126
 	$(COMPILE) $(EXECSDIR)Analyze_RAW_File.cc -o $(BINDIR)Analyze_RAW_File -l$(VERSION)
126
 	$(COMPILE) $(EXECSDIR)Analyze_RAW_File.cc -o $(BINDIR)Analyze_RAW_File -l$(VERSION)
127
 	$(COMPILE) $(EXECSDIR)RAW_File_Stats.cc -o $(BINDIR)RAW_File_Stats -l$(VERSION)
127
 	$(COMPILE) $(EXECSDIR)RAW_File_Stats.cc -o $(BINDIR)RAW_File_Stats -l$(VERSION)
128
 	$(COMPILE) $(EXECSDIR)Produce_Sorted_RAW_File.cc -o $(BINDIR)Produce_Sorted_RAW_File -l$(VERSION)
128
 	$(COMPILE) $(EXECSDIR)Produce_Sorted_RAW_File.cc -o $(BINDIR)Produce_Sorted_RAW_File -l$(VERSION)
129
 	$(COMPILE) $(EXECSDIR)2CBG_ThLim.cc -o $(BINDIR)2CBG_ThLim -l$(VERSION)
129
 	$(COMPILE) $(EXECSDIR)2CBG_ThLim.cc -o $(BINDIR)2CBG_ThLim -l$(VERSION)
130
-	$(COMPILE) $(EXECSDIR)LiebLin_Fourier_to_x_equal_t.cc -o $(BINDIR)LiebLin_Fourier_to_x_equal_t -l$(VERSION)	
131
-	$(COMPILE) $(EXECSDIR)LiebLin_Fourier_to_t_equal_x.cc -o $(BINDIR)LiebLin_Fourier_to_t_equal_x -l$(VERSION)	
132
-	$(COMPILE) $(EXECSDIR)LiebLin_Fourier_to_x_equal_t_from_RAW.cc -o $(BINDIR)LiebLin_Fourier_to_x_equal_t_from_RAW -l$(VERSION)	
133
-	$(COMPILE) $(EXECSDIR)LiebLin_Fourier_to_t_equal_x_from_RAW.cc -o $(BINDIR)LiebLin_Fourier_to_t_equal_x_from_RAW -l$(VERSION)	
134
-	$(COMPILE) $(EXECSDIR)LiebLin_Fourier_ssf_to_Qsqx.cc -o $(BINDIR)LiebLin_Fourier_ssf_to_Qsqx -l$(VERSION)	
130
+	$(COMPILE) $(EXECSDIR)LiebLin_Fourier_to_x_equal_t.cc -o $(BINDIR)LiebLin_Fourier_to_x_equal_t -l$(VERSION)
131
+	$(COMPILE) $(EXECSDIR)LiebLin_Fourier_to_t_equal_x.cc -o $(BINDIR)LiebLin_Fourier_to_t_equal_x -l$(VERSION)
132
+	$(COMPILE) $(EXECSDIR)LiebLin_Fourier_to_x_equal_t_from_RAW.cc -o $(BINDIR)LiebLin_Fourier_to_x_equal_t_from_RAW -l$(VERSION)
133
+	$(COMPILE) $(EXECSDIR)LiebLin_Fourier_to_t_equal_x_from_RAW.cc -o $(BINDIR)LiebLin_Fourier_to_t_equal_x_from_RAW -l$(VERSION)
134
+	$(COMPILE) $(EXECSDIR)LiebLin_Fourier_ssf_to_Qsqx.cc -o $(BINDIR)LiebLin_Fourier_ssf_to_Qsqx -l$(VERSION)
135
 
135
 
136
 ###########################################
136
 ###########################################
137
 # Interacting LiebLin gas
137
 # Interacting LiebLin gas
140
 	$(COMPILE) -c $< -o $@
140
 	$(COMPILE) -c $< -o $@
141
 
141
 
142
 $(OBJDIR)LiebLin_Chem_Pot.o : LiebLin_Chem_Pot.cc $(Headers_JSC) JSC_LiebLin.h
142
 $(OBJDIR)LiebLin_Chem_Pot.o : LiebLin_Chem_Pot.cc $(Headers_JSC) JSC_LiebLin.h
143
-	$(COMPILE) -c $< -o $@	
143
+	$(COMPILE) -c $< -o $@
144
 
144
 
145
 $(OBJDIR)LiebLin_Matrix_Element_Contrib.o : LiebLin_Matrix_Element_Contrib.cc $(Headers_JSC) JSC_LiebLin.h
145
 $(OBJDIR)LiebLin_Matrix_Element_Contrib.o : LiebLin_Matrix_Element_Contrib.cc $(Headers_JSC) JSC_LiebLin.h
146
-	$(COMPILE) -c $< -o $@	
146
+	$(COMPILE) -c $< -o $@
147
 
147
 
148
 $(OBJDIR)LiebLin_ln_Overlap.o : LiebLin_ln_Overlap.cc $(Headers_JSC) JSC_LiebLin.h
148
 $(OBJDIR)LiebLin_ln_Overlap.o : LiebLin_ln_Overlap.cc $(Headers_JSC) JSC_LiebLin.h
149
 	$(COMPILE) -c $< -o $@
149
 	$(COMPILE) -c $< -o $@
161
 	$(COMPILE) -c $< -o $@
161
 	$(COMPILE) -c $< -o $@
162
 
162
 
163
 $(OBJDIR)LiebLin_Utils.o : LiebLin_Utils.cc $(Headers_JSC) JSC_LiebLin.h
163
 $(OBJDIR)LiebLin_Utils.o : LiebLin_Utils.cc $(Headers_JSC) JSC_LiebLin.h
164
-	$(COMPILE) -c $< -o $@	
164
+	$(COMPILE) -c $< -o $@
165
 
165
 
166
 $(OBJDIR)ln_Density_ME.o : ln_Density_ME.cc $(Headers_JSC) JSC_LiebLin.h
166
 $(OBJDIR)ln_Density_ME.o : ln_Density_ME.cc $(Headers_JSC) JSC_LiebLin.h
167
 	$(COMPILE) -c $< -o $@
167
 	$(COMPILE) -c $< -o $@
191
 $(OBJDIR)Heis_Matrix_Element_Contrib.o : Heis_Matrix_Element_Contrib.cc $(Headers_JSC) JSC_Heis.h
191
 $(OBJDIR)Heis_Matrix_Element_Contrib.o : Heis_Matrix_Element_Contrib.cc $(Headers_JSC) JSC_Heis.h
192
 	$(COMPILE) -c $< -o $@
192
 	$(COMPILE) -c $< -o $@
193
 
193
 
194
-$(OBJDIR)ln_Overlap_XXX.o : ln_Overlap_XXX.cc $(Headers_JSC) JSC_Heis.h 
194
+$(OBJDIR)ln_Overlap_XXX.o : ln_Overlap_XXX.cc $(Headers_JSC) JSC_Heis.h
195
 	$(COMPILE) -c $< -o $@
195
 	$(COMPILE) -c $< -o $@
196
 
196
 
197
-$(OBJDIR)ln_Sz_ME_XXX.o : ln_Sz_ME_XXX.cc $(Headers_JSC) JSC_Heis.h 
197
+$(OBJDIR)ln_Sz_ME_XXX.o : ln_Sz_ME_XXX.cc $(Headers_JSC) JSC_Heis.h
198
 	$(COMPILE) -c $< -o $@
198
 	$(COMPILE) -c $< -o $@
199
 
199
 
200
-$(OBJDIR)ln_Szz_ME_XXX.o : ln_Szz_ME_XXX.cc $(Headers_JSC) JSC_Heis.h 
200
+$(OBJDIR)ln_Szz_ME_XXX.o : ln_Szz_ME_XXX.cc $(Headers_JSC) JSC_Heis.h
201
 	$(COMPILE) -c $< -o $@
201
 	$(COMPILE) -c $< -o $@
202
 
202
 
203
-$(OBJDIR)ln_Smm_ME_XXX.o : ln_Smm_ME_XXX.cc $(Headers_JSC) JSC_Heis.h 
203
+$(OBJDIR)ln_Smm_ME_XXX.o : ln_Smm_ME_XXX.cc $(Headers_JSC) JSC_Heis.h
204
 	$(COMPILE) -c $< -o $@
204
 	$(COMPILE) -c $< -o $@
205
 
205
 
206
-$(OBJDIR)ln_Szm_p_Smz_ME_XXX.o : ln_Szm_p_Smz_ME_XXX.cc $(Headers_JSC) JSC_Heis.h 
206
+$(OBJDIR)ln_Szm_p_Smz_ME_XXX.o : ln_Szm_p_Smz_ME_XXX.cc $(Headers_JSC) JSC_Heis.h
207
 	$(COMPILE) -c $< -o $@
207
 	$(COMPILE) -c $< -o $@
208
 
208
 
209
-$(OBJDIR)ln_Sz_ME_XXZ.o : ln_Sz_ME_XXZ.cc $(Headers_JSC) JSC_Heis.h 
209
+$(OBJDIR)ln_Sz_ME_XXZ.o : ln_Sz_ME_XXZ.cc $(Headers_JSC) JSC_Heis.h
210
 	$(COMPILE) -c $< -o $@
210
 	$(COMPILE) -c $< -o $@
211
 
211
 
212
-$(OBJDIR)ln_Sz_ME_XXZ_gpd.o : ln_Sz_ME_XXZ_gpd.cc $(Headers_JSC) JSC_Heis.h 
212
+$(OBJDIR)ln_Sz_ME_XXZ_gpd.o : ln_Sz_ME_XXZ_gpd.cc $(Headers_JSC) JSC_Heis.h
213
 	$(COMPILE) -c $< -o $@
213
 	$(COMPILE) -c $< -o $@
214
 
214
 
215
-$(OBJDIR)ln_Smin_ME_XXX.o : ln_Smin_ME_XXX.cc $(Headers_JSC) JSC_Heis.h 
215
+$(OBJDIR)ln_Smin_ME_XXX.o : ln_Smin_ME_XXX.cc $(Headers_JSC) JSC_Heis.h
216
 	$(COMPILE) -c $< -o $@
216
 	$(COMPILE) -c $< -o $@
217
 
217
 
218
-$(OBJDIR)ln_Smin_ME_XXZ.o : ln_Smin_ME_XXZ.cc $(Headers_JSC) JSC_Heis.h 
218
+$(OBJDIR)ln_Smin_ME_XXZ.o : ln_Smin_ME_XXZ.cc $(Headers_JSC) JSC_Heis.h
219
 	$(COMPILE) -c $< -o $@
219
 	$(COMPILE) -c $< -o $@
220
 
220
 
221
 $(OBJDIR)ln_Smin_ME_XXZ_gpd.o : ln_Smin_ME_XXZ_gpd.cc $(Headers_JSC) JSC_Heis.h
221
 $(OBJDIR)ln_Smin_ME_XXZ_gpd.o : ln_Smin_ME_XXZ_gpd.cc $(Headers_JSC) JSC_Heis.h
222
 	$(COMPILE) -c $< -o $@
222
 	$(COMPILE) -c $< -o $@
223
 
223
 
224
-$(OBJDIR)M_vs_H.o : M_vs_H.cc $(Headers_JSC) JSC_Heis.h 
224
+$(OBJDIR)M_vs_H.o : M_vs_H.cc $(Headers_JSC) JSC_Heis.h
225
 	$(COMPILE) -c $< -o $@
225
 	$(COMPILE) -c $< -o $@
226
 
226
 
227
-$(OBJDIR)XXX_Bethe_State.o : XXX_Bethe_State.cc $(Headers_JSC) JSC_Heis.h 
227
+$(OBJDIR)XXX_Bethe_State.o : XXX_Bethe_State.cc $(Headers_JSC) JSC_Heis.h
228
 	$(COMPILE) -c $< -o $@
228
 	$(COMPILE) -c $< -o $@
229
 
229
 
230
-$(OBJDIR)XXZ_Bethe_State.o : XXZ_Bethe_State.cc $(Headers_JSC) JSC_Heis.h 
230
+$(OBJDIR)XXZ_Bethe_State.o : XXZ_Bethe_State.cc $(Headers_JSC) JSC_Heis.h
231
 	$(COMPILE) -c $< -o $@
231
 	$(COMPILE) -c $< -o $@
232
 
232
 
233
-$(OBJDIR)XXZ_gpd_Bethe_State.o : XXZ_gpd_Bethe_State.cc $(Headers_JSC) JSC_Heis.h 
233
+$(OBJDIR)XXZ_gpd_Bethe_State.o : XXZ_gpd_Bethe_State.cc $(Headers_JSC) JSC_Heis.h
234
 	$(COMPILE) -c $< -o $@
234
 	$(COMPILE) -c $< -o $@
235
 
235
 
236
 
236
 
249
 $(OBJDIR)ODSLF_XXZ_Bethe_State.o : ODSLF_XXZ_Bethe_State.cc $(Headers_JSC) JSC_Heis.h JSC_ODSLF.h
249
 $(OBJDIR)ODSLF_XXZ_Bethe_State.o : ODSLF_XXZ_Bethe_State.cc $(Headers_JSC) JSC_Heis.h JSC_ODSLF.h
250
 	$(COMPILE) -c $< -o $@
250
 	$(COMPILE) -c $< -o $@
251
 
251
 
252
-$(OBJDIR)ln_Smin_ME_ODSLF_XXZ.o : ln_Smin_ME_ODSLF_XXZ.cc $(Headers_JSC) JSC_ODSLF.h 
252
+$(OBJDIR)ln_Smin_ME_ODSLF_XXZ.o : ln_Smin_ME_ODSLF_XXZ.cc $(Headers_JSC) JSC_ODSLF.h
253
 	$(COMPILE) -c $< -o $@
253
 	$(COMPILE) -c $< -o $@
254
 
254
 
255
-$(OBJDIR)ln_Sz_ME_ODSLF_XXZ.o : ln_Sz_ME_ODSLF_XXZ.cc $(Headers_JSC) JSC_ODSLF.h 
255
+$(OBJDIR)ln_Sz_ME_ODSLF_XXZ.o : ln_Sz_ME_ODSLF_XXZ.cc $(Headers_JSC) JSC_ODSLF.h
256
 	$(COMPILE) -c $< -o $@
256
 	$(COMPILE) -c $< -o $@
257
 
257
 
258
 $(OBJDIR)ODSLF_Matrix_Element_Contrib.o : ODSLF_Matrix_Element_Contrib.cc $(Headers_JSC) JSC_ODSLF.h
258
 $(OBJDIR)ODSLF_Matrix_Element_Contrib.o : ODSLF_Matrix_Element_Contrib.cc $(Headers_JSC) JSC_ODSLF.h
269
 # Integ functions
269
 # Integ functions
270
 
270
 
271
 $(OBJDIR)Integration.o : Integration.cc $(Headers_JSC)
271
 $(OBJDIR)Integration.o : Integration.cc $(Headers_JSC)
272
-	$(COMPILE) -c $< -o $@	
272
+	$(COMPILE) -c $< -o $@
273
 
273
 
274
 ###########################################
274
 ###########################################
275
 # Fitting functions
275
 # Fitting functions
283
 $(OBJDIR)mrq.o : mrq.cc $(Headers_JSC)
283
 $(OBJDIR)mrq.o : mrq.cc $(Headers_JSC)
284
 	$(COMPILE) -c $< -o $@
284
 	$(COMPILE) -c $< -o $@
285
 
285
 
286
-$(OBJDIR)polint.o : polint.cc $(Headers_JSC) 
286
+$(OBJDIR)polint.o : polint.cc $(Headers_JSC)
287
 	$(COMPILE) -c $< -o $@
287
 	$(COMPILE) -c $< -o $@
288
 
288
 
289
-$(OBJDIR)polint_cx.o : polint_cx.cc $(Headers_JSC) 
289
+$(OBJDIR)polint_cx.o : polint_cx.cc $(Headers_JSC)
290
 	$(COMPILE) -c $< -o $@
290
 	$(COMPILE) -c $< -o $@
291
 
291
 
292
 
292
 
293
 ###########################################
293
 ###########################################
294
 # Matrix functions
294
 # Matrix functions
295
 
295
 
296
-$(OBJDIR)balanc.o : balanc.cc $(Headers_JSC) 
296
+$(OBJDIR)balanc.o : balanc.cc $(Headers_JSC)
297
 	$(COMPILE) -c $< -o $@
297
 	$(COMPILE) -c $< -o $@
298
 
298
 
299
-$(OBJDIR)det_LU.o : det_LU.cc $(Headers_JSC) 
299
+$(OBJDIR)det_LU.o : det_LU.cc $(Headers_JSC)
300
 	$(COMPILE) -c $< -o $@
300
 	$(COMPILE) -c $< -o $@
301
 
301
 
302
 $(OBJDIR)det_LU_CX.o : det_LU_CX.cc $(Headers_JSC)
302
 $(OBJDIR)det_LU_CX.o : det_LU_CX.cc $(Headers_JSC)
303
 	$(COMPILE) -c $< -o $@
303
 	$(COMPILE) -c $< -o $@
304
 
304
 
305
-$(OBJDIR)eigsrt.o : eigsrt.cc $(Headers_JSC) 
305
+$(OBJDIR)eigsrt.o : eigsrt.cc $(Headers_JSC)
306
 	$(COMPILE) -c $< -o $@
306
 	$(COMPILE) -c $< -o $@
307
 
307
 
308
-$(OBJDIR)elmhes.o : elmhes.cc $(Headers_JSC) 
308
+$(OBJDIR)elmhes.o : elmhes.cc $(Headers_JSC)
309
 	$(COMPILE) -c $< -o $@
309
 	$(COMPILE) -c $< -o $@
310
 
310
 
311
-$(OBJDIR)gaussj.o : gaussj.cc $(Headers_JSC) 
311
+$(OBJDIR)gaussj.o : gaussj.cc $(Headers_JSC)
312
 	$(COMPILE) -c $< -o $@
312
 	$(COMPILE) -c $< -o $@
313
 
313
 
314
-$(OBJDIR)hqr.o : hqr.cc $(Headers_JSC) 
314
+$(OBJDIR)hqr.o : hqr.cc $(Headers_JSC)
315
 	$(COMPILE) -c $< -o $@
315
 	$(COMPILE) -c $< -o $@
316
 
316
 
317
-$(OBJDIR)jacobi.o : jacobi.cc $(Headers_JSC) 
317
+$(OBJDIR)jacobi.o : jacobi.cc $(Headers_JSC)
318
 	$(COMPILE) -c $< -o $@
318
 	$(COMPILE) -c $< -o $@
319
 
319
 
320
-$(OBJDIR)lndet_LU.o : lndet_LU.cc $(Headers_JSC) 
320
+$(OBJDIR)lndet_LU.o : lndet_LU.cc $(Headers_JSC)
321
 	$(COMPILE) -c $< -o $@
321
 	$(COMPILE) -c $< -o $@
322
 
322
 
323
-$(OBJDIR)lndet_LU_CX.o : lndet_LU_CX.cc $(Headers_JSC) 
323
+$(OBJDIR)lndet_LU_CX.o : lndet_LU_CX.cc $(Headers_JSC)
324
 	$(COMPILE) -c $< -o $@
324
 	$(COMPILE) -c $< -o $@
325
 
325
 
326
-$(OBJDIR)lndet_LU_dstry.o : lndet_LU_dstry.cc $(Headers_JSC) 
326
+$(OBJDIR)lndet_LU_dstry.o : lndet_LU_dstry.cc $(Headers_JSC)
327
 	$(COMPILE) -c $< -o $@
327
 	$(COMPILE) -c $< -o $@
328
 
328
 
329
-$(OBJDIR)lndet_LU_CX_dstry.o : lndet_LU_CX_dstry.cc $(Headers_JSC) 
329
+$(OBJDIR)lndet_LU_CX_dstry.o : lndet_LU_CX_dstry.cc $(Headers_JSC)
330
 	$(COMPILE) -c $< -o $@
330
 	$(COMPILE) -c $< -o $@
331
 
331
 
332
 $(OBJDIR)lubksb.o : lubksb.cc $(Headers_JSC)
332
 $(OBJDIR)lubksb.o : lubksb.cc $(Headers_JSC)
335
 $(OBJDIR)lubksb_CX.o : lubksb_CX.cc $(Headers_JSC)
335
 $(OBJDIR)lubksb_CX.o : lubksb_CX.cc $(Headers_JSC)
336
 	$(COMPILE) -c $< -o $@
336
 	$(COMPILE) -c $< -o $@
337
 
337
 
338
-$(OBJDIR)ludcmp.o : ludcmp.cc $(Headers_JSC) 
338
+$(OBJDIR)ludcmp.o : ludcmp.cc $(Headers_JSC)
339
 	$(COMPILE) -c $< -o $@
339
 	$(COMPILE) -c $< -o $@
340
 
340
 
341
-$(OBJDIR)ludcmp_CX.o : ludcmp_CX.cc $(Headers_JSC) 
341
+$(OBJDIR)ludcmp_CX.o : ludcmp_CX.cc $(Headers_JSC)
342
 	$(COMPILE) -c $< -o $@
342
 	$(COMPILE) -c $< -o $@
343
 
343
 
344
-$(OBJDIR)pythag.o : pythag.cc $(Headers_JSC) 
344
+$(OBJDIR)pythag.o : pythag.cc $(Headers_JSC)
345
 	$(COMPILE) -c $< -o $@
345
 	$(COMPILE) -c $< -o $@
346
 
346
 
347
-$(OBJDIR)tqli.o : tqli.cc $(Headers_JSC) 
347
+$(OBJDIR)tqli.o : tqli.cc $(Headers_JSC)
348
 	$(COMPILE) -c $< -o $@
348
 	$(COMPILE) -c $< -o $@
349
 
349
 
350
 $(OBJDIR)tred2.o : tred2.cc $(Headers_JSC)
350
 $(OBJDIR)tred2.o : tred2.cc $(Headers_JSC)
453
 
453
 
454
 ############################################
454
 ############################################
455
 
455
 
456
-#executables : 
456
+#executables :
457
 #	$(COMPILE) $(EXECSDIR)LiebLin_DSF.cc -o $(BINDIR)LiebLin_DSF -l$(VERSION)
457
 #	$(COMPILE) $(EXECSDIR)LiebLin_DSF.cc -o $(BINDIR)LiebLin_DSF -l$(VERSION)
458
 #	$(COMPILE) $(EXECSDIR)Smoothen_LiebLin_DSF.cc -o $(BINDIR)Smoothen_LiebLin_DSF -l$(VERSION)
458
 #	$(COMPILE) $(EXECSDIR)Smoothen_LiebLin_DSF.cc -o $(BINDIR)Smoothen_LiebLin_DSF -l$(VERSION)
459
 #	$(COMPILE) $(EXECSDIR)Heis_DSF.cc -o $(BINDIR)Heis_DSF -l$(VERSION)
459
 #	$(COMPILE) $(EXECSDIR)Heis_DSF.cc -o $(BINDIR)Heis_DSF -l$(VERSION)
462
 ###########################################
462
 ###########################################
463
 # Executables (parallel versions)
463
 # Executables (parallel versions)
464
 
464
 
465
-parallel : 
465
+parallel :
466
 #	$(COMPILE_MPI) $(EXECSDIR)LiebLin_DSF_par.cc -o $(BINDIR)LiebLin_DSF_par -l$(VERSION)
466
 #	$(COMPILE_MPI) $(EXECSDIR)LiebLin_DSF_par.cc -o $(BINDIR)LiebLin_DSF_par -l$(VERSION)
467
 	$(COMPILE_MPI) $(EXECSDIR)LiebLin_DSF_par_Prepare.cc -o $(BINDIR)LiebLin_DSF_par_Prepare -l$(VERSION)
467
 	$(COMPILE_MPI) $(EXECSDIR)LiebLin_DSF_par_Prepare.cc -o $(BINDIR)LiebLin_DSF_par_Prepare -l$(VERSION)
468
 	$(COMPILE_MPI) $(EXECSDIR)LiebLin_DSF_par_Run.cc -o $(BINDIR)LiebLin_DSF_par_Run -l$(VERSION)
468
 	$(COMPILE_MPI) $(EXECSDIR)LiebLin_DSF_par_Run.cc -o $(BINDIR)LiebLin_DSF_par_Run -l$(VERSION)
488
 	/bin/rm -f $(Objects_ALL)
488
 	/bin/rm -f $(Objects_ALL)
489
 	/bin/rm -f $(LIBDIR)$(VERSION)
489
 	/bin/rm -f $(LIBDIR)$(VERSION)
490
 	/bin/rm -f $(EXECS)
490
 	/bin/rm -f $(EXECS)
491
-
492
-

+ 2
- 0
bin/.gitignore View File

1
+*
2
+!.gitignore

+ 2
- 0
lib/.gitignore View File

1
+*
2
+!.gitignore

+ 2
- 0
obj/.gitignore View File

1
+*
2
+!.gitignore

+ 2
- 2
src/COMBI/Combinatorics.cc View File

20
 
20
 
21
 namespace JSC {
21
 namespace JSC {
22
 
22
 
23
-  Choose_Table::Choose_Table () 
23
+  Choose_Table::Choose_Table ()
24
     : Npower(0ULL), Npowerp1(1ULL), table(new unsigned long long int[1])
24
     : Npower(0ULL), Npowerp1(1ULL), table(new unsigned long long int[1])
25
   {
25
   {
26
     table[0] = 1ULL;
26
     table[0] = 1ULL;
32
     dim = Npowerp1 * Npowerp1;
32
     dim = Npowerp1 * Npowerp1;
33
 
33
 
34
     // We can only go up to ULL_MAX:
34
     // We can only go up to ULL_MAX:
35
-    if (log(DP(ULONG_LONG_MAX)) < DP(Npowerp1) * log(2.0))
35
+    if (log(DP(ULLONG_MAX)) < DP(Npowerp1) * log(2.0))
36
       JSCerror("Choose_Table:  too large to contruct.");
36
       JSCerror("Choose_Table:  too large to contruct.");
37
 
37
 
38
     table = new unsigned long long int[dim];
38
     table = new unsigned long long int[dim];

Loading…
Cancel
Save