Added ICANSAT V2 data.

.gitignore

@@ -1,4 +1,5 @@
 *.asv
 Code/ICANSAT/V0/Result
 Code/ICANSAT/V1/Result
+Code/ICANSAT/V2/Result
 Code/MAD/Result

Code/AllClean.m

@@ -10,6 +10,10 @@ cd ../../V1/Result
 delete *.txt
 fprintf("ICANSAT V1 result files deleted.\n");
 
+cd ../../V2/Result
+delete *.txt
+fprintf("ICANSAT V2 result files deleted.\n");
+
 cd ../../../MAD/Result
 delete *.txt
 fprintf("MAD result files deleted.\n");

Code/AllRun.m

@@ -8,6 +8,9 @@ ICANSAT
 cd ../V1
 ICANSAT_V1
 
+cd ../V2
+ICANSAT_V2
+
 cd ../../MAD
 MAD_Validation
 

Code/ICANSAT/V2/ICANSAT_V2.m

@@ -0,0 +1,31 @@
+clc
+addpath('../')
+addpath('../..')
+
+% Df, Lr, Ls, ms, mp, tb
+icansat = SingleStageRocket(0.1567, 2.391, 4, 14, 1.160534, 3.6325);
+
+RunTrajectorySim(icansat, 88);
+RunTrajectorySim(icansat, 86);
+RunTrajectorySim(icansat, 84);
+RunTrajectorySim(icansat, 82);
+RunTrajectorySim(icansat, 80);
+RunTrajectorySim(icansat, 78);
+RunTrajectorySim(icansat, 76);
+RunTrajectorySim(icansat, 74);
+RunTrajectorySim(icansat, 72);
+RunTrajectorySim(icansat, 70);
+
+function RunTrajectorySim(rocket, launch_angle)
+    % Timestep, no. of timesteps, launch angle
+    rocket.SetSimulationParams(0.0025, 30000, launch_angle);
+    rocket.SetRocketID("ICANSAT");
+    rocket.InitializeVars();
+
+    % Uncomment to use non-constant mass flow rate
+    rocket.SetVariableMassFlow();
+
+    rocket.CalculateThrust('ICANSAT_V2_Thrust_v_Time.txt');
+    rocket.CalculateTrajectory();
+    rocket.WriteDataFile();
+end

Code/SingleStageRocket.m

@@ -89,7 +89,7 @@ classdef SingleStageRocket < handle
            obj.NSteps = nsteps;
            obj.launch_angle = launch_angle;
            fprintf('Launch angle: %4.2f degrees.\n', launch_angle);
-           fprintf('Timestep: %5.3f s. Maximum no. of timesteps: %d.\n', dt, nsteps);
+           fprintf('Timestep: %6.4f s. Maximum no. of timesteps: %d.\n', dt, nsteps);
        end
        
        % Initialize variables