From d9bd3092c91b746730dab98e654fd04bb5615510 Mon Sep 17 00:00:00 2001 From: marcomarchesiskywarder <marco4.marchesi@mail.polimi.it> Date: Wed, 20 Sep 2023 12:05:20 +0200 Subject: [PATCH] useless commit --- data/msa-toolkit | 2 +- simulator/configs/configWind.m | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/data/msa-toolkit b/data/msa-toolkit index 0742afba..edfa8305 160000 --- a/data/msa-toolkit +++ b/data/msa-toolkit @@ -1 +1 @@ -Subproject commit 0742afba9df49ed58374fe707eb787dbd0db47ad +Subproject commit edfa83054c3f93751b9e1acd5eba6a7cad72a7a3 diff --git a/simulator/configs/configWind.m b/simulator/configs/configWind.m index c217bdcf..8b9d16ce 100644 --- a/simulator/configs/configWind.m +++ b/simulator/configs/configWind.m @@ -43,17 +43,11 @@ if conf.script == "simulator" settings.wind.model = false; settings.wind.inputGround = 7; % [m/s] Wind magnitude at the ground settings.wind.inputAlt = linspace(0, 2000, 100); % [m] Altitude vector - % settings.wind.inputMult = [0 1 2 3 4 4.5 5 5.5 6]*50; % [-] Percentage of increasing magnitude at each altitude - % settings.wind.inputAzimut = 200*pi/180*ones(1,9); % [deg] Wind azimut angle at each altitude (toward wind incoming direction) - % settings.wind.input_uncertainty = [0,0]; - settings.wind.inputMagnitude = [7 * ones(1, 15), 8 * ones(1, 5), 8 * ones(1, 10), 11*ones(1, 15), 13*ones(1, 20), 15 * ones(1, 35)]; - settings.wind.inputAzimut = [(177+180) * ones(1, 15), 270 * ones(1, 85)]; % wind azimut angle at each altitude (toward wind incoming direction) [deg] - settings.wind.input_uncertainty = [10, 20]; - settings.wind.inputMult = (settings.wind.inputMagnitude./settings.wind.inputGround - 1) * 100; - % settings.wind.input_uncertainty = [a,b]; wind uncertanties: - % - a, wind magnitude percentage uncertanty: magn = magn *(1 +- a) - % - b, wind direction band uncertanty: dir = dir 1 +- b - + settings.wind.inputMagnitude = [7 * ones(1, 15), 8 * ones(1, 5), 8 * ones(1, 10), 11*ones(1, 15), 13*ones(1, 20), 15 * ones(1, 35)]; + settings.wind.inputAzimut = [(177+180) * ones(1, 15), 270 * ones(1, 85)]; % wind azimut angle at each altitude (toward wind incoming direction) [deg] + settings.wind.input_uncertainty = [10, 20]; + settings.wind.inputMult = (settings.wind.inputMagnitude./settings.wind.inputGround - 1) * 100; + case "constant" -- GitLab