Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix MM issue in RO_RealFuels.cfg #2893

Merged
merged 3 commits into from
Aug 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 66 additions & 31 deletions GameData/RealismOverhaul/RO_RealFuels.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ TANK_DEFINITION
defaultMass = 0.00006
}


TANK_DEFINITION
{
name = Tank-Sep-Steel-HP
Expand Down Expand Up @@ -430,7 +429,7 @@ TANK_DEFINITION
addSoundingPayload = true
maxUtilization = 50
defaultMass = 0.00028

TANK
{
name = ElectricCharge
Expand All @@ -454,7 +453,7 @@ TANK_DEFINITION
addSoundingPayload = true
maxUtilization = 50
defaultMass = 0.000216

TANK
{
name = ElectricCharge
Expand All @@ -478,7 +477,7 @@ TANK_DEFINITION
addSoundingPayload = true
maxUtilization = 60
defaultMass = 0.00016

TANK
{
name = ElectricCharge
Expand All @@ -502,7 +501,7 @@ TANK_DEFINITION
addSoundingPayload = true
maxUtilization = 75
defaultMass = 0.000096

TANK
{
name = ElectricCharge
Expand Down Expand Up @@ -669,7 +668,7 @@ disabledPARTUPGRADE
title = Isogrid Tank Upgrade
basicInfo = You can now use Aluminum gridded tanks
manufacturer = Generic
description = You can now use Aluminum gridded tanks. Isogrids and orthogrids are advanced hollowed-out structures milled out of a single block of material that have very high rigidity yet exceptional material and mass savings. The delicate & complex lattices on the panel require very high precision machining and thus such a construction is much more expensive to produce than more standard tanks. Nevertheless, gridded tanks have been utilized by nearly every NASA orbital vehicle since the very first to use gridded aluminum construction: the Thor/Delta and Titan rockets as well as the Agena upper stage.
description = You can now use Aluminum gridded tanks. Isogrids and orthogrids are advanced hollowed-out structures milled out of a single block of material that have very high rigidity yet exceptional material and mass savings. The delicate & complex lattices on the panel require very high precision machining and thus such a construction is much more expensive to produce than more standard tanks. Nevertheless, gridded tanks have been utilized by nearly every NASA orbital vehicle since the very first to use gridded aluminum construction: the Thor/Delta and Titan rockets as well as the Agena upper stage.
}

PARTUPGRADE
Expand Down Expand Up @@ -792,7 +791,7 @@ PARTUPGRADE
%TANK[PotassiumSuperoxide] {}
%TANK[Waste] { %fillable = False }
%TANK[WasteWater] { %fillable = False }

//everything else down here
%TANK[Aerozine50] {}
%TANK[CooledAerozine50] {} //273 K, but we're gonna ignore that for now
Expand Down Expand Up @@ -955,7 +954,10 @@ PARTUPGRADE
@TANK[Diborane] { @temperature = 215.2 } //calculated with Peng-Robinson. high thermal expansion, hits 90% of 1 atm density before boiling
@TANK[Ethane] { @temperature = 255.1 } //No significant thermal expansion
@TANK[Ethylene] { @temperature = 207.1 } //high thermal expansion, hits 90% of 1 atm density before boiling
@TANK[LqdFluorine|FLOX30|FLOX70|FLOX88] { @temperature = 118.5 } //No significant thermal expansion
@TANK[LqdFluorine] { @temperature = 118.5 } //No significant thermal expansion
@TANK[FLOX30] { @temperature = 118.5 } //No significant thermal expansion
@TANK[FLOX70] { @temperature = 118.5 } //No significant thermal expansion
@TANK[FLOX88] { @temperature = 118.5 } //No significant thermal expansion
@TANK[LqdHelium] { @temperature = 8.39 } //supercritical, set bp to point where density is 90% of liquid phase at 1 atm
@TANK[LqdHydrogen] { @temperature = 27.2 } //high thermal expansion, hits 90% of 1 atm density before boiling
@TANK[LqdMethane] { @temperature = 137.4 } //high thermal expansion, hits 90% of 1 atm density before boiling
Expand Down Expand Up @@ -992,85 +994,115 @@ PARTUPGRADE
// and the gas can be captured (if applicable)
@TANK_DEFINITION:HAS[#addResourcesSM[true],~preserveResources[true]]:FIRST
{
@TANK[LqdAmmonia] {
@TANK[LqdAmmonia]
{
@temperature = 283.2 //high thermal expansion, hits 90% of 1 atm density before boiling
%isDewar = True
%boiloffProduct = Ammonia
}
@TANK[ClF3] {
@TANK[ClF3]
{
@temperature = 358.2 //calculated with peng-robinson. high thermal expansion, hits 90% of 1 atm density before boiling. decomposes above 473.2 K
}
@TANK[ClF5] {
@TANK[ClF5]
{
@temperature = 314.2 //calculated with peng-robinson. high thermal expansion, hits 90% of 1 atm density before boiling.
%isDewar = True
}
@TANK[Diborane] {
@TANK[Diborane]
{
@temperature = 358.1 //FIXME: Using liquid parameters, but supercritical at 100 bar
}
@TANK[Ethane] {
@TANK[Ethane]
{
@temperature = 349 //supercritical, set bp to point where density is 90% of liquid phase at 1 atm
%isDewar = True
}
@TANK[Ethylene] {
@TANK[Ethylene]
{
@temperature = 221.2 //high thermal expansion, hits 90% of 1 atm density before boiling
%isDewar = True
%isDewar = True
}
@TANK[LqdFluorine] {
@TANK[LqdFluorine]
{
@temperature = 109.6 //high thermal expansion, hits 90% of 1 atm density before boiling
%isDewar = True
%boiloffProduct = Fluorine
}
@TANK[FLOX30|FLOX70|FLOX88] {
@TANK[FLOX30]
{
@temperature = 109.6 //high thermal expansion, hits 90% of 1 atm density before boiling
%isDewar = True
}
@TANK[FLOX70]
{
@temperature = 109.6 //high thermal expansion, hits 90% of 1 atm density before boiling
%isDewar = True
}
@TANK[FLOX88]
{
@temperature = 109.6 //high thermal expansion, hits 90% of 1 atm density before boiling
%isDewar = True
%isDewar = True
}
@TANK[LqdHelium] {
@TANK[LqdHelium]
{
@temperature = 43.8 //supercritical, set bp to point where density is 90% of liquid phase at 1 atm
%isDewar = True
%boiloffProduct = Helium
}
@TANK[LqdHydrogen] {
@TANK[LqdHydrogen]
{
@temperature = 39.6 //supercritical, set bp to point where density is 90% of liquid phase at 1 atm
%isDewar = True
%boiloffProduct = Hydrogen
}
@TANK[LqdMethane] {
@TANK[LqdMethane]
{
@temperature = 150.0 //high thermal expansion, hits 90% of 1 atm density before boiling
%isDewar = True
%boiloffProduct = Methane
}
@TANK[MON10] {
@TANK[MON10]
{
@temperature = 361.0 //Probably supercritical, and Peng-Robinsion doesn't work for mixtures. Guess
}
@TANK[MON15] {
@TANK[MON15]
{
@temperature = 356.6 //Probably supercritical, and Peng-Robinsion doesn't work for mixtures. Guess
}
@TANK[MON20] {
@TANK[MON20]
{
@temperature = 352.1 //Probably supercritical, and Peng-Robinsion doesn't work for mixtures. Guess
}
@TANK[MON25] {
@TANK[MON25]
{
@temperature = 347.8 //Probably supercritical, and Peng-Robinsion doesn't work for mixtures. Guess
%isDewar = True
}
@TANK[N2F4] {
@TANK[N2F4]
{
@temperature = 340 //FIXME: Guess, similar to Ethane?
%isDewar = True
}
@TANK[LqdNitrogen] {
@TANK[LqdNitrogen]
{
@temperature = 101.7 //high thermal expansion, hits 90% of 1 atm density before boiling
%isDewar = True
%boiloffProduct = Nitrogen
}
@TANK[OF2] {
@TANK[OF2]
{
@temperature = 168.0 //calculated with Peng-Robinson. high thermal expansion, hits 90% of 1 atm density before boiling
%isDewar = True
}
@TANK[LqdOxygen] {
@TANK[LqdOxygen]
{
@temperature = 117.9 //high thermal expansion, hits 90% of 1 atm density before boiling
%isDewar = True
%boiloffProduct = Oxygen
}
@TANK[CooledLqdOxygen] {
@TANK[CooledLqdOxygen]
{
@temperature = 93
%isDewar = True
%boiloffProduct = Oxygen
Expand Down Expand Up @@ -1108,7 +1140,10 @@ PARTUPGRADE
{
@TANK,* { &mass = #$../defaultMass$ }
}
@TANK_DEFINITION:HAS[#defaultMass]:FOR[zzzTagCleanup] { -defaultMass = DEL }
@TANK_DEFINITION:HAS[#defaultMass]:FOR[zzzTagCleanup]
{
-defaultMass = DEL
}

// LH2 tank mass correction
@TANK_DEFINITION:HAS[~balloonTemps[true],~preserveResources[true]] // not FIRST anymore.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
!MODULE[TweakScale]
{
}
%MODULE[ModuleRTAntenna]:FOR[zzzRealismOverhaul]
%MODULE[ModuleRTAntenna]
{
@Mode0OmniRange = 0
@Mode1OmniRange = 40000000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1431,7 +1431,7 @@
}
!MODULE[ModuleDataTransmitter]
{}
%MODULE[ModuleRTAntennaPassive]:FOR[zzzRealismOverhaul]
%MODULE[ModuleRTAntennaPassive]
{
%OmniRange = 1500000

Expand Down Expand Up @@ -1467,7 +1467,7 @@
}
!MODULE[ModuleDataTransmitter]
{}
%MODULE[ModuleRTAntennaPassive]:FOR[zzzRealismOverhaul]
%MODULE[ModuleRTAntennaPassive]
{
%OmniRange = 1500000

Expand Down
Loading