diff --git a/sensitivityAnalysis/src/sensitivityStochRun.m b/sensitivityAnalysis/src/sensitivityStochRun.m index 6893fba0af4f9ab9d96e456baf294eb5c723c511..b8921df049fc11386ebaa28c61c26c3757974998 100644 --- a/sensitivityAnalysis/src/sensitivityStochRun.m +++ b/sensitivityAnalysis/src/sensitivityStochRun.m @@ -1,9 +1,9 @@ function [ascent, descentPara, descentBall, stability] = ... - sensitivityStochRun(rocketRef, envRef, wind, parameters, settings, wrapper) + sensitivityStochRun(rocketRef, envRef, windRef, parameters, settings, wrapper) arguments rocketRef Rocket envRef Environment - wind Wind {mustBeA(wind, {'Wind', 'WindMatlab'})} + windRef Wind {mustBeA(windRef, {'Wind', 'WindMatlab'})} parameters struct settings Settings wrapper DataWrapper @@ -97,15 +97,16 @@ if ballFlag end if stabFlag - stability = stdStability(rocketRef, envRef, wind, settings, wrapper); + stability = stdStability(rocketRef, envRef, windRef, settings, wrapper); wrapper.reset(); stability(1, n) = stability; end -for i = 1:n +parfor i = 1:n ascentSol = []; rocket = rocketRef; env = envRef; + wind = windRef; uncertanty = struct(); [rocket, env, wind] = updateData(rocket, env, wind, parameters, i); diff --git a/sensitivityAnalysis/src/stochParameters/updateData.m b/sensitivityAnalysis/src/stochParameters/updateData.m index 1fd7a723bf96783d5bd0d33b495a40af0ac8e646..7035709c6cd3cb746be3049e2f5196842a26979a 100644 --- a/sensitivityAnalysis/src/stochParameters/updateData.m +++ b/sensitivityAnalysis/src/stochParameters/updateData.m @@ -36,6 +36,8 @@ end coefficients = {'CA','CYB','CY0','CNA','CN0','Cl','Clp', ... 'Cma','Cm0','Cmad','Cmq','Cnb','Cn0','Cnr','Cnp'}; +wind = wind.updateAll(); + for i = 1:length(parameters) value = applyModFactor(parameters(i), k);