diff --git a/modal-analysis/data/frf_processing.zip b/modal-analysis/data/frf_processing.zip index 36a91e6..73a79a1 100644 Binary files a/modal-analysis/data/frf_processing.zip and b/modal-analysis/data/frf_processing.zip differ diff --git a/modal-analysis/data/modal_frf_coh.zip b/modal-analysis/data/modal_frf_coh.zip index cc408e0..e5e73f4 100644 Binary files a/modal-analysis/data/modal_frf_coh.zip and b/modal-analysis/data/modal_frf_coh.zip differ diff --git a/modal-analysis/figs/compare_acc_x_dir.png b/modal-analysis/figs/compare_acc_x_dir.png index 9ec3cf4..1d24023 100644 Binary files a/modal-analysis/figs/compare_acc_x_dir.png and b/modal-analysis/figs/compare_acc_x_dir.png differ diff --git a/modal-analysis/figs/compare_acc_y_dir.png b/modal-analysis/figs/compare_acc_y_dir.png index 77a36e8..94003bf 100644 Binary files a/modal-analysis/figs/compare_acc_y_dir.png and b/modal-analysis/figs/compare_acc_y_dir.png differ diff --git a/modal-analysis/figs/frf_all_bodies_one_direction.png b/modal-analysis/figs/frf_all_bodies_one_direction.png index d7bd783..86d02d5 100644 Binary files a/modal-analysis/figs/frf_all_bodies_one_direction.png and b/modal-analysis/figs/frf_all_bodies_one_direction.png differ diff --git a/modal-analysis/figs/recovered_frf_comparison_hexa.png b/modal-analysis/figs/recovered_frf_comparison_hexa.png index 4f9678f..007a534 100644 Binary files a/modal-analysis/figs/recovered_frf_comparison_hexa.png and b/modal-analysis/figs/recovered_frf_comparison_hexa.png differ diff --git a/modal-analysis/figs/recovered_frf_comparison_ty.png b/modal-analysis/figs/recovered_frf_comparison_ty.png index 5a1c9f2..ac69ef2 100644 Binary files a/modal-analysis/figs/recovered_frf_comparison_ty.png and b/modal-analysis/figs/recovered_frf_comparison_ty.png differ diff --git a/modal-analysis/figs/relative_motion_comparison.png b/modal-analysis/figs/relative_motion_comparison.png index ad90d72..7d96d19 100644 Binary files a/modal-analysis/figs/relative_motion_comparison.png and b/modal-analysis/figs/relative_motion_comparison.png differ diff --git a/modal-analysis/frf_processing.html b/modal-analysis/frf_processing.html index 7959ff2..a07e6b3 100644 Binary files a/modal-analysis/frf_processing.html and b/modal-analysis/frf_processing.html differ diff --git a/modal-analysis/frf_processing.org b/modal-analysis/frf_processing.org index cf98679..354b472 100644 --- a/modal-analysis/frf_processing.org +++ b/modal-analysis/frf_processing.org @@ -276,7 +276,7 @@ We can also compare all the DOFs of one solid body (figure [[fig:frf_one_body_al figure; - ax1 = subaxis(2, 1, 1); + ax1 = subplot(2, 1, 1); hold on; for solid_i = solids_i plot(freqs, abs(squeeze(FRFs_O((solid_i-1)*6+dir_i, exc_dir, :))), 'DisplayName', solid_names{solid_i}); @@ -288,7 +288,7 @@ We can also compare all the DOFs of one solid body (figure [[fig:frf_one_body_al legend('Location', 'northwest'); title(sprintf('FRF between %s and %s', exc_names{exc_dir}, DOFs{dir_i})); - ax2 = subaxis(2, 1, 2); + ax2 = subplot(2, 1, 2); hold on; for solid_i = solids_i plot(freqs, mod(180+180/pi*phase(squeeze(FRFs_O((solid_i-1)*6+dir_i, exc_dir, :))), 360)-180); @@ -375,7 +375,7 @@ This normalized relative motion is shown on figure [[fig:relative_motion_compari figure; for i = 2:6 - subaxis(3, 2, i); + subplot(3, 2, i); hold on; for dir_i = dirs_i H = (squeeze(FRFs_O((i-1)*6+dir_i, exc_dir, :))-squeeze(FRFs_O((i-2)*6+dir_i, exc_dir, :)))./(abs(squeeze(FRFs_O((i-1)*6+dir_i, exc_dir, :)))+abs(squeeze(FRFs_O((i-2)*6+dir_i, exc_dir, :)))); @@ -473,7 +473,7 @@ The FRF are matching well until 100Hz. for i = 1:length(accs_i) acc_i = accs_i(i); - subaxis(2, 2, i); + subplot(2, 2, i); hold on; for dir_i = 1:3 @@ -525,7 +525,7 @@ The FRF are matching well until 100Hz. for i = 1:length(accs_i) acc_i = accs_i(i); - subaxis(2, 2, i); + subplot(2, 2, i); hold on; for dir_i = 1:3 diff --git a/modal-analysis/mat/frf_coh_matrices.mat b/modal-analysis/mat/frf_coh_matrices.mat index 7175cfd..9853574 100644 Binary files a/modal-analysis/mat/frf_coh_matrices.mat and b/modal-analysis/mat/frf_coh_matrices.mat differ diff --git a/modal-analysis/matlab/frf_processing.m b/modal-analysis/matlab/frf_processing.m index dcc13af..97be3b7 100644 --- a/modal-analysis/matlab/frf_processing.m +++ b/modal-analysis/matlab/frf_processing.m @@ -75,7 +75,7 @@ exc_dir = 1; figure; -ax1 = subaxis(2, 1, 1); +ax1 = subplot(2, 1, 1); hold on; for solid_i = solids_i plot(freqs, abs(squeeze(FRFs_O((solid_i-1)*6+dir_i, exc_dir, :))), 'DisplayName', solid_names{solid_i}); @@ -87,7 +87,7 @@ ylabel('Amplitude'); legend('Location', 'northwest'); title(sprintf('FRF between %s and %s', exc_names{exc_dir}, DOFs{dir_i})); -ax2 = subaxis(2, 1, 2); +ax2 = subplot(2, 1, 2); hold on; for solid_i = solids_i plot(freqs, mod(180+180/pi*phase(squeeze(FRFs_O((solid_i-1)*6+dir_i, exc_dir, :))), 360)-180); @@ -160,7 +160,7 @@ exc_dir = 1; figure; for i = 2:6 - subaxis(3, 2, i); + subplot(3, 2, i); hold on; for dir_i = dirs_i H = (squeeze(FRFs_O((i-1)*6+dir_i, exc_dir, :))-squeeze(FRFs_O((i-2)*6+dir_i, exc_dir, :)))./(abs(squeeze(FRFs_O((i-1)*6+dir_i, exc_dir, :)))+abs(squeeze(FRFs_O((i-2)*6+dir_i, exc_dir, :)))); @@ -244,7 +244,7 @@ figure; for i = 1:length(accs_i) acc_i = accs_i(i); - subaxis(2, 2, i); + subplot(2, 2, i); hold on; for dir_i = 1:3 @@ -292,7 +292,7 @@ figure; for i = 1:length(accs_i) acc_i = accs_i(i); - subaxis(2, 2, i); + subplot(2, 2, i); hold on; for dir_i = 1:3 diff --git a/modal-analysis/matlab/modal_frf_coh.m b/modal-analysis/matlab/modal_frf_coh.m index d30bf9f..442ba3c 100644 --- a/modal-analysis/matlab/modal_frf_coh.m +++ b/modal-analysis/matlab/modal_frf_coh.m @@ -417,7 +417,7 @@ acc_i = [1 , 4 ; figure; for i = 1:size(acc_i, 1) - subaxis(3, 3, i); + subplot(3, 3, i); hold on; plot(freqs, abs(squeeze(FRFs(meas_dir+3*(acc_i(i, 1)-1), exc_dir, :)))) plot(freqs, abs(squeeze(FRFs(meas_dir+3*(acc_i(i, 2)-1), exc_dir, :)))) @@ -459,7 +459,7 @@ acc_i = [1, 2; figure; for i = 1:size(acc_i, 1) - subaxis(3, 3, i); + subplot(3, 3, i); hold on; plot(freqs, abs(squeeze(FRFs(meas_dir+3*(acc_i(i, 1)-1), exc_dir, :)))) plot(freqs, abs(squeeze(FRFs(meas_dir+3*(acc_i(i, 2)-1), exc_dir, :)))) diff --git a/modal-analysis/measurement.html b/modal-analysis/measurement.html index b6d5ad2..061b091 100644 Binary files a/modal-analysis/measurement.html and b/modal-analysis/measurement.html differ diff --git a/modal-analysis/measurement.org b/modal-analysis/measurement.org index c684efe..9b3c648 100644 --- a/modal-analysis/measurement.org +++ b/modal-analysis/measurement.org @@ -812,7 +812,7 @@ Comparison of such measurements in the X direction is shown on figure [[fig:comp figure; for i = 1:size(acc_i, 1) - subaxis(3, 3, i); + subplot(3, 3, i); hold on; plot(freqs, abs(squeeze(FRFs(meas_dir+3*(acc_i(i, 1)-1), exc_dir, :)))) plot(freqs, abs(squeeze(FRFs(meas_dir+3*(acc_i(i, 2)-1), exc_dir, :)))) @@ -858,7 +858,7 @@ Comparison of such measurements in the X direction is shown on figure [[fig:comp figure; for i = 1:size(acc_i, 1) - subaxis(3, 3, i); + subplot(3, 3, i); hold on; plot(freqs, abs(squeeze(FRFs(meas_dir+3*(acc_i(i, 1)-1), exc_dir, :)))) plot(freqs, abs(squeeze(FRFs(meas_dir+3*(acc_i(i, 2)-1), exc_dir, :))))