From f3e83e8df6cb1be20cd63dcb0ede9f465cb37f4a Mon Sep 17 00:00:00 2001
From: Mauco03 <marco.gaibotti@skywarder.eu>
Date: Wed, 12 Feb 2025 22:43:13 +0100
Subject: [PATCH] [handle-value-conversion][Wind] Replaced WindCustom with Wind
---
aerodynamicsOptimization/mainOptimization.m | 4 ++--
aerodynamicsOptimization/src/OptimizationGA.m | 2 +-
apogeeAnalysis/mainApogeeAnalysis.m | 2 +-
apogeeAnalysis/src/engineCutApogee.m | 2 +-
apogeeAnalysis/src/standardApogee.m | 2 +-
caAnalysis/mainCaAnalysis.m | 4 ++--
caAnalysis/src/initCaAnalysis.m | 2 +-
sensitivityAnalysis/mainSensitivity.m | 4 ++--
sensitivityAnalysis/src/sensitivityStochRun.m | 2 +-
sensitivityAnalysis/src/stochParameters/updateData.m | 2 +-
simulator/mainSimulator.m | 4 ++--
stabilityAnalysis/mainStabilityAnalysis.m | 2 +-
12 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/aerodynamicsOptimization/mainOptimization.m b/aerodynamicsOptimization/mainOptimization.m
index c541bc76..ecb35c11 100644
--- a/aerodynamicsOptimization/mainOptimization.m
+++ b/aerodynamicsOptimization/mainOptimization.m
@@ -1,7 +1,7 @@
function mainOptimization(rocket, wind, environment, settings, options)
arguments
rocket Rocket = Rocket.empty
- wind WindCustom = WindCustom.empty
+ wind Wind = Wind.empty
environment Environment = Environment.empty
settings Settings = Settings.empty
@@ -53,7 +53,7 @@ if ~contains(path, dissilePath), addpath(genpath(dissilePath)); end
mission = Mission(true);
if isempty(rocket), rocket = Rocket(mission); end
if isempty(environment), environment = Environment(mission, rocket.motor); end
-if isempty(wind), wind = WindCustom(mission); end
+if isempty(wind), wind = Wind(mission); end
if isempty(settings), settings = Settings('ode', 'optimization'); end
Settings.read(settings, options, 'optimization');
diff --git a/aerodynamicsOptimization/src/OptimizationGA.m b/aerodynamicsOptimization/src/OptimizationGA.m
index ffd59390..77f02f20 100644
--- a/aerodynamicsOptimization/src/OptimizationGA.m
+++ b/aerodynamicsOptimization/src/OptimizationGA.m
@@ -4,7 +4,7 @@ arguments
input struct
rocket Rocket
environment Environment
- wind WindCustom
+ wind Wind
settings Settings
wrapper DataWrapper
end
diff --git a/apogeeAnalysis/mainApogeeAnalysis.m b/apogeeAnalysis/mainApogeeAnalysis.m
index 8cd0d052..49485729 100644
--- a/apogeeAnalysis/mainApogeeAnalysis.m
+++ b/apogeeAnalysis/mainApogeeAnalysis.m
@@ -46,7 +46,7 @@ end
%% PREPARE DATA FOR SIMULATION
% Winds
-winds = [WindCustom(); WindCustom()];
+winds = [Wind(); Wind()];
winds(1).altitudes = settings.cases(1).wind.altitudes;
winds(1).magnitudeDistribution = "u";
winds(1).azimuthDistribution = "u";
diff --git a/apogeeAnalysis/src/engineCutApogee.m b/apogeeAnalysis/src/engineCutApogee.m
index cbb5dc74..1321e849 100644
--- a/apogeeAnalysis/src/engineCutApogee.m
+++ b/apogeeAnalysis/src/engineCutApogee.m
@@ -5,7 +5,7 @@ arguments
mission Mission
selectedMotors (:, 1) struct
environments (2, 1) Environment
- winds (2, 1) WindCustom
+ winds (2, 1) Wind
airbrakes (2, 1) Airbrakes
end
%
diff --git a/apogeeAnalysis/src/standardApogee.m b/apogeeAnalysis/src/standardApogee.m
index fb089e62..ec3da7a9 100644
--- a/apogeeAnalysis/src/standardApogee.m
+++ b/apogeeAnalysis/src/standardApogee.m
@@ -5,7 +5,7 @@ arguments
mission Mission
selectedMotors (:, 1) struct
environments (2, 1) Environment
- winds (2, 1) WindCustom
+ winds (2, 1) Wind
airbrakes (2, 1) Airbrakes
end
%
diff --git a/caAnalysis/mainCaAnalysis.m b/caAnalysis/mainCaAnalysis.m
index 7b6421cf..cabaf984 100644
--- a/caAnalysis/mainCaAnalysis.m
+++ b/caAnalysis/mainCaAnalysis.m
@@ -1,7 +1,7 @@
function [dHdCA] = mainCaAnalysis(rocket, wind, environment, cfdData)
arguments
rocket = [] % Rocket = Rocket.empty
- wind = [] % WindCustom = WindCustom.empty
+ wind = [] % Wind = Wind.empty
environment = [] % Environment = Environment.empty
cfdData (2, :) double = []
end
@@ -22,7 +22,7 @@ if isDissileMissing, addpath(genpath(dissilePath)); end
mission = Mission(true);
if isempty(rocket), rocket = Rocket(mission); end
if isempty(environment), environment = Environment(mission, rocket.motor); end
-if isempty(wind), wind = WindCustom(mission); end
+if isempty(wind), wind = Wind(mission); end
settings = Settings('ode');
settings.addprop('simulator');
diff --git a/caAnalysis/src/initCaAnalysis.m b/caAnalysis/src/initCaAnalysis.m
index 33a3e6cb..b4803e25 100644
--- a/caAnalysis/src/initCaAnalysis.m
+++ b/caAnalysis/src/initCaAnalysis.m
@@ -1,7 +1,7 @@
function [defaultCa, modCa] = initCaAnalysis(rocket, wind, settings, cfd)
arguments
rocket Rocket
- wind WindCustom
+ wind Wind
settings Settings
cfd (2, :) double = []
end
diff --git a/sensitivityAnalysis/mainSensitivity.m b/sensitivityAnalysis/mainSensitivity.m
index eee5d0ba..56ac7b8a 100644
--- a/sensitivityAnalysis/mainSensitivity.m
+++ b/sensitivityAnalysis/mainSensitivity.m
@@ -2,7 +2,7 @@ function [postProcess, parameters] = ...
mainSensitivity(rocket, wind, environment, settings, plots)
arguments
rocket = [] % Rocket = Rocket.empty
- wind = [] % WindCustom = WindCustom.empty
+ wind = [] % Wind = Wind.empty
environment = [] % Environment = Environment.empty
settings = [] % Settings = Settings.empty
@@ -47,7 +47,7 @@ if isDissileMissing, addpath(genpath(dissilePath)); end
mission = Mission(true);
if isempty(rocket), rocket = Rocket(mission); end
if isempty(environment), environment = Environment(mission, rocket.motor); end
-if isempty(wind), wind = WindCustom(mission); end
+if isempty(wind), wind = Wind(mission); end
if isempty(settings), settings = Settings('ode', 'sensitivity'); end
Settings.read(settings, plots, 'sensitivity', 'plots');
diff --git a/sensitivityAnalysis/src/sensitivityStochRun.m b/sensitivityAnalysis/src/sensitivityStochRun.m
index e4ecac83..155ec703 100644
--- a/sensitivityAnalysis/src/sensitivityStochRun.m
+++ b/sensitivityAnalysis/src/sensitivityStochRun.m
@@ -3,7 +3,7 @@ function [ascent, descentPara, descentBall, stability] = ...
arguments
rocketRef Rocket
envRef Environment
- wind WindCustom {mustBeA(wind, {'WindCustom', 'WindMatlab'})}
+ wind Wind {mustBeA(wind, {'Wind', 'WindMatlab'})}
parameters struct
settings Settings
wrapper DataWrapper
diff --git a/sensitivityAnalysis/src/stochParameters/updateData.m b/sensitivityAnalysis/src/stochParameters/updateData.m
index f36cefd6..363be07e 100644
--- a/sensitivityAnalysis/src/stochParameters/updateData.m
+++ b/sensitivityAnalysis/src/stochParameters/updateData.m
@@ -2,7 +2,7 @@ function updateData(rocket, env, wind, parameters, k)
arguments
rocket Rocket
env Environment
- wind WindCustom
+ wind Wind
parameters struct
k double
end
diff --git a/simulator/mainSimulator.m b/simulator/mainSimulator.m
index 3d374e55..5a14012e 100644
--- a/simulator/mainSimulator.m
+++ b/simulator/mainSimulator.m
@@ -1,7 +1,7 @@
function [ascent, descent] = mainSimulator(rocket, wind, environment, settings, options)
arguments
rocket = [] % Rocket = Rocket.empty
- wind = [] % WindCustom = WindCustom.empty
+ wind = [] % Wind = Wind.empty
environment = [] % Environment = Environment.empty
settings = [] % Settings = Settings.empty
@@ -45,7 +45,7 @@ if isCommonMissing, addpath(genpath(commonPath)); end
mission = Mission(true);
if isempty(rocket), rocket = Rocket(mission); end
if isempty(environment), environment = Environment(mission, rocket.motor); end
-if isempty(wind), wind = WindCustom(mission); end
+if isempty(wind), wind = Wind(mission); end
if isempty(settings), settings = Settings('ode', 'simulator'); end
Settings.read(settings, options, 'simulator');
diff --git a/stabilityAnalysis/mainStabilityAnalysis.m b/stabilityAnalysis/mainStabilityAnalysis.m
index 1fc32daa..b4ae30af 100644
--- a/stabilityAnalysis/mainStabilityAnalysis.m
+++ b/stabilityAnalysis/mainStabilityAnalysis.m
@@ -44,7 +44,7 @@ addpath(genpath(dissilePath));
mission = Mission(true);
if isempty(rocket), rocket = Rocket(mission); end
if isempty(environment), environment = Environment(mission, rocket.motor); end
-if isempty(wind), wind = WindCustom(mission); end
+if isempty(wind), wind = Wind(mission); end
if isempty(settings), settings = Settings('stabilityAnalysis', 'ode'); end
% Settings.read(settings, options, 'stability');
--
GitLab