Commit 4b2c3500 authored by Plaszczynski Stephane's avatar Plaszczynski Stephane
Browse files

clean lsst requirement

parent 36a94e63
package CAMEL package CAMEL
use class * use class HEAD
#compiler options #compiler options
macro cpp "icpc" macro cpp "icpc"
macro cppflags " -O2 -ip -ansi_alias -align -Wbrief -Wdeprecated -Wuninitialized -align -Wbrief -Wunused-function -Wpointer-arith -Wreturn-type" macro cppflags " -O2 -ip -ansi_alias -align -Wbrief -Wdeprecated -Wuninitialized -align -Wbrief -Wunused-function -Wpointer-arith -Wreturn-type"
macro_append cppflags " -g " #macro_append cppflags " -g "
#CAMEL includes #CAMEL includes
include_dirs " $(CAMELROOT)/src" include_dirs " $(CAMELROOT)/src"
...@@ -28,10 +28,12 @@ application test_jla -group=test -s=$(CAMELROOT)/src/camel test/test_jla.cc ...@@ -28,10 +28,12 @@ application test_jla -group=test -s=$(CAMELROOT)/src/camel test/test_jla.cc
#include_dirs "$(CLIKDIR)/include" #include_dirs "$(CLIKDIR)/include"
#macro_append CAMEL_linkopts " -L$(CLIKDIR)/lib -lcfitsio " #macro_append CAMEL_linkopts " -L$(CLIKDIR)/lib -lcfitsio "
#include_dirs "$(CFITSIODIR)/include" include_dirs "$(CFITSIODIR)/include"
#macro_append CAMEL_linkopts " -L$(CFITSIODIR)/lib -lcfitsio " macro_append CAMEL_linkopts " -L$(CFITSIODIR)/lib -lcfitsio "
include_dirs "/usr/include/cfitsio" #include_dirs "/usr/include/cfitsio"
macro_append CAMEL_linkopts " -lcfitsio " #macro_append CAMEL_linkopts " -lcfitsio "
#PLANCK #PLANCK
# CLIKCFLAGS/CLIKLIBS are defined when calling camel_setup.sh # CLIKCFLAGS/CLIKLIBS are defined when calling camel_setup.sh
#macro_append cppflags " -DCLIK $(CLIKCFLAGS)" #macro_append cppflags " -DCLIK $(CLIKCFLAGS)"
......
...@@ -75,6 +75,7 @@ cat > camelrun <<EOBATCH ...@@ -75,6 +75,7 @@ cat > camelrun <<EOBATCH
#!/bin/bash #!/bin/bash
cd \$TMPDIR cd \$TMPDIR
ulimit -S -c unlimited # for coredumps
uname -a uname -a
echo "NSLOTS=\$NSLOTS" echo "NSLOTS=\$NSLOTS"
...@@ -124,6 +125,8 @@ export OMP_NUM_THREADS=$NCORES ...@@ -124,6 +125,8 @@ export OMP_NUM_THREADS=$NCORES
./Minimize parfile bestfit covmat ./Minimize parfile bestfit covmat
cp -f bestfit $OUTDIR/best_fit\${SGE_TASK_ID} cp -f bestfit $OUTDIR/best_fit\${SGE_TASK_ID}
cp -f covmat $OUTDIR/covmat\${SGE_TASK_ID}.dat cp -f covmat $OUTDIR/covmat\${SGE_TASK_ID}.dat
cp -f core* $OUTDIR/core_\${SGE_TASK_ID}
EOBATCH EOBATCH
############################################################################################## ##############################################################################################
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment