adaprt to icc

batch/idl/convMC2.scr

@@ -29,7 +29,7 @@ name2=strtrim(hdr[5:n_elements(hdr)-4],2) &$
 derived,t2,name2
 
 if (n_elements(write) eq 0) then write=0
-if (write ne 0) then openplot,"compmc2.ps",xs=30,ys=30,charsize=1.5 else cgdisplay,900,700,tit=dir,/free
+if (write ne 0) then openplot,"compmc2.ps",xs=30,ys=30,charsize=1. else cgdisplay,900,700,tit=dir,/free
 if (write eq 0) then !p.thick=3 else !p.thick=8
 if (write eq 0) then !p.charsize=1
 

batch/scripts/mnuprofile.sh

@@ -120,8 +120,8 @@ EOBATCH
 
 
 #####################################################################################################################################
-qsub -P P_planck_prod -t 1-10 -pe multicores 8 -q mc_long camelrun
-#qsub -P P_planck_prod -t 1-10 -pe openmpi_8 8 -q pa_long camelrun
+qsub -P P_planck_prod -t 1-5 -pe multicores 8 -q mc_long camelrun
+qsub -P P_planck_prod -t 6-10 -pe openmpi_8 8 -q pa_long camelrun
 
 #sps=1
 #qsub -t 1-10 -pe multicores 8 -l sps=1 -q mc_long camelrun

cmt/requirements-gcc

@@ -31,6 +31,7 @@ macro_append cppflags ' -DJLA '
 #macro_append CAMEL_linkopts " -L$(MKLROOT)/lib/intel64 -lmkl_intel_lp64 -lmkl_core -lmkl_intel_thread -ljla "
 include_dirs  "/usr/include/atlas"
 macro_append  CAMEL_linkopts " -L/usr/lib64/atlas -lcblas -llapack -ljla "
+macro_append test_jla_dependencies " MinuitFit "
 
 
 #PLANCK
@@ -105,6 +106,5 @@ macro_append test_lensing_dependencies " MinuitFit "
 macro_append testCLHEP_dependencies " CLHEP "
 macro_append testBAO_dependencies " MinuitFit "
 macro_append testHiLLiPOP_dependencies " MinuitFit "
-macro_append test_jla_dependencies " MinuitFit "
 macro_append testPico_dependencies " MinuitFit "
 

cmt/requirements-gcc-atlas

@@ -56,7 +56,7 @@ macro_append CAMEL_linkopts " -L$(PICO_CODE)/build/temp.linux-x86_64-2.7 -lpico
 macro_append cppflags ' -DPICODATA=\"$(PICO_DATA)\" '
 application testPico -group=test -s=../src/camel/pico/exec testPico.cc
 
-
+###FROM THERE YOU DONT NEED TO TOUCH
 ###########################################################################################
 #CAMEL LIBRARIES
 library Minuit -no_share ../src/Minuit2-5.28.00/src/*.cxx

cmt/requirements-icc

@@ -17,11 +17,12 @@ include_dirs  "../src/camel/JLA"
 include_dirs  "../src/camel/JLA/jla_likelihood_v3/src"
 
 
-#JLA :needs cblas/lapack
-macro_append cppflags ' -DJLA '
+#JLA :requires cblas/lapack (use intel versions)
+macro_append cppflags " -DJLA "
 macro_append CAMEL_linkopts " -L$(MKLROOT)/lib/intel64 -lmkl_intel_lp64 -lmkl_core -lmkl_intel_thread -ljla "
+application test_jla -group=test -s=../src/camel test/test_jla.cc
 
-#cfitsio: use same than plc
+#cfitsio: here use same than in CLIK (laready defined below)
 #include_dirs "$(CLIKDIR)/include"
 #macro_append  CAMEL_linkopts " -L$(CLIKDIR)/lib -lcfitsio "
 
@@ -35,12 +36,13 @@ macro_append  CAMEL_linkopts " $(CLIKLIBS) "
 
 
 # PICO
+macro_append cppflags " -DPICO "
 include_dirs "/usr/local/python/python-2.7/include/python2.7"
 include_dirs "/usr/local/python/python-2.7/lib/python2.7/site-packages/numpy/core/include"
-#pypico v3-2 from plaszczy
 macro_append CAMEL_linkopts " -L$(PICO_CODE) -lpico -L/usr/local/python/python-2.7/lib -lpython2.7 "
-
 macro_append cppflags ' -DPICODATA=\"$(PICO_DATA)\" '
+application testPico -group=test -s=../src/camel/pico/exec testPico.cc
+
 
 #CAMEL LIBRARIES
 library Minuit -no_share ../src/Minuit2-5.28.00/src/*.cxx
@@ -78,8 +80,6 @@ application testBAO -group=test -s=../src/camel/test testBAO.cc
 application testHiLLiPOP -group=test -s=../src/camel/test testHiLLiPOP.cc
 application dump_clik -group=test -s=../src/camel test/test_clik.cc
 application dump_lensing -group=test -s=../src/camel test/test_lensing.cc
-application test_jla -group=test -s=../src/camel test/test_jla.cc
-application testPico -group=test -s=../src/camel/pico/exec testPico.cc
 
 #lIST OF ALL DEPENDENCIES
 macro_append Minimize_dependencies " MinuitFit "