From d480854b553aff6d4d03b2e4c7d86819a68ade3e Mon Sep 17 00:00:00 2001
From: xaw5719 <xaw5719@thor.cs.wmich.edu>
Date: Wed, 3 Aug 2016 14:23:21 -0400
Subject: [PATCH] increased number of walkers for mcmc, and updated thor script

---
 scripts/analyze_lightcurves.sh    |  5 +++--
 scripts/templates/thor_submit.pbs |  2 +-
 src/makefile                      | 14 +++++++++-----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/scripts/analyze_lightcurves.sh b/scripts/analyze_lightcurves.sh
index 97c3f82..6c85094 100755
--- a/scripts/analyze_lightcurves.sh
+++ b/scripts/analyze_lightcurves.sh
@@ -8,7 +8,7 @@ refpsd_params="6.533e-02 -9.694e-02 -1.175e+00 -1.525e+00 -2.166e+00 -2.492e+00
 #refpsd_params="7.376e-02 -1.976e-01 -1.182e+00 -1.521e+00 -2.144e+00 -2.503e+00 -3.580e+00 -1.233e+01"
 
 
-error_type="0"
+error_type="2"
 # error types:
 #   0 for covariance matrix, 1 for likelihood function, 2 for monte carlo
 case $error_type in
@@ -110,7 +110,8 @@ do
     echo "0:0 0" >> tmp.psdlagargs
     echo $error_type >> tmp.psdlagargs
     echo "0" >> tmp.psdlagargs
-    echo -n "1000 50 50 mcmc_${echo_band}.dat" >> tmp.psdlagargs
+	# Use 10x num vars for walkers
+    echo -n "1000 50 400 mcmc_${echo_band}.dat" >> tmp.psdlagargs
 
     # Run psdlag with inputs
     if [[ -e $outputfile ]]
diff --git a/scripts/templates/thor_submit.pbs b/scripts/templates/thor_submit.pbs
index 5dfb284..7d538cd 100644
--- a/scripts/templates/thor_submit.pbs
+++ b/scripts/templates/thor_submit.pbs
@@ -1,7 +1,7 @@
 #!/bin/sh -login
 #PBS -l mem=64GB
 #PBS -l nodes=1:ppn=1:research
-#PBS -l walltime=4:00:00
+#PBS -l walltime=2:00:00
 #PBS -N "%NAME%"
 #PBS -j oe
 
diff --git a/src/makefile b/src/makefile
index 7eeffac..08bd484 100644
--- a/src/makefile
+++ b/src/makefile
@@ -1,9 +1,13 @@
 
-
+# original
 #libdir='/eos/azoghbi/soft/usr/lib'
 #incdir='/eos/azoghbi/soft/usr/include'
-libdir='/home/caes/science/psdlag-agn/src/inc'
-incdir='/home/caes/science/psdlag-agn/src/inc'
-
+# most systems
+#libdir='/home/caes/science/psdlag-agn/src/inc'
+#incdir='/home/caes/science/psdlag-agn/src/inc'
+# thor
+libdir='/home/research/xaw5719/psdlag-agn/src/inc'
+alglibdir='/home/research/xaw5719/psdlag-agn/src/inc/alglib'
+incdir='/home/research/xaw5719/psdlag-agn/src/inc'
 psdlag:
-	g++ *cpp -o psdlag -O3 -Wall -lalglib -I${incdir} -L${libdir}
+	g++ *cpp inc/alglib/*cpp -o psdlag -O3 -Wall -I${incdir} -L${libdir} -L${alglibdir} -I${alglibdir}