From d48436cb2f112310c2361ab897cc0a45bf79d507 Mon Sep 17 00:00:00 2001
From: XavierAdriaens <xavier.adriaens@doct.uliege.be>
Date: Wed, 12 Oct 2022 16:27:48 +0200
Subject: [PATCH] Part 3 TC3 TIK and TV trial 1

---
 input/paper3/concrete3/innerproduct_sst2.txt              | 8 --------
 .../cluster/tik/cluster_inversion_sst2_lbfgs_ls_tik.sh    | 8 ++++----
 .../cluster/tv/cluster_inversion_sst2_lbfgs_ls_tv.sh      | 8 ++++----
 input/paper3/cross/data_snr6.txt                          | 2 ++
 input/paper3/cross/data_snr7.txt                          | 2 --
 input/paper3/cross/inversion.txt                          | 2 +-
 6 files changed, 11 insertions(+), 19 deletions(-)
 delete mode 100644 input/paper3/concrete3/innerproduct_sst2.txt
 create mode 100644 input/paper3/cross/data_snr6.txt
 delete mode 100644 input/paper3/cross/data_snr7.txt

diff --git a/input/paper3/concrete3/innerproduct_sst2.txt b/input/paper3/concrete3/innerproduct_sst2.txt
deleted file mode 100644
index 4c8fb01..0000000
--- a/input/paper3/concrete3/innerproduct_sst2.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-#Inner product
-scale0 = 0.0
-innerproduct = sobolev_l2
-innerproduct_weight_bnd = 0.
-innerproduct_diag_preconditioner_smooth = 0
-innerproduct_diag_preconditioner_scale = 0
-innerproduct_preconditioner_ref = 1.2e9
-#ref = precond in at v = 0.3 km/s
diff --git a/input/paper3/cross/cluster/tik/cluster_inversion_sst2_lbfgs_ls_tik.sh b/input/paper3/cross/cluster/tik/cluster_inversion_sst2_lbfgs_ls_tik.sh
index b219b07..2521088 100644
--- a/input/paper3/cross/cluster/tik/cluster_inversion_sst2_lbfgs_ls_tik.sh
+++ b/input/paper3/cross/cluster/tik/cluster_inversion_sst2_lbfgs_ls_tik.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-#SBATCH --job-name=cross_inversion_sst2_lbfgs_ls_snr7_tik
-#SBATCH --output=cross_inversion_sst2_lbfgs_ls_snr7_tik.log
+#SBATCH --job-name=cross_inversion_sst2_lbfgs_ls_snr6_tik
+#SBATCH --output=cross_inversion_sst2_lbfgs_ls_snr6_tik.log
 
 #SBATCH --ntasks=1
-#SBATCH --time=400:00
+#SBATCH --time=600:00
 #SBATCH --mem-per-cpu=16000
 
 #SBATCH --array=0-24
@@ -12,4 +12,4 @@
 ARGS_R0=(3e-5 1e-4 3e-4 1e-3 3e-3)
 ARGS_R1=(1e-6 3e-6 1e-5 3e-5 1e-4)
 
-time ./inversion  ../input/paper3/cross/common.txt ../input/paper3/cross/inversion.txt ../input/paper3/cross/innerproduct_sst2.txt ../input/paper3/cross/localminimum_classic.txt ../input/paper3/cross/descentsearch_lbfgs_ls.txt ../input/paper3/cross/linesearch_unit.txt ../input/paper3/cross/data_snr7.txt ../input/paper3/cross/regularization_tikhonov.txt -regularization_lambdac0 ${ARGS_R0[$SLURM_ARRAY_TASK_ID % 6]} -regularization_lambdac1 ${ARGS_R1[$SLURM_ARRAY_TASK_ID / 6]} -verbose 2 -maxThreads 1 -name sst2_lbfgs_ls_snr7_tik_$SLURM_ARRAY_TASK_ID
+time ./inversion  ../input/paper3/cross/common.txt ../input/paper3/cross/inversion.txt ../input/paper3/cross/innerproduct_sst2.txt ../input/paper3/cross/localminimum_classic.txt ../input/paper3/cross/descentsearch_lbfgs_ls.txt ../input/paper3/cross/linesearch_unit.txt ../input/paper3/cross/data_snr6.txt ../input/paper3/cross/regularization_tikhonov.txt -regularization_lambdac0 ${ARGS_R0[$SLURM_ARRAY_TASK_ID % 5]} -regularization_lambdac1 ${ARGS_R1[$SLURM_ARRAY_TASK_ID / 5]} -verbose 2 -maxThreads 1 -name sst2_lbfgs_ls_snr6_tik$SLURM_ARRAY_TASK_ID
diff --git a/input/paper3/cross/cluster/tv/cluster_inversion_sst2_lbfgs_ls_tv.sh b/input/paper3/cross/cluster/tv/cluster_inversion_sst2_lbfgs_ls_tv.sh
index 49de3df..7f60404 100644
--- a/input/paper3/cross/cluster/tv/cluster_inversion_sst2_lbfgs_ls_tv.sh
+++ b/input/paper3/cross/cluster/tv/cluster_inversion_sst2_lbfgs_ls_tv.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-#SBATCH --job-name=cross_inversion_sst2_lbfgs_ls_snr7_tv
-#SBATCH --output=cross_inversion_sst2_lbfgs_ls_snr7_tv.log
+#SBATCH --job-name=cross_inversion_sst2_lbfgs_ls_snr6_tv
+#SBATCH --output=cross_inversion_sst2_lbfgs_ls_snr6_tv.log
 
 #SBATCH --ntasks=1
