diff --git a/.SimulinkProject/Root.type.ProjectPath/0ae7cdd8-73c1-44a2-bc58-56fac4006009.type.Reference.xml b/.SimulinkProject/Root.type.ProjectPath/0ae7cdd8-73c1-44a2-bc58-56fac4006009.type.Reference.xml new file mode 100644 index 0000000..8a11a4b --- /dev/null +++ b/.SimulinkProject/Root.type.ProjectPath/0ae7cdd8-73c1-44a2-bc58-56fac4006009.type.Reference.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/demonstration/Micro_Station_Displacement.slx b/demonstration/Micro_Station_Displacement.slx index 17076da..dec4b22 100644 Binary files a/demonstration/Micro_Station_Displacement.slx and b/demonstration/Micro_Station_Displacement.slx differ diff --git a/identification/simscape_id_micro_station.slx b/identification/simscape_id_micro_station.slx deleted file mode 100644 index 20e6af3..0000000 Binary files a/identification/simscape_id_micro_station.slx and /dev/null differ diff --git a/initialize/initializeInputs.m b/initialize/initializeInputs.m index 3d8fa33..c2fe63b 100644 --- a/initialize/initializeInputs.m +++ b/initialize/initializeInputs.m @@ -105,17 +105,16 @@ function [inputs] = initializeInputs(opts_param) %% Create the input Structure that will contain all the inputs inputs = struct( ... - 't', t, ... - 'Dw', Dw, ... - 'Dy', Dy, ... - 'Ry', Ry, ... - 'Rz', Rz, ... - 'Dh', Dh, ... - 'Rm', Rm, ... - 'Dn', Dn, ... - 'Ds', Ds, ... - 'Fg', Fg, ... - 'Fs', Fs ... + 'Dw', timeseries(Dw, t), ... + 'Dy', timeseries(Dy, t), ... + 'Ry', timeseries(Ry, t), ... + 'Rz', timeseries(Rz, t), ... + 'Dh', timeseries(Dh, t), ... + 'Rm', timeseries(Rm, t), ... + 'Dn', timeseries(Dn, t), ... + 'Ds', timeseries(Ds, t), ... + 'Fg', timeseries(Fg, t), ... + 'Fs', timeseries(Fs, t) ... ); %% Save diff --git a/mat/inputs.mat b/mat/inputs.mat index 0b14007..5aafffa 100644 Binary files a/mat/inputs.mat and b/mat/inputs.mat differ diff --git a/mat/sim_conf.mat b/mat/sim_conf.mat index d187942..a88c60e 100644 Binary files a/mat/sim_conf.mat and b/mat/sim_conf.mat differ diff --git a/mat/solids.mat b/mat/solids.mat index d948fee..c7e93f7 100644 Binary files a/mat/solids.mat and b/mat/solids.mat differ diff --git a/mat/stages.mat b/mat/stages.mat index 6c998a4..b3633ed 100644 Binary files a/mat/stages.mat and b/mat/stages.mat differ diff --git a/nass_library.slx b/nass_library.slx deleted file mode 100644 index e5d11e0..0000000 Binary files a/nass_library.slx and /dev/null differ diff --git a/nass_library/inputs.slx b/nass_library/inputs.slx new file mode 100644 index 0000000..2f4699e Binary files /dev/null and b/nass_library/inputs.slx differ diff --git a/nass_library/nass_library.slx b/nass_library/nass_library.slx new file mode 100644 index 0000000..0becac2 Binary files /dev/null and b/nass_library/nass_library.slx differ diff --git a/nass_library/pos_error_wrt_nass_base.slx b/nass_library/pos_error_wrt_nass_base.slx new file mode 100644 index 0000000..3041017 Binary files /dev/null and b/nass_library/pos_error_wrt_nass_base.slx differ