LVD:

1) Added thrust to weight termination condition
2) Updates to some of the steering angles term conditions to make them go 0-360 deg for easier termination convergence.
3) Fixed a bug in altitude optim var.

Author: Arrowstar

helper_methods/ksptot_ma/launch_vehicle_designer/classes/Events/termConditions/@SeaLevelThrustToWeightTermCondition/SeaLevelThrustToWeightTermCondition.m

@@ -0,0 +1,111 @@
+classdef SeaLevelThrustToWeightTermCondition < AbstractEventTerminationCondition
+    %SeaLevelThrustToWeightTermCondition Summary of this class goes here
+    %   Detailed explanation goes here
+    
+    properties
+        targetTtW(1,1) double = 0;
+        
+        dryMass(1,1) double = 0;
+        tankStates(1,:) LaunchVehicleTankState
+        stgStates(1,:) LaunchVehicleStageState
+        lvState(1,:) LaunchVehicleState
+        throttleModel AbstractThrottleModel = ThrottlePolyModel.getDefaultThrottleModel();
+        bodyInfo KSPTOT_BodyInfo
+    end
+    
+    methods
+        function obj = SeaLevelThrustToWeightTermCondition(targetTtW)
+            obj.targetTtW = targetTtW;
+        end
+        
+        function evtTermCondFcnHndl = getEventTermCondFuncHandle(obj)
+            evtTermCondFcnHndl = @(t,y) obj.eventTermCond(t,y, obj.targetTtW, obj.dryMass, obj.stgStates, obj.lvState, obj.throttleModel, obj.tankStates, obj.bodyInfo);
+        end
+        
+        function initTermCondition(obj, initialStateLogEntry)
+            obj.bodyInfo = initialStateLogEntry.centralBody;
+            obj.dryMass = initialStateLogEntry.getTotalVehicleDryMass();
+            
+            obj.tankStates = initialStateLogEntry.getAllActiveTankStates();
+            obj.stgStates = initialStateLogEntry.stageStates;
+            obj.lvState = initialStateLogEntry.lvState;
+            obj.throttleModel = initialStateLogEntry.throttleModel;
+        end
+        
+        function name = getName(obj)
+            name = sprintf('Thrust to Weight Ratio (Sea Level) (%.3f)', obj.targetTtW);
+        end
+        
+        function params = getTermCondUiStruct(obj)
+            params = struct();
+            
+            params.paramName = 'Target T2W';
+            params.paramUnit = '';
+            params.useParam = 'on';
+            params.useStages = 'off';
+            params.useTanks = 'off';
+            params.useEngines = 'off';
+            
+            params.value = obj.targetTtW;
+            params.refStage = LaunchVehicleStage.empty(1,0);
+            params.refTank = LaunchVehicleEngine.empty(1,0);
+            params.refEngine = LaunchVehicleEngine.empty(1,0);
+        end
+        
+        function optVar = getNewOptVar(obj)
+            optVar = Thr2WghtTermCondOptimVar(obj);
+        end
+        
+        function optVar = getExistingOptVar(obj)
+            optVar = obj.optVar;
+        end
+        
+        function tf = usesStage(obj, stage)
+            tf = false;
+        end
+        
+        function tf = usesEngine(obj, engine)
+            tf = false;
+        end
+        
+        function tf = usesTank(obj, tank)
+            tf = false;
+        end
+        
+        function tf = usesEngineToTankConn(obj, engineToTank)
+            tf = false;
+        end
+    end
+    
+    methods(Static)
+        function termCond = getTermCondForParams(paramValue, stage, tank, engine)
+            termCond = SeaLevelThrustToWeightTermCondition((paramValue));
+        end
+    end
+    
+    methods(Static, Access=private)
+        function [value,isterminal,direction] = eventTermCond(t,y, targetTtW, dryMass, stgStates, lvState, throttleModel, tankStates, bodyInfo)
+            ut = t;
+            rVect = y(1:3);
+            tankMasses = y(7:end);
+            throttle = throttleModel.getThrottleAtTime(ut);
+            
+            altitude = norm(rVect) - bodyInfo.radius;
+            presskPa = getPressureAtAltitude(bodyInfo, altitude); 
+            
+            [~, totalThrust]= LaunchVehicleStateLogEntry.getTankMassFlowRatesDueToEngines(tankStates, stgStates, throttle, lvState, presskPa);
+            
+            totalMass = (dryMass + sum(tankMasses))*1000; %kg
+            gSlAccel = (bodyInfo.gm / ((bodyInfo.radius)^2))*1000; %m/s^2
+            totalSlWeight = totalMass*gSlAccel; %kg*m/s^2 = N
+          
+            totalThrust = totalThrust * 1000; % N
+            
+            twRatio = totalThrust/totalSlWeight;
+            
+            value = twRatio - targetTtW;
+            isterminal = 1;
+            direction = 0;
+        end
+    end
+end

