From af003682a769be6f25ed6caabd346d3211002da3 Mon Sep 17 00:00:00 2001 From: Richard Crockford Date: Mon, 24 Oct 2022 14:26:05 +0100 Subject: [PATCH 1/2] Fix Jupiter radiative heating and atmosphere curves --- .../RSSKopernicus/Jupiter/Jupiter.cfg | 248 ++++++++++++------ 1 file changed, 172 insertions(+), 76 deletions(-) diff --git a/GameData/RealSolarSystem/RSSKopernicus/Jupiter/Jupiter.cfg b/GameData/RealSolarSystem/RSSKopernicus/Jupiter/Jupiter.cfg index bdda0a83..ab6737bb 100644 --- a/GameData/RealSolarSystem/RSSKopernicus/Jupiter/Jupiter.cfg +++ b/GameData/RealSolarSystem/RSSKopernicus/Jupiter/Jupiter.cfg @@ -126,6 +126,9 @@ } Atmosphere { + // Galileo data in this section taken from https://pds-atmospheres.nmsu.edu/PDS/data/gp_0001/data/asi/upperatm.tab + // and https://pds-atmospheres.nmsu.edu/PDS/data/gp_0001/data/asi/loweratm.tab + // effectively the ambient lighting color for all objects on the ground of this body (provides a slight tint) ambientColor = 0.10,0.05,0.10,1 //not custom for Jupiter yet @@ -139,92 +142,185 @@ oxygen = false maxAltitude = 1550000.0 - // constants - adiabaticIndex = 1.44 - atmosphereMolarMass = 0.002264 + // constants, taken from Galileo data, average for upper atmosphere + adiabaticIndex = 1.4775 + atmosphereMolarMass = 0.0022105 // Atmosphere Pressure staticPressureASL = 101325 pressureCurve { - key = 0 101325 0 -0.568169 - key = 20000 90406.4 -0.524069 -0.524069 - key = 40000 80347.5 -0.482175 -0.482175 - key = 60000 71105.1 -0.442415 -0.442415 - key = 80000 62637.2 -0.404717 -0.404717 - key = 100000 54903.2 -0.369013 -0.369013 - key = 120000 47863.8 -0.335235 -0.335235 - key = 140000 41481.3 -0.303320 -0.303320 - key = 160000 35719.1 -0.273204 -0.273204 - key = 180000 30541.6 -0.244831 -0.244831 - key = 200000 25914.6 -0.218144 -0.218144 - key = 220000 21804.9 -0.193093 -0.193093 - key = 240000 18180.3 -0.169635 -0.169635 - key = 260000 15009.1 -0.147735 -0.147735 - key = 280000 12260.6 -0.127370 -0.127370 - key = 300000 9904.12 -0.108534 -0.108534 - key = 320000 7906.75 -0.0915514 -0.0915514 - key = 340000 6228.75 -0.0765672 -0.0765672 - key = 360000 4831.89 -0.0634086 -0.0634086 - key = 380000 3681.31 -0.0519143 -0.0519143 - key = 400000 2745.24 -0.0419332 -0.0419332 - key = 420000 1994.83 -0.0333247 -0.0333247 - key = 440000 1403.97 -0.0259580 -0.0259580 - key = 460000 949.051 -0.0197109 -0.0197109 - key = 480000 608.889 -0.0144640 -0.0144640 - key = 500000 364.346 -0.0101387 -0.0101387 - key = 520000 197.598 -0.00667475 -0.00667475 - key = 540000 92.0003 -0.00401205 -0.00401205 - key = 560000 33.5753 -0.00191733 -0.00191733 - key = 580000 9.93185 -0.000616810 -0.000616810 - key = 600000 3.03837 -0.000168624 -0.000168624 - key = 650000 0.273440 -1.20672E-05 -1.20672E-05 - key = 700000 0.0299471 -1.33238E-06 -1.33238E-06 - key = 750000 0.00318079 -1.43625E-07 -1.43625E-07 - key = 800000 0.000342024 -1.44869E-08 -1.44869E-08 - key = 850000 5.09093E-05 -1.69699E-09 -1.69699E-09 - key = 900000 1.43409E-05 -2.74157E-10 -2.74157E-10 - key = 950000 6.38012E-06 -8.97649E-11 -8.97649E-11 - key = 1000000 3.36913E-06 -3.94480E-11 -3.94480E-11 - key = 1100000 1.18960E-06 -1.12340E-11 -1.12340E-11 - key = 1200000 4.89461E-07 -4.13091E-12 -4.13091E-12 - key = 1300000 2.16559E-07 -1.71495E-12 -1.71495E-12 - key = 1400000 9.97426E-08 -7.58972E-13 -7.58972E-13 - key = 1550000 0 0 0 + // Extrapolated data + key = 0 98078.6 -1.96157 -1.96157 + key = 10000 78462.9 -1.503872 -1.503872 + key = 25000 62770.3 -0.9415567 -0.9415567 + key = 40000 50216.2 -0.7532433 -0.7532433 + key = 55000 40173 -0.6025933 -0.6025933 + key = 70000 32138.4 -0.4820767 -0.4820767 + key = 85000 25710.7 -0.38566 -0.38566 + key = 100000 20568.6 -0.3085299 -0.3085299 + key = 115000 16454.8 -0.2468233 -0.2468233 + key = 130000 13163.9 -0.1974567 -0.1974567 + key = 145000 10531.1 -0.157967 -0.157967 + key = 160000 8424.89 -0.126373 -0.126373 + key = 175000 6739.91 -0.1010986 -0.1010986 + key = 190000 5391.93 -0.080879 -0.080879 + key = 205000 4313.54 -0.06470334 -0.06470334 + key = 220000 3450.83 -0.05176234 -0.05176234 + key = 235000 2760.67 -0.04141 -0.04141 + // Data from the Galileo probe ASI, note that altitudes are shifted from the real data as zero altitude is the 1000 bar point in KSP + key = 250000 2208.53 -0.034141 -0.034141 + key = 265000 1736.44 -0.02893933 -0.02893933 + key = 280000 1340.35 -0.02378395 -0.02378395 + key = 300000 917.112 -0.01856175 -0.01856175 + key = 320000 597.88 -0.01378082 -0.01378082 + key = 340000 365.879 -0.009815101 -0.009815101 + key = 360000 205.276 -0.00661385 -0.00661385 + key = 380000 101.325 -0.004094738 -0.004094738 + key = 400000 41.4865 -0.00218897 -0.00218897 + key = 420000 13.7662 -0.0009263575 -0.0009263575 + key = 440000 4.4322 -0.0003026 -0.0003026 + key = 460000 1.6622 -9.261432E-05 -9.261432E-05 + key = 480000 0.727627 -3.374212E-05 -3.374212E-05 + key = 500000 0.312515 -1.478427E-05 -1.478427E-05 + key = 520000 0.136256 -6.240447E-06 -6.240447E-06 + key = 540000 0.0628971 -2.690145E-06 -2.690145E-06 + key = 560000 0.0286502 -1.253107E-06 -1.253107E-06 + key = 580000 0.0127728 -5.744015E-07 -5.744015E-07 + key = 600000 0.00567414 -2.565243E-07 -2.565243E-07 + key = 620000 0.00251183 -1.140493E-07 -1.140493E-07 + key = 640000 0.00111217 -5.06054E-08 -5.06054E-08 + key = 660000 0.000487614 -2.227025E-08 -2.227025E-08 + key = 680000 0.00022136 -9.266375E-09 -9.266375E-09 + key = 700000 0.000116959 -4.001665E-09 -4.001665E-09 + key = 720000 6.12934E-05 -2.070188E-09 -2.070188E-09 + key = 740000 3.41515E-05 -9.984851E-10 -9.984851E-10 + key = 760000 2.1354E-05 -4.829175E-10 -4.829175E-10 + key = 780000 1.48348E-05 -2.6218E-10 -2.6218E-10 + key = 800000 1.08668E-05 -1.64371E-10 -1.64371E-10 + key = 820000 8.25996E-06 -1.065115E-10 -1.065115E-10 + key = 840000 6.60634E-06 -7.309825E-11 -7.309825E-11 + key = 860000 5.33603E-06 -5.731125E-11 -5.731125E-11 + key = 880000 4.31389E-06 -4.5109E-11 -4.5109E-11 + key = 900000 3.53167E-06 -3.427399E-11 -3.427399E-11 + key = 920000 2.94293E-06 -2.635275E-11 -2.635275E-11 + key = 940000 2.47756E-06 -2.1208E-11 -2.1208E-11 + key = 960000 2.09461E-06 -1.764475E-11 -1.764475E-11 + key = 980000 1.77177E-06 -1.4864E-11 -1.4864E-11 + key = 1000000 1.50005E-06 -1.24695E-11 -1.24695E-11 + key = 1020000 1.27299E-06 -1.0444E-11 -1.0444E-11 + key = 1040000 1.08229E-06 -8.725949E-12 -8.725949E-12 + key = 1060000 9.23952E-07 -7.227476E-12 -7.227476E-12 + key = 1080000 7.93191E-07 -5.963849E-12 -5.963849E-12 + key = 1100000 6.85398E-07 -4.915751E-12 -4.915751E-12 + key = 1120000 5.96561E-07 -4.084299E-12 -4.084299E-12 + key = 1140000 5.22026E-07 -3.4459E-12 -3.4459E-12 + key = 1160000 4.58725E-07 -2.944001E-12 -2.944001E-12 + key = 1180000 4.04266E-07 -2.5455E-12 -2.5455E-12 + key = 1200000 3.56905E-07 -2.2227E-12 -2.2227E-12 + key = 1220000 3.15358E-07 -1.95885E-12 -1.95885E-12 + key = 1240000 2.78551E-07 -1.735275E-12 -1.735275E-12 + key = 1260000 2.45947E-07 -1.539625E-12 -1.539625E-12 + key = 1280000 2.16966E-07 -1.3659E-12 -1.3659E-12 + key = 1300000 1.91311E-07 -1.2084E-12 -1.2084E-12 + key = 1320000 1.6863E-07 -1.06335E-12 -1.06335E-12 + key = 1340000 1.48777E-07 -9.289E-13 -9.289E-13 + key = 1360000 1.31474E-07 -8.114751E-13 -8.114751E-13 + key = 1380000 1.16318E-07 -7.083999E-13 -7.083999E-13 + key = 1400000 1.03138E-07 -5.35776E-13 -5.35776E-13 + // Extrapolated data + key = 1450000 8.25104E-08 -3.71297E-13 -3.71297E-13 + key = 1500000 6.60083E-08 -2.970379E-13 -2.970379E-13 + key = 1550000 5.28066E-08 -2.640339E-13 -2.640339E-13 } // Atmosphere Temperature temperatureSeaLevel = 166 temperatureCurve { - key = 0 1278.3 0 -0.002117 - key = 100000 1063.4 -0.002174 -0.002174 - key = 200000 846.6 -0.002133 -0.002133 - key = 300000 648.5 -0.001735 -0.001735 - key = 400000 463.9 -0.001970 -0.001970 - key = 480000 297.6 -0.002165 -0.002165 - key = 530000 185.8 -0.002358 -0.002358 - key = 560000 123.5 -0.001300 -0.001300 - key = 576250 113.0 0 0 - key = 590000 118.6 0.000718 0.000718 - key = 610000 136.2 0.000921 0.000921 - key = 630000 152.2 0.000620 0.000620 - key = 652000 159.5 0 0 - key = 690000 158.4 -0.000049 -0.000049 - key = 730000 156.2 -0.000052 -0.000052 - key = 769750 155.0 0 0 - key = 790000 160.0 0.000467 0.000467 - key = 815000 175.4 0.000720 0.000720 - key = 840000 197.6 0.001072 0.001072 - key = 850000 209.8 0.001712 0.001712 - key = 870000 265.4 0.003359 0.003359 - key = 900000 365.4 0.003110 0.003110 - key = 950000 495.8 0.002236 0.002236 - key = 1000000 594.9 0.001756 0.001756 - key = 1100000 735.5 0.001097 0.001097 - key = 1200000 820.7 0.000650 0.000650 - key = 1300000 872.1 0.000403 0.000403 - key = 1400000 905.1 0.000270 0.000270 - key = 1550000 932.3 0.000106 0 + // Fudge data point to fix emissivity from planet - this value is used for radiative heating for orbiting craft. + // This value is the approximate effective temperature for Jupiter. + key = 0 152 0.12047 0.12047 + // Extrapolated data, it is assumed that compressive heating raises the temperature towards Jupiter's core. + key = 10000 1356.7 0.05707833 0.05707833 + key = 25000 1262 -0.006089998 -0.006089998 + key = 40000 1174 -0.005663334 -0.005663334 + key = 55000 1092.1 -0.005269999 -0.005269999 + key = 70000 1015.9 -0.004903332 -0.004903332 + key = 85000 945 -0.004560002 -0.004560002 + key = 100000 879.1 -0.004240001 -0.004240001 + key = 115000 817.8 -0.003946666 -0.003946666 + key = 130000 760.7 -0.003673334 -0.003673334 + key = 145000 707.6 -0.003413334 -0.003413334 + key = 160000 658.3 -0.003176666 -0.003176666 + key = 175000 612.3 -0.002956667 -0.002956667 + key = 190000 569.6 -0.002746665 -0.002746665 + key = 205000 529.9 -0.002556666 -0.002556666 + key = 220000 492.9 -0.002380001 -0.002380001 + key = 235000 458.5 -0.002213333 -0.002213333 + // Data from the Galileo probe ASI, note that altitudes are shifted from the real data as zero altitude is the 1000 bar point in KSP + key = 250000 426.5 -0.002046667 -0.002046667 + key = 265000 397.1 -0.001963333 -0.001963333 + key = 280000 367.6 -0.001968333 -0.001968333 + key = 300000 328.2 -0.001975 -0.001975 + key = 320000 288.6 -0.00199 -0.00199 + key = 340000 248.6 -0.0020175 -0.0020175 + key = 360000 207.9 -0.0020625 -0.0020625 + key = 380000 166.1 -0.0020075 -0.0020075 + key = 400000 127.6 -0.0013225 -0.0013225 + key = 420000 113.2 -0.000125 -0.000125 + key = 440000 122.6 0.0007650002 0.0007650002 + key = 460000 143.8 0.000885 0.000885 + key = 480000 158 0.0001524997 0.0001524997 + key = 500000 149.9 7.750014E-05 7.750014E-05 + key = 520000 161.1 0.0004650002 0.0004650002 + key = 540000 168.5 -8.749998E-05 -8.749998E-05 + key = 560000 157.6 -0.0002625 -0.0002625 + key = 580000 158 -1.500015E-05 -1.500015E-05 + key = 600000 157 -5.499992E-05 -5.499992E-05 + key = 620000 155.8 -0.0001474998 -0.0001474998 + key = 640000 151.1 -5.250015E-05 -5.250015E-05 + key = 660000 153.7 0.0007574997 0.0007574997 + key = 680000 181.4 0.0010375 0.0010375 + key = 700000 195.2 0.000425 0.000425 + key = 720000 198.4 0.0009325001 0.0009325001 + key = 740000 232.5 0.0022725 0.0022725 + key = 760000 289.3 0.0034225 0.0034225 + key = 780000 369.4 0.002597501 0.002597501 + key = 800000 393.2 0.00284 0.00284 + key = 820000 483 0.003557499 0.003557499 + key = 840000 535.5 0.00132 0.00132 + key = 860000 535.8 0.0002675003 0.0002675003 + key = 880000 546.2 0.001465001 0.001465001 + key = 900000 594.4 0.0024075 0.0024075 + key = 920000 642.5 0.001739999 0.001739999 + key = 940000 664 0.0006949997 0.0006949997 + key = 960000 670.3 0.0001475006 0.0001475006 + key = 980000 669.9 0.0001050003 0.0001050003 + key = 1000000 674.5 0.0002599991 0.0002599991 + key = 1020000 680.3 0.0004550003 0.0004550003 + key = 1040000 692.7 0.0008100006 0.0008100006 + key = 1060000 712.7 0.0012075 0.0012075 + key = 1080000 741 0.001584999 0.001584999 + key = 1100000 776.1 0.001775 0.001775 + key = 1120000 812 0.001597501 0.001597501 + key = 1140000 840 0.001255 0.001255 + key = 1160000 862.2 0.0009274994 0.0009274994 + key = 1180000 877.1 0.0005550003 0.0005550003 + key = 1200000 884.4 0.0002050003 0.0002050003 + key = 1220000 885.3 -7.5E-05 -7.5E-05 + key = 1240000 881.4 -0.0002524994 -0.0002524994 + key = 1260000 875.2 -0.0003075012 -0.0003075012 + key = 1280000 869.1 -0.0002449997 -0.0002449997 + key = 1300000 865.4 -7.5E-05 -7.5E-05 + key = 1320000 866.1 0.0001699997 0.0001699997 + key = 1340000 872.2 0.0004450012 0.0004450012 + key = 1360000 883.9 0.0006175003 0.0006175003 + key = 1380000 896.9 0.0004849991 0.0004849991 + key = 1400000 903.3 0.0002499991 0.0002499991 + // Extrapolated data + key = 1450000 912.3 0.0001079999 0.0001079999 + key = 1500000 914.1 3.600037E-05 3.600037E-05 + key = 1550000 915.9 3.600098E-05 3.600098E-05 } temperatureSunMultCurve { From 4071994b4a9169ab0239b77e9ce783c6a0148751 Mon Sep 17 00:00:00 2001 From: Richard Crockford Date: Thu, 27 Oct 2022 09:07:10 +0100 Subject: [PATCH 2/2] Add Jupiter specific normalmap --- GameData/RealSolarSystem/RSSKopernicus/Jupiter/Jupiter.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GameData/RealSolarSystem/RSSKopernicus/Jupiter/Jupiter.cfg b/GameData/RealSolarSystem/RSSKopernicus/Jupiter/Jupiter.cfg index ab6737bb..0947388b 100644 --- a/GameData/RealSolarSystem/RSSKopernicus/Jupiter/Jupiter.cfg +++ b/GameData/RealSolarSystem/RSSKopernicus/Jupiter/Jupiter.cfg @@ -108,7 +108,7 @@ Material { texture = RSS-Textures/PluginData/JupiterColor.dds - normals = RSS-Textures/PluginData/Flat_NRM.dds + normals = RSS-Textures/PluginData/Jupiter_NRM.dds shininess = 0.05 specular = 0,0,0.1,1