Create nass_library folder, use some referenced models

2018-10-25 14:06:37 +02:00 · 2018-10-25 14:06:37 +02:00 · 5e6f1dbc38
commit 5e6f1dbc38
parent eb8f58c402
12 changed files with 12 additions and 11 deletions
--- 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
@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Info Ref="nass_library" Type="Relative" />
--- a/demonstration/Micro_Station_Displacement.slx
+++ b/demonstration/Micro_Station_Displacement.slx
--- a/identification/simscape_id_micro_station.slx
+++ b/identification/simscape_id_micro_station.slx
--- 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
--- a/mat/inputs.mat
+++ b/mat/inputs.mat
--- a/mat/sim_conf.mat
+++ b/mat/sim_conf.mat
--- a/mat/solids.mat
+++ b/mat/solids.mat
--- a/mat/stages.mat
+++ b/mat/stages.mat
--- a/nass_library.slx
+++ b/nass_library.slx
--- a/nass_library/inputs.slx
+++ b/nass_library/inputs.slx
--- a/nass_library/nass_library.slx
+++ b/nass_library/nass_library.slx
--- a/nass_library/pos_error_wrt_nass_base.slx
+++ b/nass_library/pos_error_wrt_nass_base.slx