diff --git a/common b/common index bc61b5b9265bde0f30dfc53db0bf5820e3c69b04..7eab42722e6f7e0576f77383b27bfcd614096e88 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit bc61b5b9265bde0f30dfc53db0bf5820e3c69b04 +Subproject commit 7eab42722e6f7e0576f77383b27bfcd614096e88 diff --git a/sensitivityAnalysis/src/stochParameters/initParameter.m b/sensitivityAnalysis/src/stochParameters/initParameter.m index 621446fb3e12731b73adb9389d498ff5e31e0441..2b585c6ce0228804f105038753fdf8ae8a68462c 100644 --- a/sensitivityAnalysis/src/stochParameters/initParameter.m +++ b/sensitivityAnalysis/src/stochParameters/initParameter.m @@ -46,13 +46,13 @@ for i = 1:length(parameters) parameters(i).value = rocket.motor.thrust; parameters(i).udm = 'N'; case 'Ixx' - parameters(i).value = rocket.inertia(1, :); + parameters(i).value = rocket.inertia(:, 1); parameters(i).udm = 'Kg*m^4'; case 'Iyy' - parameters(i).value = rocket.inertia(2, :); + parameters(i).value = rocket.inertia(:, 2); parameters(i).udm = 'kg*m^4'; case 'Izz' - parameters(i).value = rocket.inertia(3, :); + parameters(i).value = rocket.inertia(:, 3); parameters(i).udm = 'kg*m^4'; case 'drogueSurface' parameters(i).value = rocket.parachutes{1, 1}.surface; diff --git a/sensitivityAnalysis/src/stochParameters/updateData.m b/sensitivityAnalysis/src/stochParameters/updateData.m index 7035709c6cd3cb746be3049e2f5196842a26979a..512520f4e613bdd3efaf855902506c91f2c8db9f 100644 --- a/sensitivityAnalysis/src/stochParameters/updateData.m +++ b/sensitivityAnalysis/src/stochParameters/updateData.m @@ -58,11 +58,11 @@ for i = 1:length(parameters) case 'thrust' rocket.motor.thrust = value; case 'Ixx' - rocket.inertia(1, :) = value; + rocket.inertia(:, 1) = value; case 'Iyy' - rocket.inertia(2, :) = value; + rocket.inertia(:, 2) = value; case 'Izz' - rocket.inertia(3, :) = value; + rocket.inertia(:, 3) = value; case 'drogueSurface' rocket.parachutes{1, 1}.surface = value; case 'drogueMass'