From 5506e15ef12e953301cb36be271ae7ab2e498005 Mon Sep 17 00:00:00 2001
From: Antoine TRAN <trana@visu01.sis.cnes.fr>
Date: Mon, 16 Jan 2023 10:37:59 +0000
Subject: [PATCH] run/scenarios/*.sh remove set_proxy

---
 run/scenarios/helloworld.sh      |  1 -
 run/scenarios/nominal.sh         |  1 -
 run/scenarios/profiling.sh       |  1 -
 run/scenarios/quicktest-trana.sh | 26 ++++++++++++++++++++++++++
 run/scenarios/quicktest.sh       |  1 -
 5 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100755 run/scenarios/quicktest-trana.sh

diff --git a/run/scenarios/helloworld.sh b/run/scenarios/helloworld.sh
index ff76e3b..3fefe8c 100755
--- a/run/scenarios/helloworld.sh
+++ b/run/scenarios/helloworld.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-. ~/set_proxy.sh
 sifFile=/work/SC/lisa/${USER}/cnes-lisa-globalfit1-idasoft-hpc.sif
 
 # select=Number of node
diff --git a/run/scenarios/nominal.sh b/run/scenarios/nominal.sh
index 47e496a..cdae0c0 100755
--- a/run/scenarios/nominal.sh
+++ b/run/scenarios/nominal.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-. ~/set_proxy.sh
 sifFile=/work/SC/lisa/${USER}/cnes-lisa-globalfit1-idasoft-hpc.sif
 
 # Default is 100000. Estimation time (depends on the ressources): default steps takes around a week. 10000 steps takes around 30min.
diff --git a/run/scenarios/profiling.sh b/run/scenarios/profiling.sh
index 751ab28..653a2a1 100755
--- a/run/scenarios/profiling.sh
+++ b/run/scenarios/profiling.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-. ~/set_proxy.sh
 sifFile=/work/SC/lisa/${USER}/cnes-lisa-globalfit1-idasoft-hpc.sif
 
 # Default is 100000. Estimation time (depends on the ressources): default steps takes around a week. 10000 steps takes around 30min.
diff --git a/run/scenarios/quicktest-trana.sh b/run/scenarios/quicktest-trana.sh
new file mode 100755
index 0000000..b9a7ccf
--- /dev/null
+++ b/run/scenarios/quicktest-trana.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+sifFile=/work/SC/lisa/${USER}/cnes-lisa-globalfit1-idasoft-hpc.sif
+
+# Default is 100000. Estimation time (depends on the ressources): default steps takes around a week. 10000 steps takes around 30min.
+steps=10000
+# select=Number of node
+# ncpus=Number of Cpus per node for all processes
+# mpiprocs=Number of Cpus per node allocated for MPI.
+pbsRss="select=1:ncpus=40:mpiprocs=8:mem=50gb:os=rh7:generation=g2019"
+# Number of OpenMP threads. The higher the lesser for walltime (better).
+ompNumThreads=5
+# Number of chains for tempering movement. Must be a multiple of OpenMP threads.
+chains=15
+walltime=00:30:00
+
+globalFitMode=full
+globalFitProfile=nominal
+
+qsubVar=pbsRss="${pbsRss}",runningMode=mpiGlobalFit,singularityFile="${sifFile}",inputFile=/work/SC/lisa/LDC/LDCdata/Challenge2/LDC2_sangria_training_v2.h5\
+,globalFitMode=${globalFitMode},globalFitProfile=${globalFitProfile}\
+,vgbFile=$PWD/run/auxiliaryfiles/${globalFitProfile}/ldc_sangria_vgb_list.dat,mbhDirectory=$PWD/run/auxiliaryfiles/${globalFitProfile}/,ucbDirectory=$PWD/run/auxiliaryfiles/${globalFitProfile}/\
+,steps="${steps}",ompNumThreads="${ompNumThreads}",chains="${chains}"
+sudo qsub -u trana -W block=false -l "${pbsRss}" -l walltime="${walltime}" -v "${qsubVar}" ./run/run_pbs.sh
+
+
diff --git a/run/scenarios/quicktest.sh b/run/scenarios/quicktest.sh
index 023ea31..f86791d 100755
--- a/run/scenarios/quicktest.sh
+++ b/run/scenarios/quicktest.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-. ~/set_proxy.sh
 sifFile=/work/SC/lisa/${USER}/cnes-lisa-globalfit1-idasoft-hpc.sif
 
 # Default is 100000. Estimation time (depends on the ressources): default steps takes around a week. 10000 steps takes around 30min.