helper_methods/ksptot_ma/launch_vehicle_designer/classes/Events/termConditions/@TerminationConditionEnum/TerminationConditionEnum.m

@@ -12,6 +12,7 @@
         SideSlipAngle('Side Slip Angle','SideSlipAngleTermCondition');
         TankMass('Tank Mass','TankMassTermCondition');
         ThrottleSetting('Throttle Setting','ThrottleTermCondition');
+        ThrustToWeightRatio('Thrust to Weight Ratio (Sea Level)','SeaLevelThrustToWeightTermCondition');
         TrueAnomaly('True Anomaly','TrueAnomalyTermCondition');
         YawAngle('Yaw Angle','YawTermCondition');
     end

helper_methods/ksptot_ma/launch_vehicle_designer/classes/Events/termConditions/attitude/@BankAngleTermCondition/BankAngleTermCondition.m

@@ -82,6 +82,8 @@ function initTermCondition(obj, initialStateLogEntry)
             dcm = steeringModel.getBody2InertialDcmAtTime(ut, rVect, vVect, bodyInfo);
             [bankAng,~,~] = computeAeroAnglesFromBodyAxes(rVect, vVect, dcm(:,1), dcm(:,2), dcm(:,3));
 
+            bankAng = AngleZero2Pi(bankAng);
+            
             value = bankAng - targetBankAngle;
             isterminal = 1;
             direction = 0;

helper_methods/ksptot_ma/launch_vehicle_designer/classes/Events/termConditions/attitude/@RollTermCondition/RollTermCondition.m

@@ -82,6 +82,8 @@ function initTermCondition(obj, initialStateLogEntry)
             dcm = steeringModel.getBody2InertialDcmAtTime(ut, rVect, vVect, bodyInfo);
             [rollAngle,~,~] = computeEulerAnglesFromInertialBodyAxes(ut, rVect, vVect, bodyInfo, dcm(:,1), dcm(:,2), dcm(:,3));
 
+            rollAngle = AngleZero2Pi(rollAngle);
+            
             value = rollAngle - targetRollAngle;
             isterminal = 1;
             direction = 0;

helper_methods/ksptot_ma/launch_vehicle_designer/classes/Events/termConditions/attitude/@SideSlipAngleTermCondition/SideSlipAngleTermCondition.m

@@ -82,6 +82,8 @@ function initTermCondition(obj, initialStateLogEntry)
             dcm = steeringModel.getBody2InertialDcmAtTime(ut, rVect, vVect, bodyInfo);
             [~,~,angOfSideslip] = computeAeroAnglesFromBodyAxes(rVect, vVect, dcm(:,1), dcm(:,2), dcm(:,3));
 
+            angOfSideslip = AngleZero2Pi(angOfSideslip);
+            
             value = angOfSideslip - targetSlipAngle;
             isterminal = 1;
             direction = 0;

helper_methods/ksptot_ma/launch_vehicle_designer/classes/Events/termConditions/attitude/@YawTermCondition/YawTermCondition.m

@@ -82,6 +82,8 @@ function initTermCondition(obj, initialStateLogEntry)
             dcm = steeringModel.getBody2InertialDcmAtTime(ut, rVect, vVect, bodyInfo);
             [~,~,yawAngle] = computeEulerAnglesFromInertialBodyAxes(ut, rVect, vVect, bodyInfo, dcm(:,1), dcm(:,2), dcm(:,3));
 
+            yawAngle = AngleZero2Pi(yawAngle);
+            
             value = yawAngle - targetYawAngle;
             isterminal = 1;
             direction = 0;

helper_methods/ksptot_ma/launch_vehicle_designer/classes/Optimization/variables/@AltitudeOptimizationVariable/AltitudeOptimizationVariable.m