-#SBATCH --time=400:00
+#SBATCH --time=600:00
 #SBATCH --mem-per-cpu=16000
 
 #SBATCH --array=0-24
@@ -12,4 +12,4 @@
 ARGS_R0=(3e-5 1e-4 3e-4 1e-3 3e-3)
 ARGS_R1=(1e-6 3e-6 1e-5 3e-5 1e-4)
 
-time ./inversion  ../input/paper3/cross/common.txt ../input/paper3/cross/inversion.txt ../input/paper3/cross/innerproduct_sst2.txt ../input/paper3/cross/localminimum_classic.txt ../input/paper3/cross/descentsearch_lbfgs_ls.txt ../input/paper3/cross/linesearch_unit.txt ../input/paper3/cross/data_snr7.txt ../input/paper3/cross/regularization_totalvariation.txt -regularization_lambdac0 ${ARGS_R0[$SLURM_ARRAY_TASK_ID % 6]} -regularization_lambdac1 ${ARGS_R1[$SLURM_ARRAY_TASK_ID / 6]} -verbose 2 -maxThreads 1 -name sst2_lbfgs_ls_snr7_tv_$SLURM_ARRAY_TASK_ID
+time ./inversion  ../input/paper3/cross/common.txt ../input/paper3/cross/inversion.txt ../input/paper3/cross/innerproduct_sst2.txt ../input/paper3/cross/localminimum_classic.txt ../input/paper3/cross/descentsearch_lbfgs_ls.txt ../input/paper3/cross/linesearch_unit.txt ../input/paper3/cross/data_snr6.txt ../input/paper3/cross/regularization_totalvariation.txt -regularization_lambdac0 ${ARGS_R0[$SLURM_ARRAY_TASK_ID % 5]} -regularization_lambdac1 ${ARGS_R1[$SLURM_ARRAY_TASK_ID / 5]} -verbose 2 -maxThreads 1 -name sst2_lbfgs_ls_snr6_tv$SLURM_ARRAY_TASK_ID
diff --git a/input/paper3/cross/data_snr6.txt b/input/paper3/cross/data_snr6.txt
new file mode 100644
index 0000000..796c4f9
--- /dev/null
+++ b/input/paper3/cross/data_snr6.txt
@@ -0,0 +1,2 @@
+#Data
+data = cross_synthetics_data_snr6f
diff --git a/input/paper3/cross/data_snr7.txt b/input/paper3/cross/data_snr7.txt
deleted file mode 100644
index 1b6d1df..0000000
--- a/input/paper3/cross/data_snr7.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-#Data
-data = cross_synthetics_data_snr7f
diff --git a/input/paper3/cross/inversion.txt b/input/paper3/cross/inversion.txt
index 6997712..d75e14e 100644
--- a/input/paper3/cross/inversion.txt
+++ b/input/paper3/cross/inversion.txt
@@ -9,7 +9,7 @@ globalminimumsearch = sequentialscale
 globalminimum_n_scale=1
 #
 #Local minimum search
-localminimum_maxIteration = 150
+localminimum_maxIteration = 200
 localminimum_writeInterval = 1
 #
 n_group=1
-- 
GitLab