diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..54ab2dce4cbad891ae062d8d22eeb6bd9d361dee Binary files /dev/null and b/.DS_Store differ diff --git a/.vscode/ipch/35cad72f353efd73/lsqr.ipch b/.vscode/ipch/35cad72f353efd73/lsqr.ipch new file mode 100644 index 0000000000000000000000000000000000000000..348399c7626469e0109ac4e9eb2847ef10ce1c80 Binary files /dev/null and b/.vscode/ipch/35cad72f353efd73/lsqr.ipch differ diff --git a/.vscode/ipch/35cad72f353efd73/mmap_address.bin b/.vscode/ipch/35cad72f353efd73/mmap_address.bin new file mode 100644 index 0000000000000000000000000000000000000000..71307aba69936426bbbcb4dbf2d50dfa1afc5d76 Binary files /dev/null and b/.vscode/ipch/35cad72f353efd73/mmap_address.bin differ diff --git a/.vscode/ipch/59ca8537d73ac48d/mmap_address.bin b/.vscode/ipch/59ca8537d73ac48d/mmap_address.bin new file mode 100644 index 0000000000000000000000000000000000000000..71307aba69936426bbbcb4dbf2d50dfa1afc5d76 Binary files /dev/null and b/.vscode/ipch/59ca8537d73ac48d/mmap_address.bin differ diff --git a/.vscode/ipch/59ca8537d73ac48d/util.ipch b/.vscode/ipch/59ca8537d73ac48d/util.ipch new file mode 100644 index 0000000000000000000000000000000000000000..fbe0531c2c090a881a1ea1af54d743a5d74918a4 Binary files /dev/null and b/.vscode/ipch/59ca8537d73ac48d/util.ipch differ diff --git a/.vscode/ipch/660daf6570cee90f/mmap_address.bin b/.vscode/ipch/660daf6570cee90f/mmap_address.bin new file mode 100644 index 0000000000000000000000000000000000000000..71307aba69936426bbbcb4dbf2d50dfa1afc5d76 Binary files /dev/null and b/.vscode/ipch/660daf6570cee90f/mmap_address.bin differ diff --git a/.vscode/ipch/7be66e877fa30d8d/mmap_address.bin b/.vscode/ipch/7be66e877fa30d8d/mmap_address.bin new file mode 100644 index 0000000000000000000000000000000000000000..71307aba69936426bbbcb4dbf2d50dfa1afc5d76 Binary files /dev/null and b/.vscode/ipch/7be66e877fa30d8d/mmap_address.bin differ diff --git a/.vscode/ipch/7be66e877fa30d8d/solvergaiaSim.ipch b/.vscode/ipch/7be66e877fa30d8d/solvergaiaSim.ipch new file mode 100644 index 0000000000000000000000000000000000000000..21c6ee9ad455729468eeeacc0b90fa992e1e90f4 Binary files /dev/null and b/.vscode/ipch/7be66e877fa30d8d/solvergaiaSim.ipch differ diff --git a/.vscode/ipch/7f41be3b9bd0b7ec/mmap_address.bin b/.vscode/ipch/7f41be3b9bd0b7ec/mmap_address.bin new file mode 100644 index 0000000000000000000000000000000000000000..71307aba69936426bbbcb4dbf2d50dfa1afc5d76 Binary files /dev/null and b/.vscode/ipch/7f41be3b9bd0b7ec/mmap_address.bin differ diff --git a/.vscode/ipch/85961a67eb30c7a3/lsqr.ipch b/.vscode/ipch/85961a67eb30c7a3/lsqr.ipch new file mode 100644 index 0000000000000000000000000000000000000000..3230e50830a18f50486128b848cd55369d8d50bb Binary files /dev/null and b/.vscode/ipch/85961a67eb30c7a3/lsqr.ipch differ diff --git a/.vscode/ipch/85961a67eb30c7a3/mmap_address.bin b/.vscode/ipch/85961a67eb30c7a3/mmap_address.bin new file mode 100644 index 0000000000000000000000000000000000000000..71307aba69936426bbbcb4dbf2d50dfa1afc5d76 Binary files /dev/null and b/.vscode/ipch/85961a67eb30c7a3/mmap_address.bin differ diff --git a/.vscode/ipch/cad543ef6b9de465/lsqrblas.ipch b/.vscode/ipch/cad543ef6b9de465/lsqrblas.ipch new file mode 100644 index 0000000000000000000000000000000000000000..2763a46c02c81e4a509c2f4fac6ee5e8e6ee8dbc Binary files /dev/null and b/.vscode/ipch/cad543ef6b9de465/lsqrblas.ipch differ diff --git a/.vscode/ipch/cad543ef6b9de465/mmap_address.bin b/.vscode/ipch/cad543ef6b9de465/mmap_address.bin new file mode 100644 index 0000000000000000000000000000000000000000..71307aba69936426bbbcb4dbf2d50dfa1afc5d76 Binary files /dev/null and b/.vscode/ipch/cad543ef6b9de465/mmap_address.bin differ diff --git a/GaiaGsrParSim b/GaiaGsrParSim new file mode 100755 index 0000000000000000000000000000000000000000..0a6cb5c6896514f89dbcac26744e306710081b61 Binary files /dev/null and b/GaiaGsrParSim differ diff --git a/Makefile.marconi_new b/Makefile.marconi_new new file mode 100644 index 0000000000000000000000000000000000000000..d5ce443830e3162c2f6bcecc2e1d968f1e8cec4b --- /dev/null +++ b/Makefile.marconi_new @@ -0,0 +1,38 @@ +# Gaia GSRPar Makefile + +COMPILER = mpiicpc -qopenmp -DOMP +COMPILERCPP = mpiicpc -qopenmp -DOMP + +CC = $(COMPILER) +CPP= $(COMPILERCPP) + +CFITSIOLIB=$(CFITSIO_LIB) + +GAIAINC=. + +GAIAGSRSIM= aprod.o lsqrblas.o lsqr.o solvergaiaSim.o util.o +MEMREQ= memRequest.o + + +##INCLUDE = -I$(GAIAINC) -I/opt/local/include -I/opt/local/include/mpich2 -I/opt/cluster/cfitsio/intel/2017.1/include/ +INCLUDE = -I$(GAIAINC) -I$(CFITSIO_INC) +#INCLUDE = -I$(GAIAINC) +#CFLAGS= $(INCLUDE) -std=c99 +#CPPFLAGS= $(INCLUDE) -g -fsanitize=address -mllvm -asan-stack +#CPPFLAGS= $(INCLUDE) -lirc -limf -lsvml +CPPFLAGS= $(INCLUDE) -DOMP= +LIB = -L$(CFITSIOLIB) -lcfitsio -lm + + +all: GaiaGsrParSim +###all: GaiaGsrPar MemReq GaiaGsrParTest GaiaFits2Bin GaiaBin2Fits GaiaBin2Reduced + +GaiaGsrParSim: $(GAIAGSRSIM) + $(CPP) $(CPPFLAGS) -o GaiaGsrParSim $(GAIAGSRSIM) $(INCLUDE) $(LIB) + +MemReq: $(MEMREQ) + $(CPP) $(CPPFLAGS) -o MemReq $(MEMREQ) $(INCLUDE) $(LIB) + +clean: + rm -f *.o core + diff --git a/Makefile_marconi b/Makefile_marconi new file mode 100644 index 0000000000000000000000000000000000000000..9e08b9fd3fbdc326de6582ebc376fa7926d01d5a --- /dev/null +++ b/Makefile_marconi @@ -0,0 +1,81 @@ +# Gaia GSRPar Makefile + +##COMPILER = mpiicpc -g -traceback -O3 -qopenmp +##COMPILERCPP = mpiicpc -g -traceback -O3 -qopenmp +COMPILER = mpiicpc -O3 -qopenmp +COMPILERCPP = mpiicpc -O3 -qopenmp + +CC = $(COMPILER) +CPP = $(COMPILERCPP) + + +# CFITSIOLIB=/opt/cfitsio/lib +#CFITSIOLIB=/cineca/prod/opt/libraries/cfitsio/3.390/intel--pe-xe-2016--binary/lib/ +CFITSIOLIB=$(CFITSIO_LIB) + +GAIAINC=. + + +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/cfitsio/include +#INCLUDE = -I$(GAIAINC) -I/cineca/prod/opt/libraries/cfitsio/3.390/intel--pe-xe-2016--binary/include/ +INCLUDE = -I$(GAIAINC) -I$(CFITSIO_INC) +CPPFLAGS= $(INCLUDE) -DOMP= +LIB = -L$(CFITSIOLIB) -lcfitsio -lm + +all: GaiaGsrPar MemReq GaiaGsrParSim GaiaFits2Bin GaiaBin2Fits GaiaBin2Reduced GaiaCkEmptyCols GaiaBin2Asc GaiaChTask GaiaRepTask +###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) -o GaiaGsrPar $(GAIAGSR) $(INCLUDE) $(LIB) + +MemReq: $(MEMREQ) + $(CPP) -o MemReq $(MEMREQ) $(INCLUDE) $(LIB) + +GaiaGsrParSim: $(GAIAGSRSIM) + $(CPP) -o GaiaGsrParSim $(GAIAGSRSIM) $(INCLUDE) $(LIB) + +GaiaFits2Bin: $(GAIAGSRFits2Bin) + $(CPP) -o GaiaFits2Bin $(GAIAGSRFits2Bin) $(INCLUDE) $(LIB) + +GaiaBin2Fits: $(GAIAGSRBin2Fits) + $(CPP) -o GaiaBin2Fits $(GAIAGSRBin2Fits) $(INCLUDE) $(LIB) + +GaiaBin2Reduced: $(GAIAGSRBin2Reduced) + $(CPP) -o GaiaBin2Reduced $(GAIAGSRBin2Reduced) $(INCLUDE) $(LIB) + +GaiaBin2Asc: $(GAIAGSRBin2Asc) + $(CPP) -o GaiaBin2Asc $(GAIAGSRBin2Asc) $(INCLUDE) $(LIB) + +GaiaChTask: $(GAIAGSRChTask) + $(CPP) -o GaiaChTask $(GAIAGSRChTask) $(LIB) + +GaiaCkEmptyCols: $(GAIAGSRCkEmptyCols) + $(CPP) -o GaiaCkEmptyCols $(GAIAGSRCkEmptyCols) $(LIB) + +GaiaRepTask: $(GAIAGSRRepairTask) + $(CPP) $(CPPFLAGS) -o GaiaRepairTask $(GAIAGSRRepairTask) $(LIB) + +clean: + rm -f *.o core + diff --git a/a b/a new file mode 100644 index 0000000000000000000000000000000000000000..8243688b002ac7237467477fdcecfc22f883fccf --- /dev/null +++ b/a @@ -0,0 +1 @@ +scp *.c *.cpp *.h ubecciani@ssh.hca.bsc.es:/home/ubecciani/AVU-GSR/OMP/src/