Merge branch 'master' into MaterialBasedTempsTagging

KSP-RO · Jul 18, 2023 · c706294 · c706294
2 parents 483f3b5 + 1302235
commit c706294
Show file tree

Hide file tree

Showing 45 changed files with 1,623 additions and 228 deletions.
diff --git a/GameData/RealismOverhaul/Engine_Configs/AJ260FL_Config.cfg b/GameData/RealismOverhaul/Engine_Configs/AJ260FL_Config.cfg
@@ -109,6 +109,17 @@
 				key = 0.15 0.4717 -4.373701 -4.373701
 				key = 0 0.3 -0.8487133 -0.8487133
 			}
+
+			//Same as UA120x?
+			TESTFLIGHT:NEEDS[TestLite|TestFlight]
+			{
+				ratedBurnTime = 155
+				ignitionReliabilityStart = 0.999
+				ignitionReliabilityEnd = 1.0	//This isn't really a possible failure mode for ground lit SRMs
+				cycleReliabilityStart = 0.985602
+				cycleReliabilityEnd = 0.997120
+				techTransfer = AJ260-SL3,AJ260-SL1:50
+			}
 		}
 	}
 }
diff --git a/GameData/RealismOverhaul/Engine_Configs/AJ260SL_Config.cfg b/GameData/RealismOverhaul/Engine_Configs/AJ260SL_Config.cfg
@@ -117,6 +117,16 @@
 				key = 0.14286 0.4 -0.8595195 -0.8595195
 				key = 0 0.3 -0.6885712 -0.6885712
 			}
+
+			//Same as UA120x?
+			TESTFLIGHT:NEEDS[TestLite|TestFlight]
+			{
+				ratedBurnTime = 155
+				ignitionReliabilityStart = 0.999
+				ignitionReliabilityEnd = 1.0	//This isn't really a possible failure mode for ground lit SRMs
+				cycleReliabilityStart = 0.985602
+				cycleReliabilityEnd = 0.997120
+			}
 		}
 
 		CONFIG
@@ -156,6 +166,17 @@
 				key = 0.15 0.4717 -4.373701 -4.373701
 				key = 0 0.3 -0.8487133 -0.8487133
 			}
+			
+			//Same as UA120x?
+			TESTFLIGHT:NEEDS[TestLite|TestFlight]
+			{
+				ratedBurnTime = 105
+				ignitionReliabilityStart = 0.999
+				ignitionReliabilityEnd = 1.0	//This isn't really a possible failure mode for ground lit SRMs
+				cycleReliabilityStart = 0.985602
+				cycleReliabilityEnd = 0.997120
+				techTransfer = AJ260-SL1:50
+			}
 		}
 	}
 }
diff --git a/GameData/RealismOverhaul/Engine_Configs/Electric_Engine_Configs/457M_Config.cfg b/GameData/RealismOverhaul/Engine_Configs/Electric_Engine_Configs/457M_Config.cfg
@@ -7,47 +7,47 @@
 //	457M-V1
 //	
 //
-//	Dry Mass: 15.8 kg
+//	Dry Mass: 158 kg	//15.8 kg obviously wrong. 158 kg?
 //	Thrust (SL): ??? N
 //	Thrust (Vac): 2.950 N
 //	Power: 72 kW
 //	ISP: ??? SL / 2929 Vac
 //	Burn Time: ??? Hours
 //	Chamber Pressure: N/A MPa
 //	Propellant: Xenon
-//	Prop Ratio: N/A
+//	Efficiency: 58%
 //	Throttle: 2950 mN to 398 mN
 //	Nozzle Ratio: N/A
 //	Ignitions: Infinite
 //	=================================================================================
 //	457M-V1-K
 //	Krypton
 //
-//	Dry Mass: 15.8 kg
+//	Dry Mass: 158 kg
 //	Thrust (SL): ??? N
 //	Thrust (Vac): 2.473 N
 //	Power: 72 kW
 //	ISP: ??? SL / 3817 Vac
 //	Burn Time: ??? Hours
 //	Chamber Pressure: N/A MPa
 //	Propellant: Krypton
-//	Prop Ratio: N/A
+//	Efficiency: 58%
 //	Throttle: 2473 mN to 622 mN
 //	Nozzle Ratio: N/A
 //	Ignitions: Infinite
 //	=================================================================================
 //	457M-V2
 //	
 //
-//	Dry Mass: 11.9 kg
+//	Dry Mass: 119 kg
 //	Thrust (SL): ??? N
 //	Thrust (Vac): 1.9864 N
 //	Power: 50 kW
 //	ISP: ??? SL / 2740 Vac
 //	Burn Time: ??? Hours
 //	Chamber Pressure: N/A MPa
 //	Propellant: Xenon
-//	Prop Ratio: N/A
+//	Efficiency: 63%
 //	Throttle: 1986.4 mN to 400 mN
 //	Nozzle Ratio: N/A
 //	Ignitions: Infinite
