brought things into line with new compiler

Author: danielsf

MCMC/Makefile

@@ -29,12 +29,12 @@ MAPSOBJ = $(MAPSDIR)containers.o $(MAPSDIR)goto_tools.o $(MAPSDIR)kd.o $(MAPSDIR
 $(MAPSDIR)chisq.o $(MAPSDIR)aps_extractor.o
 
 #do not use these compilers with omp
-#gg = g++ -Wno-write-strings -O3
-#ff = gfortran -O3
+gg = g++ -Wno-write-strings -O3
+ff = gfortran -O3
 
 #use these compilers if you are going to use omp
-gg = /opt/local/bin/g++-mp-4.8 -Wno-write-strings -O3 -fopenmp -DUSE_OPENMP -g
-ff = /opt/local/bin/gfortran-mp-4.8 -O3 -g
+#gg = /opt/local/bin/g++-mp-4.8 -Wno-write-strings -O3 -fopenmp -DUSE_OPENMP -g
+#ff = /opt/local/bin/gfortran-mp-4.8 -O3 -g
 
 mcmc_extractor.o: mcmc_extractor.h mcmc_extractor.cpp
 	$(gg) -c mcmc_extractor.cpp

MCMC/mcmc_s_curve.cpp

@@ -13,7 +13,7 @@ double euclideanDistance(array_1d<double>& p1, array_1d<double> &p2){
 
 }
 
-main(int iargc, char *argv[]){
+int main(int iargc, char *argv[]){
 
 int seed=99;
 

MCMC/mcmc_s_curve_extractor.cpp

@@ -4,7 +4,7 @@
 #include "../chisq.h"
 #include "../aps_extractor.h"
 
-main(int iargc, char *argv[]){
+int main(int iargc, char *argv[]){
 
 int seed=99;
 

MCMC/mcmc_test.cpp

@@ -13,7 +13,7 @@ double euclideanDistance(array_1d<double>& p1, array_1d<double> &p2){
 
 }
 
-main(int iargc, char *argv[]){
+int main(int iargc, char *argv[]){
 
 int seed=99;
 

Makefile

@@ -24,12 +24,12 @@ WMAP_LIBRARIES = $(LIBRARIES) $(WMAP_LIB) $(CAMB_LIB) $(CFITSIO_LIB)
 WMAP_INCLUDE = $(INCLUDE) $(CAMB_INC) $(WMAP_INC)
 
 #do not use these compilers with omp
-#gg = g++ -Wno-write-strings -O3
-#ff = gfortran -O3
+gg = g++ -Wno-write-strings -O3
+ff = gfortran -O3
 
 #use these compilers if you are going to use omp
-gg = /opt/local/bin/g++-mp-4.8 -Wno-write-strings -O3 -fopenmp -DUSE_OPENMP -g
-ff = /opt/local/bin/gfortran-mp-4.8 -O3 -g
+#gg = /opt/local/bin/g++-mp-4.8 -Wno-write-strings -O3 -fopenmp -DUSE_OPENMP -g
+#ff = /opt/local/bin/gfortran-mp-4.8 -O3 -g
 
 containers.o: containers.cpp containers.h
 	$(gg) -c containers.cpp

aps_extraction_runner.cpp

@@ -12,7 +12,7 @@ the executable aps_extract will then run this file
 
 #include "aps_extractor.h"
 
-main(){
+int main(){
 
 char sizeflag[100];
 char outname[letters];

aps_runner_ellipses.cpp

@@ -3,7 +3,7 @@
 #include <time.h>
 #include "aps.h"
 
-main(int iargc, char *argv[]){
+int main(int iargc, char *argv[]){
 
 //d=8 -> delta_chisq=15.5
 //d=5 -> delta_chisq=11

aps_runner_s_curve.cpp

@@ -3,7 +3,7 @@
 #include <time.h>
 #include "aps.h"
 
-main(int iargc, char *argv[]){
+int main(int iargc, char *argv[]){
 
 //d=8 -> delta_chisq=15.5
 //d=5 -> delta_chisq=11

aps_s_curve_coverage.cpp

@@ -3,7 +3,7 @@
 #include <time.h>
 #include "aps.h"
 
-main(int iargc, char *argv[]){
+int main(int iargc, char *argv[]){
 
 //d=8 -> delta_chisq=15.5
 //d=5 -> delta_chisq=11

box.cpp

@@ -1103,7 +1103,7 @@ int box::get_contents(int dex, int ii){
     }
 
     if(ii<0 || ii>=box_contents.get_cols(dex)){
-        printf("WARNING asked for the %dth content of box %d but only have %d\n",
+        printf("WARNING asked for the %dth content of box %d but only have %d\n",dex,
         ii,box_contents.get_cols(dex));
 
         exit(1);

chisq.cpp

@@ -664,7 +664,7 @@ void s_curve::get_trough_points(array_2d<double> &outpoints){
 
         chival=(*this)(vv);
         if(chival>0.01){
-            printf("WARNING in center %d trough chival %e\n",chival);
+            printf("WARNING in center %d trough chival %e\n",i,chival);
             exit(1);
         }
         outpoints.add_row(vv);

containers.cpp

@@ -1781,20 +1781,20 @@ int get_dex(const array_1d<T> &xx, T target){
     if(i==0){
         if(target>xx.get_data(1)){
             printf("WARNING spuriously got zero in get_dex\n");
-            printf("%e %e\n",target,xx.get_data(1));
+            printf("%e %e\n",double(target),double(xx.get_data(1)));
             exit(1);
         }
     }
     else if(i==xx.get_dim()-1){
         if(target<xx.get_data(i-1)){
             printf("WARNING spuriously got max in get_dex\n");
-            printf("%e %e\n",target,xx.get_data(i-1));
+            printf("%e %e\n",double(target),double(xx.get_data(i-1)));
             exit(1);
         }
     }
     else if(target>xx.get_data(i) || target<xx.get_data(i-1)){
         printf("WARNING getdex failed %e -- %e %e\n",
-        target,xx.get_data(i-1),xx.get_data(i));
+        double(target),double(xx.get_data(i-1)),double(xx.get_data(i)));
         printf("%d %d\n",i,xx.get_dim()-1);
         exit(1);
     }

s_curve_analyzer.cpp

@@ -2,7 +2,7 @@
 #include "gp_wrapper.h"
 #include "aps_extractor.h"
 
-main(int iargc, char *argv[]){
+int main(int iargc, char *argv[]){
 
 int i,j;
 array_1d<double> lnchi_hist,xmin,xmax,chi_hist;

s_curve_control.cpp

@@ -1,6 +1,6 @@
 #include "chisq.h"
 
-main(){
+int main(){
 
 //d=5 means delta_chisq=11
 int dim=22,ncenters=3;

test_box.cpp

@@ -1,6 +1,6 @@
 #include "box.h"
 
-main(){
+int main(){
 
 Ran chaos(99);
 

test_containers.cpp

@@ -37,7 +37,7 @@ if(vector.get_dim()!=dim){
 matrix.add_row(vector);
 
 if(matrix.get_cols()!=dim){
-    printf("WARNING matrix cols should be dim is %d\n",dim,matrix.get_cols());
+    printf("WARNING matrix cols should be %d is %d\n",dim,matrix.get_cols());
     exit(1);
 }
 
@@ -552,7 +552,7 @@ if(i_vector.get_dim()!=dim){
 i_matrix.add_row(i_vector);
 
 if(i_matrix.get_cols()!=dim){
-    printf("WARNING matrix cols should be dim is %d\n",dim,i_matrix.get_cols());
+    printf("WARNING matrix cols should be %d is %d\n",dim,i_matrix.get_cols());
     exit(1);
 }
 

test_eigen.cpp

@@ -6,7 +6,7 @@
 #include "containers.h"
 #include "eigen_wrapper.h"
 
-main(int iargc, char *argv[]){
+int main(int iargc, char *argv[]){
 
 int seed=67;
 

test_kd.cpp

@@ -5,7 +5,7 @@
 #include "containers.h"
 #include "kd.h"
 
-main(int iarg, char *argv[]){
+int main(int iarg, char *argv[]){
 
 double tol=1.0e-12;
 int seed=71;