diff --git a/aerodynamicsOptimization/mainOptimization.m b/aerodynamicsOptimization/mainOptimization.m
index c541bc760bd6831eb12a4a888e528bb62448adca..ecb35c11e10c237529f3f03fd07d3ad6e033f9e3 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 ffd593901e6d265ddce180c8eb74692b1eca9ca8..77f02f209d485d51023230565d1cbb3654f441f0 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 8cd0d05214ab6c6b10d1064c34b9a6fed5bdba54..49485729ad5a84d630b4d26367e517a863e8f7f9 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 cbb5dc74c9857aeb00a0754b4778363f8da62f4b..1321e849a4c588bcd2b694977c6f4c560bc10300 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 fb089e62681fe8e232c13e101691a61b64dc033b..ec3da7a9ae2d06aa3dd22017ac57ae40723f7d0c 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 7b6421cf2ade32d0b0ce096edc11ef3863ece2b1..cabaf9845796c321e99c69f6f1499f5215444894 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 33a3e6cb2205f40807ea02db3114ad6761a7411d..b4803e254f250b7127ede63e359732aa58bd0ec4 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 eee5d0ba90afb7ba8d1f657be75940fdb55affe0..56ac7b8a3304468c95c98759afba48d32ca87a90 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 e4ecac839e8658fa481493db9ccc689b9269daea..155ec7034a71b7c6c839d1e271f1ddf096d9ba79 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 f36cefd6e7ecf7ee69674f3c1a4ecd24e9defdb0..363be07e438f4a9f39aa86af1bd13ff4fc203727 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 3d374e55561452492398a40e83144f12e2c8140e..5a14012e66984dad38c24bb25730d63e960fc6df 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 1fc32daafebb97c85a167bca9ed97ec50e40177d..b4ae30af6a95f30fadbbf521c5563478ce473d63 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');