@@ -65,9 +65,13 @@
 
 @PART[*]:HAS[#engineType[457M]]:FOR[RealismOverhaulEngines]
 {
-	%title = 457M 72kW Hall Thruster
-	%manufacturer = NASA Glenn Research Center
-	%description = This is a 50 kW-class thruster. Development started in 2000 to enable space solar power systems and other high power spacecraft. A laboratory model of this high power thruster was fabricated and tested with xenon in 2002 at power levels up to 72 kW with 650V. Mass/power ratio: 2.19 kg/kW.
+	%title = #ro457MTitle	//457M 72kW Hall Thruster
+	%manufacturer = #roMfrGRC
+	%description = #ro457MDesc
+
+	@tags ^= :$: usa glenn research center GRC 457M 72kw hall effect thruster xenon krypton electric
+
+	%specLevel = prototype
 
 	@MODULE[ModuleEngines*]
 	{
@@ -86,10 +90,12 @@
 		type = ModuleEngines
 		modded = false
 		configuration = 457M-V1
-		origMass = 0.0158
+		origMass = 0.158
 		CONFIG
 		{
 			name = 457M-V1
+			description = Efficiency 58%, 2.19 kg/kW.
+			specLevel = prototype
 			minThrust = 0.000398
 			maxThrust = 0.002950
 			heatProduction = 30240 // efficiency 0.58
@@ -103,7 +109,7 @@
 			PROPELLANT
 			{
 				name = ElectricCharge
-				ratio = 4063.1333754
+				ratio = 4132.00
 				minResToLeave = 10.0
 				DrawGauge = True
 			}
@@ -112,11 +118,27 @@
 				key = 0 2929
 				key = 1 1
 			}
+
+			//never flown
+			//ion engine failures are extremely rare, and most have only flown in small numbers
+			//just make our own data
+			TESTFLIGHT:NEEDS[TestLite|TestFlight]
+			{
+				ratedBurnTime = 18000000	//HET, 5,000 hours?
+
+				ignitionReliabilityStart = 0.99
+				ignitionReliabilityEnd = 0.9999
+				cycleReliabilityStart = 0.99
+				cycleReliabilityEnd = 0.9999
+
+				techTransfer = 457M-V1-K:50
+			}
 		}
 		CONFIG
 		{
 			name = 457M-V1-K
-			description =  Modified 457M thruster with a krypton propellant, keeping the voltage at 650V. Even higher specific impulse due to lower molecular weight of the gas.
+			description =  Modified 457M thruster with a krypton propellant, keeping the voltage at 650V. Even higher specific impulse due to lower molecular weight of the gas. Efficiency 58%, 2.19 kg/kW.
+			specLevel = prototype
 			minThrust = 0.000622
 			maxThrust = 0.002473
 			heatProduction = 30240 // efficiency 0.58
@@ -130,7 +152,7 @@
 			PROPELLANT
 			{
 				name = ElectricCharge
-				ratio = 4041.574
+				ratio = 4085.84
 				minResToLeave = 10.0
 				DrawGauge = True
 			}
@@ -139,11 +161,27 @@
 				key = 0 3817
 				key = 1 1
 			}
+
+			//never flown
+			//ion engine failures are extremely rare, and most have only flown in small numbers
+			//just make our own data
+			TESTFLIGHT:NEEDS[TestLite|TestFlight]
+			{
+				ratedBurnTime = 18000000	//HET, 5,000 hours?
+
+				ignitionReliabilityStart = 0.99
+				ignitionReliabilityEnd = 0.9999
+				cycleReliabilityStart = 0.99
+				cycleReliabilityEnd = 0.9999
+
+				techTransfer = 457M-V1:50
+			}
 		}
 		CONFIG
 		{
 			name = 457M-V2
-			description =  The successful test campaign with the laboratory model NASA-457M led to the development of a higher fidelity version of this thruster, labeled the NASA-457M v2.
+			description =  The successful test campaign with the laboratory model NASA-457M led to the development of a higher fidelity version of this thruster, labeled the NASA-457M v2. Efficiency 63%, 2.38 kg/kW.
+			specLevel = prototype
 			minThrust = 0.000400
 			maxThrust = 0.0019864
 			heatProduction = 18500 // efficiency 0.63
@@ -158,7 +196,7 @@
 			PROPELLANT
 			{
 				name = ElectricCharge
-				ratio = 3968.25
+				ratio = 3986.59
 				minResToLeave = 10.0
 				DrawGauge = True
 			}
@@ -167,6 +205,21 @@
 				key = 0 2740
 				key = 1 1
 			}
+
+			//never flown
+			//ion engine failures are extremely rare, and most have only flown in small numbers
+			//just make our own data
+			TESTFLIGHT:NEEDS[TestLite|TestFlight]
+			{
+				ratedBurnTime = 36000000	//reduced voltage to increase life, 10,000 hours?
+
+				ignitionReliabilityStart = 0.99
+				ignitionReliabilityEnd = 0.9999
+				cycleReliabilityStart = 0.99
+				cycleReliabilityEnd = 0.9999
+
+				techTransfer = 457M-V1,457M-V1-K:50
+			}
 		}
 	}
 }