Merge pull request #200 from ufechner7/rm-measure

Remove measurement struct

Author: 1-Bart-1

Project.toml

@@ -50,6 +50,7 @@ BenchmarkTools = "1.6"
 CodecXz = "0.7.4"
 Colors = "0"
 ControlPlots = "0.2.4"
+ControlSystemsBase = "1"
 DSP = "0.7.10"
 Dierckx = "0.5.4"
 DiffEqBase = "6.161.0"
@@ -104,6 +105,7 @@ LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
 PackageCompiler = "9b87118b-4619-50d2-8e1e-99f35a4d4d9d"
 StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+ControlSystemsBase = "aaaaaaaa-a6ca-5380-bf3e-84a91bcd477e"
 
 [targets]
-test = ["Test", "BenchmarkTools", "PackageCompiler", "Documenter", "ControlPlots", "Colors", "LaTeXStrings", "StatsBase", "JLD2", "Aqua", "DSP"]
+test = ["Test", "BenchmarkTools", "PackageCompiler", "Documenter", "ControlPlots", "Colors", "LaTeXStrings", "StatsBase", "JLD2", "Aqua", "DSP", "ControlSystemsBase"]

data/prob_1.10_ram_dynamic_3_seg.bin.default.xz

@@ -1,5 +1,5 @@
 system:
-    log_file: "data/log_8700W_8ms" # filename without extension  [replay only]
+    log_file: "data/ram_air_kite"  # filename without extension  [replay only]
                                    #   use / as path delimiter, even on Windows 
     time_lapse:   1.0              # relative replay speed
     sim_time:   100.0              # simulation time             [sim only]
@@ -10,17 +10,13 @@ system:
     fixed_font: ""                 # name or filepath+filename of alternative fixed pitch font
 
 initial:
-    l_tether: 50.0        # initial tether length       [m]
-    elevation: 70.8        # initial elevation angle   [deg]
-    v_reel_out: 0.0        # initial reel out speed    [m/s]
+    l_tethers: [50.0, 50.0, 50.0]  # initial tether length       [m]
+    elevation: 70.8                # initial elevation angle   [deg]
+    v_reel_out: 0.0                # initial reel out speed    [m/s]
 
 solver:
-    abs_tol: 0.01        # absolute tolerance of the DAE solver [m, m/s]
-    rel_tol: 0.01         # relative tolerance of the DAE solver [-]
-    solver: "DFBDF"        # DAE solver, IDA or DImplicitEuler, DFBDF
-    linear_solver: "GMRES" # can be GMRES or Dense or LapackDense (only for IDA)
-    max_order: 4           # maximal order, usually between 3 and 5
-    max_iter:  10000         # max number of iterations of the steady-state-solver
+    abs_tol: 0.01          # absolute tolerance of the DAE solver [m, m/s]
+    rel_tol: 0.01          # relative tolerance of the DAE solver [-]
 
 kite:
     model: "data/ram_air_kite_body.obj"     # 3D model of the kite
@@ -49,7 +45,7 @@ tether:
                            # SK75: 109 to 132 GPa according to datasheet
 
 winch:
-    winch_model: "AsyncMachine" # or TorqueControlledMachine
+    winch_model: "TorqueControlledMachine" # or AsynchMachine
     max_force: 4000        # maximal (nominal) tether force; short overload allowed [N]
     v_ro_max:  8.0         # maximal reel-out speed                          [m/s]
     v_ro_min: -8.0         # minimal reel-out speed (=max reel-in speed)     [m/s]