@@ -28,8 +28,8 @@
         end
 
         function [lb, ub] = getBndsForVariable(obj)
-            lb = obj.lwrBnd(obj.useTf);
-            ub = obj.uprBnd(obj.useTf);
+            lb = obj.lb(obj.useTf);
+            ub = obj.ub(obj.useTf);
         end
 
         function [lb, ub] = getAllBndsForVariable(obj)

helper_methods/ksptot_ma/launch_vehicle_designer/classes/Optimization/variables/@TankMassOptimizationVariable/TankMassOptimizationVariable.m

@@ -43,7 +43,7 @@ function setBndsForVariable(obj, lb, ub)
         end
 
         function useTf = getUseTfForVariable(obj)
-            useTf = true;
+            useTf = obj.useTf;
         end
 
         function setUseTfForVariable(obj, useTf)

helper_methods/ksptot_ma/launch_vehicle_designer/classes/Optimization/variables/@Thr2WghtTermCondOptimVar/Thr2WghtTermCondOptimVar.m

@@ -0,0 +1,58 @@
+classdef Thr2WghtTermCondOptimVar < AbstractOptimizationVariable
+    %Thr2WghtTermCondOptimVar Thrust to weight ratio termination condition
+    %variable
+    %   Detailed explanation goes here
+    
+    properties
+        varObj(1,1) SeaLevelThrustToWeightTermCondition = SeaLevelThrustToWeightTermCondition(1);
+        
+        lb(1,1) double = 0;
+        ub(1,1) double = 0;
+        
+        useTf(1,1) = false;
+    end
+    
+    methods
+        function obj = Thr2WghtTermCondOptimVar(varObj)
+            obj.varObj = varObj;
+            obj.varObj.optVar = obj;
+            
+            obj.id = rand();
+        end
+        
+        function x = getXsForVariable(obj)
+            x = [];
+            
+            if(obj.useTf)
+                x = obj.varObj.targetTtW;
+            end
+        end
+        
+        function [lb, ub] = getBndsForVariable(obj)
+            lb = obj.lb(obj.useTf);
+            ub = obj.ub(obj.useTf);
+        end
+        
+        function [lb, ub] = getAllBndsForVariable(obj)
+            lb = obj.lb;
+            ub = obj.ub;
+        end
+        
+        function setBndsForVariable(obj, lb, ub)
+            obj.lb = lb;
+            obj.ub = ub;
+        end
+        
+        function useTf = getUseTfForVariable(obj)
+            useTf = obj.useTf;
+        end
+        
+        function setUseTfForVariable(obj, useTf)
+            obj.useTf = useTf;
+        end
+        
+        function updateObjWithVarValue(obj, x)
+            obj.varObj.targetTtW = x;
+        end
+    end
+end

helper_methods/ksptot_ma/launch_vehicle_designer/classes/StateLog/@LaunchVehicleStateLogEntry/LaunchVehicleStateLogEntry.m

@@ -181,10 +181,11 @@ function updateTankStatesWithNewMasses(obj, newTankMasses)
             end
         end
 
-        function tankMDots = getTankMassFlowRatesDueToEngines(tankStates, stgStates, throttle, lvState, presskPa)
+        function [tankMDots, totalThrust]= getTankMassFlowRatesDueToEngines(tankStates, stgStates, throttle, lvState, presskPa)
 %             tankStates = obj.getAllActiveTankStates();
             tankMDots = zeros(size(tankStates));
             tankMDots = tankMDots(:);
+            totalThrust = 0;
 
 %             stgStates = obj.stageStates;
             for(i=1:length(stgStates)) %#ok<*NO4LP>
@@ -198,9 +199,10 @@ function updateTankStatesWithNewMasses(obj, newTankMasses)
 
                         if(engineState.active)
                             engine = engineState.engine;
-                            [~, mdot] = engine.getThrustFlowRateForPressure(presskPa); %total mass flow through engine
+                            [thrust, mdot] = engine.getThrustFlowRateForPressure(presskPa); %total mass flow through engine
                             adjustedThrottle = engine.adjustThrottleForMinMax(throttle);
                             mdot = adjustedThrottle * mdot;
+                            totalThrust = totalThrust + adjustedThrottle*thrust;
 
                             tanks = lvState.getTanksConnectedToEngine(engine);