updated Makefile

Makefile

 # Gaia GSRPar Makefile
 
-COMPILER = /opt/ompss/bin/mcc
-##COMPILER = /opt/openmpi_icc/bin/mpic++ 
-COMPILERCPP =  /opt/ompss/bin/mcxx --ompss -DOMP
-##COMPILERCPP =  /opt/openmpi_icc/bin/mpic++ 
+COMPILER = mpiicpc  -qopenmp -DOMP
+COMPILERCPP = mpiicpc -qopenmp -DOMP
 
-CC = $(COMPILERCPP)
+CC = $(COMPILER)
 CPP= $(COMPILERCPP)
 
 
-CFITSIOLIB=/opt/cfitsio3_1_0/lib
+CFITSIOLIB=/opt/cluster/cfitsio/intel/2017.1/lib/ 
 
+GAIAINC=/u/ubecciani/EuroExa/CoreApp7.2/src
 
-
-
-GAIAINC=/home-volume/ube/Gaia/ParallelCodeV7/src7.2
-
-
-
-GAIAGSR= aprod.o  lsqrblas.o  lsqr.o  solvergaia.o util.o  
 GAIAGSRSIM= aprod.o  lsqrblas.o  lsqr.o  solvergaiaSim.o util.o  
-GAIAGSRFits2Bin= fits2bin.o   util.o lsqrblas.o 
-GAIAGSRBin2Fits= bin2fits.o 
-GAIAGSRBin2Reduced= bin2reduced.o util.o lsqrblas.o 
-GAIAGSRCkEmptyCols= util.o ckemptycols.o lsqrblas.o 
-GAIAGSRBin2Asc=   bin2asc.o  
-GAIAGSRChTask= changeTask.o
-GAIAGSRRepairTask= ripristino.o
 MEMREQ= memRequest.o  
 
 
-
-INCLUDE = -I$(GAIAINC) -I/opt/local/include -I/opt/openmpi_icc/include/ -I/opt/cfitsio3_1_0/include/ -I/opt/openmpi/include -pthread
+##INCLUDE = -I$(GAIAINC) -I/opt/local/include -I/opt/local/include/mpich2  -I/opt/cluster/cfitsio/intel/2017.1/include/
+INCLUDE = -I$(GAIAINC)   -I/opt/cluster/cfitsio/intel/2017.1/include/
 #INCLUDE = -I$(GAIAINC) 
 #CFLAGS= $(INCLUDE)  -std=c99 
-CPPFLAGS= $(INCLUDE)   -g -fsanitize=address -mllvm -asan-stack
+#CPPFLAGS= $(INCLUDE) -g -fsanitize=address -mllvm -asan-stack
+#CPPFLAGS= $(INCLUDE)  -lirc -limf -lsvml
 CPPFLAGS= $(INCLUDE)  
-LIB = 	-pthread -L/usr/local/pbspro/lib -Wl,-rpath -Wl,/usr/local/pbspro/lib -Wl,-rpath -Wl,/opt/openmpi/lib -Wl,--enable-new-dtags -L/opt/openmpi/lib -lmpi	 -L$(CFITSIOLIB) -lcfitsio -lm
+LIB = -L$(CFITSIOLIB) -lcfitsio -lm
 
-all:	GaiaGsrParSim
 
-####all: GaiaGsrPar MemReq GaiaGsrParSim GaiaFits2Bin GaiaBin2Fits GaiaBin2Reduced GaiaCkEmptyCols GaiaBin2Asc   GaiaChTask GaiaRepTask
+all:	MemReq GaiaGsrParSim
 ###all: GaiaGsrPar MemReq GaiaGsrParTest GaiaFits2Bin GaiaBin2Fits GaiaBin2Reduced 
 
-ckemptycols.o: ckemptycols.cpp
-	$(CPP) $(CPPFLAGS)  -c ckemptycols.cpp
-	
-bin2fits.o: bin2fits.cpp
-	$(CPP) $(CPPFLAGS)  -c bin2fits.cpp
-
-bin2asc.o: bin2asc.cpp
-	$(CPP) $(CPPFLAGS)  -c bin2asc.cpp
-
-
-
-GaiaGsrPar: $(GAIAGSR)
-	$(CPP) $(CPPFLAGS) -o GaiaGsrPar $(GAIAGSR) $(INCLUDE) $(LIB)
-
-MemReq: $(MEMREQ)
-	$(CPP) $(CPPFLAGS) -o MemReq $(MEMREQ) $(INCLUDE) $(LIB)
-
 GaiaGsrParSim: $(GAIAGSRSIM)
 	$(CPP) $(CPPFLAGS) -o GaiaGsrParSim $(GAIAGSRSIM) $(INCLUDE) $(LIB)
 
-GaiaFits2Bin: $(GAIAGSRFits2Bin)
-	$(CPP) $(CPPFLAGS) -o GaiaFits2Bin $(GAIAGSRFits2Bin) $(INCLUDE) $(LIB)
-
-GaiaBin2Fits: $(GAIAGSRBin2Fits)
-	$(CPP) $(CPPFLAGS) -o GaiaBin2Fits $(GAIAGSRBin2Fits) $(INCLUDE) $(LIB)
-	
-GaiaBin2Reduced: $(GAIAGSRBin2Reduced)
-	$(CPP) $(CPPFLAGS) -o GaiaBin2Reduced $(GAIAGSRBin2Reduced) $(INCLUDE) $(LIB)
-
-GaiaBin2Asc: $(GAIAGSRBin2Asc)
-	$(CPP) $(CPPFLAGS) -o GaiaBin2Asc $(GAIAGSRBin2Asc) $(INCLUDE) $(LIB)
-
-	
-GaiaCkEmptyCols: $(GAIAGSRCkEmptyCols)
-	$(CPP) $(CPPFLAGS) -o GaiaCkEmptyCols $(GAIAGSRCkEmptyCols)   $(LIB)
-
-GaiaChTask: $(GAIAGSRChTask)
-	$(CPP)  -o GaiaChTask $(GAIAGSRChTask)   $(LIB)
-
-GaiaRepTask: $(GAIAGSRRepairTask)
-	$(CPP) $(CPPFLAGS) -o GaiaRepairTask $(GAIAGSRRepairTask)   $(LIB)
+MemReq: $(MEMREQ)
+	$(CPP) $(CPPFLAGS) -o MemReq $(MEMREQ) $(INCLUDE) $(LIB)
 
 clean:
 	rm -f *.o core
+

aprod.c

@@ -8,7 +8,6 @@
 #include "util.h"
 
 // NOTA: vedere come e cosa cambia aumentando i valori nAstroPSolved, nAttP e nInstrConst facendoli non usuali ma molto grossi
-
 void aprod(int mode, long int m, long int n, double *vVect, double *knownTerms,
            double *systemMatrix, long int *matrixIndex, int *instrCol, int *instrConstrIlung, struct comData comlsqr, time_t *ompSec)
 {