merge conflict

2019-09-18 09:54:09 +02:00
parent 284780d60e b577ecd124
commit 06eaec84fc
6 changed files with 10 additions and 3 deletions
--- a/matlab/run_test.m
+++ b/matlab/run_test.m
@@ -90,7 +90,7 @@ ylabel('Distance [m]');
 legend();

 %% Save
-save('mat/data_cal_pd_v.mat', 't', 'Uch', 'Ucv', ...
+save('mat/data_rep_1.mat', 't', 'Uch', 'Ucv', ...
                             'Unh', 'Unv', ...
                             'Vph', 'Vpv', ...
                             'Vch', 'Vcv', ...
--- a/matlab/setup.m
+++ b/matlab/setup.m
@@ -1 +1,2 @@
-Ts = 1e-4; % [s]
+Ts = 1e-4; % [s]
+load('../mat/K_diag.mat', 'Kd');
--- a/matlab/test_cercalo.slx
+++ b/matlab/test_cercalo.slx