prep for master merge

This commit is contained in:
ElonOlsson
2021-05-04 15:18:19 -04:00
parent 5c143da954
commit a5e577eb54
3 changed files with 26 additions and 28 deletions

View File

@@ -58,10 +58,10 @@ local earthMagnetosphere = {
assetHelper.registerSceneGraphNodesAndExport(asset, { earthMagnetosphere })
asset.meta = {
Name = "Predictive Science Inc. Fieldlines Bastille Day",
Name = "",
Version = "1.0",
Description = " Magnetic fieldlines for the bastille day CME event ",
Author = "OpenSpace team",
URL = "https://dx.doi.org/10.3847/1538-4357/aab36d",
URL = "",
License = ""
}

View File

@@ -22,7 +22,7 @@ local fieldlines = {
Renderable = {
Type = "RenderableFieldlinesSequence",
SourceFolder = fieldlinesDirectory,
SeedPointDirectory = seedPointDirectory,
--SeedPointDirectory = seedPointDirectory,
TracingVariable = 'b',
--OutputFolder = "C:/Users/eolsson/Documents/openspace/data/20000101/osfls/",

View File

@@ -4,7 +4,6 @@
"util/default_dashboard",
"scene/solarsystem/sun/sun_textures",
"scene/solarsystem/sun/EUV_layer",
"scene/solarsystem/sun/heliosphere/bastille_day/bastille_day_sun_textures",
"scene/solarsystem/sun/heliosphere/bastille_day/density_volume",
"scene/solarsystem/sun/heliosphere/bastille_day/fieldlines",
@@ -15,7 +14,6 @@
"scene/solarsystem/sun/heliosphere/bastille_day/fluxnodes",
"scene/solarsystem/sun/heliosphere/bastille_day/fluxnodescutplane",
"scene/solarsystem/sun/heliosphere/bastille_day/fluxnodeslegend",
"scene/solarsystem/planets/earth/earth",
"scene/solarsystem/planets/earth/magnetosphere",
"scene/solarsystem/planets/earth/satellites/satellites",
@@ -127,15 +125,15 @@
"documentation": "Display next sun texture in list of textures",
"gui_path": "/CCMC/Nodes",
"is_local": false,
"key": "i",
"key": "I",
"name": "Next sun texture",
"script": "textureList = openspace.globebrowsing.getLayers('Sun', 'ColorLayers');if (textureIndex == nil) then textureIndex = 2;end;textureIndex = textureIndex + 1;if (textureIndex >= #textureList) then textureIndex = 0;end;if (textureIndex == 0) then openspace.setPropertyValue(\"Scene.Sun.Renderable.Layers.ColorLayers.*.Enabled\", false);openspace.setPropertyValueSingle(\"Scene.Sun.Renderable.Layers.ColorLayers.Texture.Enabled\", true);else openspace.setPropertyValue(\"Scene.Sun.Renderable.Layers.ColorLayers.*.Enabled\", false);str = \"Scene.Sun.Renderable.Layers.ColorLayers.magnetogram-\" .. textureIndex .. \".Enabled\";openspace.setPropertyValueSingle(str, true);end;"
},
},
{
"documentation": "Transition Magnetosphere",
"gui_path": "/CCMC/Nodes",
"is_local": false,
"key": "Shift+a",
"key": "SHIFT+A",
"name": "Transition Magnetosphere",
"script": "propertyHelper.invert('Scene.Earths_Magnetosphere.Renderable.Enabled');openspace.setPropertyValueSingle('Scene.Earths_Magnetosphere.Renderable.lineWidth', 1.500000);openspace.setPropertyValueSingle('Scene.Earths_Magnetosphere.Renderable.Color.uniform', {0.300000,0.570000,0.750000,0.00000});openspace.setPropertyValueSingle('Scene.Earths_Magnetosphere.Renderable.Color.uniform', {0.300000,0.570000,0.750000,0.50000}, 8);"
},
@@ -143,7 +141,7 @@
"documentation": "transition when zooming out nodes+cutplane, nmbr 12",
"gui_path": "/CCMC/Nodes",
"is_local": false,
"key": "Shift+b",
"key": "SHIFT+B",
"name": "Transition zooming out nodes + cutplane",
"script": "openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.Streams.filterUpper', 5, 5);openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.Streams.thresholdFlux', -1);openspace.setPropertyValueSingle('Scene.MAS_MHD_Fieldlines.Renderable.Enabled', false);openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.NodeGroup.nodeSizeLargerFlux', 2.00000, 10);"
},
@@ -151,7 +149,7 @@
"documentation": "New loop: Restarts time at 10:03 and stops at 10:40, sets delta time to 4 min/ second (240 seconds/ second)",
"gui_path": "/CCMC/Nodes",
"is_local": false,
"key": "Shift+d",
"key": "SHIFT+D",
"name": "Loop 10:03 - 10:40, delta time 4 min/ second",
"script": "openspace.scriptScheduler.clear();openspace.time.setDeltaTime(240);openspace.time.setTime('2000-JUL-14 10:03:00.00');starttimeEarth = '2000 JUL 14 10:40:00';StarttimescriptSlowLoop = \"openspace.time.setTime('2000 JUL 14 10:03:00')\";openspace.scriptScheduler.loadScheduledScript(starttimeEarth, StarttimescriptSlowLoop);"
},
@@ -159,7 +157,7 @@
"documentation": "Turn off sun glare, turn on field lines, increase field lines line width, change layer on the Sun to magnetogram 3",
"gui_path": "/CCMC/Nodes",
"is_local": false,
"key": "Shift+e",
"key": "SHIFT+E",
"name": "Third transition Emilie",
"script": "openspace.setPropertyValueSingle('Scene.SunGlare.Renderable.Enabled', false);openspace.setPropertyValueSingle('Scene.MAS_MHD_Fieldlines.Renderable.lineWidth', 4.000000);openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'focusPoint');openspace.setPropertyValueSingle('Scene.MAS_MHD_Fieldlines.Renderable.Enabled', true);openspace.setPropertyValueSingle('Scene.MAS_MHD_Fieldlines.Renderable.Color.uniform', {0.300000,0.570000,0.750000,0.000000});openspace.setPropertyValueSingle('Scene.MAS_MHD_Fieldlines.Renderable.Color.uniform', {0.300000,0.570000,0.750000,0.500000}, 6);openspace.setPropertyValueSingle('Scene.Sun.Renderable.Layers.ColorLayers.magnetogram-1.Enabled', false);openspace.setPropertyValueSingle('Scene.Sun.Renderable.Layers.ColorLayers.magnetogram-2.Enabled', false);openspace.setPropertyValueSingle('Scene.Sun.Renderable.Layers.ColorLayers.magnetogram-4.Enabled', false);openspace.setPropertyValueSingle('Scene.Sun.Renderable.Layers.ColorLayers.magnetogram-5.Enabled', false);openspace.setPropertyValueSingle('Scene.Sun.Renderable.Layers.ColorLayers.magnetogram-6.Enabled', false);openspace.setPropertyValueSingle('Scene.Sun.Renderable.Layers.ColorLayers.magnetogram-3.Enabled', true);"
},
@@ -167,7 +165,7 @@
"documentation": "Enable nodes with some filters",
"gui_path": "/CCMC/Nodes",
"is_local": false,
"key": "Shift+h",
"key": "SHIFT+H",
"name": "Last transition Emilie",
"script": "openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.Enabled', true);openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.NodeGroup.nodeSize', 5.200000);openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.NodeGroup.nodeSizeLargerFlux', 5.200000);openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.Streams.filterUpper', 0.190000);"
},
@@ -175,7 +173,7 @@
"documentation": "New loop: Restarts time at 10:03 and stops at 10:16, sets delta time to 2 min/ second (120 seconds/ second)",
"gui_path": "/CCMC/Nodes",
"is_local": false,
"key": "Shift+m",
"key": "SHIFT+M",
"name": "Loop 10:03 - 10:16, delta time 2 min/ second",
"script": "openspace.scriptScheduler.clear();openspace.time.setDeltaTime(120);openspace.time.setTime('2000-JUL-14 10:03:00.00');EndtimeShortLoop = \"2000 JUL 14 10:16:00\";StarttimescriptSlowLoop = \"openspace.time.setTime('2000 JUL 14 10:03:00')\";openspace.scriptScheduler.loadScheduledScript(EndtimeShortLoop, StarttimescriptSlowLoop);"
},
@@ -183,7 +181,7 @@
"documentation": "transition from cutplane to nodes",
"gui_path": "/CCMC/Nodes",
"is_local": false,
"key": "Shift+n",
"key": "SHIFT+N",
"name": "Transition cutplane to nodes",
"script": "openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.Streams.zLimit', {-2.00000,2.000000});openspace.setPropertyValueSingle('Scene.NodesMAS_MHD_FluxNodes.Renderable.Earthfocus.enhanceMethod', 3.000000);openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.Color.fluxColorAlphaIlluminance', 1, 5);openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.NodeGroup.nodeSkipEarth', 11.000000);openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable. CameraPerspective.maxNodeSize', 40.0000);openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.Streams.thresholdFlux', -1.00000);openspace.setPropertyValueSingle('Scene.SunGlare.Renderable.Enabled', true);openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.NodeGroup.amountOfNodes', 17.000000);openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable. CameraPerspective.renderingcircles', true);openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.CameraPerspective.cameraPerspectiveEnabled', true);openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Earth');openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.NodeGroup.nodeSkip', 17.000000);openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.Earthfocus.distancePlanetThreshold', 0.20000, 10);openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable. CameraPerspective.minNodeSize', 3.00000);openspace.setPropertyValueSingle('Scene.Cutplane.Renderable.Opacity', 0.000000, 7);"
},
@@ -191,7 +189,7 @@
"documentation": "Appearance change for trails",
"gui_path": "/CCMC/Nodes",
"is_local": false,
"key": "Shift+q",
"key": "SHIFT+Q",
"name": "Appearance change for trails",
"script": "openspace.setPropertyValueSingle('Scene.MercuryTrail.Renderable.Appearance.EnableFade', true);openspace.setPropertyValueSingle('Scene.MercuryTrail.Renderable.Appearance.Color', {0.700000,0.700000,0.700000});openspace.setPropertyValueSingle('Scene.MercuryTrail.Renderable.Appearance.LineWidth', 10.000000)openspace.setPropertyValueSingle('Scene.MercuryTrail.Renderable.Appearance.Fade', 2.270000);openspace.setPropertyValueSingle('Scene.MarsTrail.Renderable.Appearance.EnableFade', true);openspace.setPropertyValueSingle('Scene.MarsTrail.Renderable.Appearance.LineWidth', 10.000000);openspace.setPropertyValueSingle('Scene.MarsTrail.Renderable.Appearance.Fade', 2.710000);openspace.setPropertyValueSingle('Scene.VenusTrail.Renderable.Appearance.EnableFade', true);openspace.setPropertyValueSingle('Scene.VenusTrail.Renderable.Appearance.LineWidth', 10.000000);openspace.setPropertyValueSingle('Scene.VenusTrail.Renderable.Appearance.Fade', 1.830000);openspace.setPropertyValueSingle('Scene.EarthTrail.Renderable.Appearance.EnableFade', true);openspace.setPropertyValueSingle('Scene.EarthTrail.Renderable.Appearance.LineWidth', 10.000000);openspace.setPropertyValueSingle('Scene.EarthTrail.Renderable.Appearance.Fade', 3.440000);openspace.setPropertyValueSingle('Scene.MoonTrail.Renderable.Appearance.Color', {1.000000,1.000000,1.000000});openspace.setPropertyValueSingle('Scene.MoonTrail.Renderable.Appearance.LineWidth', 10.00000);openspace.setPropertyValueSingle('Scene.MoonTrail.Renderable.Appearance.Fade', 5.420000);"
},
@@ -199,7 +197,7 @@
"documentation": "Resets the visualisation of fluxnodes",
"gui_path": "/CCMC/Nodes",
"is_local": false,
"key": "Shift+r",
"key": "SHIFT+R",
"name": "Reset Fluxnodes Vis back",
"script": "openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.Color.colorMode', 0.000000);openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.NodeGroup.skippingNodes', 1.000000);openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.NodeGroup.amountOfNodes', 1.000000);openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.Color.fluxColorAlphaIlluminance', 1.000000);openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.NodeGroup.nodeSkip', 1.000000);openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.NodeGroup.nodeSize', 2.000000);openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.NodeGroup.nodeSizeLargerFlux', 2.00000);openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.NodeGroup.skippingNodesByFlux', 0.000000);openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.NodeGroup.skippingNodesByRadius', 0.000000);openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.Streams.thresholdFlux', 0.800000);openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.Streams.filterLower', 0.000000);openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.Streams.zLimit', {-2.00000,2.000000});openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.Earthfocus.distancePlanetThreshold', 0.000000);openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Aim', '');openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Sun');openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.Streams.zLimit', {-2.00000,2.000000});openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.Streams.filterUpper', 5.000000);"
},
@@ -207,7 +205,7 @@
"documentation": "New loop: Restarts time at 10:03 and stops at 11:00, delta time to 4 min/ second (240 seconds/ second)",
"gui_path": "/CCMC/Nodes",
"is_local": false,
"key": "Shift+s",
"key": "SHIFT+S",
"name": "Loop 10:03 - 11:00, delta time 4 min/ second",
"script": "StarttimescriptSlowLoop = \"openspace.time.setTime('2000 JUL 14 10:03:00')\";openspace.scriptScheduler.clear();openspace.time.setDeltaTime(240);openspace.time.setTime('2000-JUL-14 10:03:00.00');openspace.scriptScheduler.loadScheduledScript('2000 JUL 14 11:00:00', StarttimescriptSlowLoop);"
},
@@ -215,7 +213,7 @@
"documentation": "transition from nodes to cutplane",
"gui_path": "/CCMC/Nodes",
"is_local": false,
"key": "Shift+t",
"key": "SHIFT+T",
"name": "Transition nodeviz to cutplane",
"script": "openspace.setPropertyValueSingle('Scene.Cutplane.Renderable.Enabled', true);openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.Earthfocus.distancePlanetThreshold', 0.000000, 5);openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.Earthfocus.enhanceMethod', 3.000000);openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.Color.fluxColorAlphaIlluminance', 0.0, 6);openspace.setPropertyValueSingle('Scene.Cutplane.Renderable.Opacity', 1.000000, 10);"
},
@@ -223,7 +221,7 @@
"documentation": "Fast loop: Starts from 10:03 and sets delta time to 15 min/ second (900 seconds/ second)",
"gui_path": "/CCMC/Nodes",
"is_local": false,
"key": "Shift+v",
"key": "SHIFT+V",
"name": "Starts from 10:03, delta time 15 min/ second",
"script": "openspace.scriptScheduler.clear();openspace.time.setDeltaTime(900);openspace.time.setTime('2000-JUL-14 10:03:00.00');StarttimescriptSlowLoop = \"openspace.time.setTime('2000 JUL 14 10:03:00')\";openspace.scriptScheduler.loadScheduledScript('2000 JUL 14 12:00:00', StarttimescriptSlowLoop);"
},
@@ -231,7 +229,7 @@
"documentation": "Fast loop: Starts from 10:03 and sets delta time to 15 min/ second (900 seconds/ second)",
"gui_path": "/CCMC/Nodes",
"is_local": false,
"key": "Shift+v",
"key": "SHIFT+V",
"name": "Starts from 10:03, delta time 15 min/ second",
"script": "openspace.scriptScheduler.clear();openspace.time.setDeltaTime(900);openspace.time.setTime('2000-JUL-14 10:03:00.00');StarttimescriptSlowLoop = \"openspace.time.setTime('2000 JUL 14 10:03:00')\";openspace.scriptScheduler.loadScheduledScript('2000 JUL 14 12:00:00', StarttimescriptSlowLoop);"
},
@@ -239,7 +237,7 @@
"documentation": "Turn on sun glare, reset field line line width, change layer on the Sun to Orange",
"gui_path": "/CCMC/Nodes",
"is_local": false,
"key": "Shift+w",
"key": "SHIFT+W",
"name": "First transition Emilie",
"script": "openspace.time.setDeltaTime(0);openspace.time.setTime('2000-JUL-14 08:42:00.00');openspace.setPropertyValueSingle('Scene.SunGlare.Renderable.Enabled', true);openspace.setPropertyValueSingle('Scene.MAS_MHD_Fieldlines.Renderable.lineWidth', 1);openspace.setPropertyValueSingle('Scene.Cutplane.Renderable.Enabled', false);openspace.setPropertyValueSingle('Scene.MAS_MHD_density.Renderable.Enabled', false);openspace.setPropertyValueSingle('Scene.MAS_MHD_Fieldlines.Renderable.Enabled', false);openspace.setPropertyValueSingle('Scene.MAS_MHD_FluxNodes.Renderable.Enabled', false);openspace.setPropertyValueSingle('Scene.travelSpeedIndicator.Renderable.Enabled', false);openspace.setPropertyValueSingle('Scene.Earths_Magnetosphere.Renderable.Enabled', false);openspace.setPropertyValueSingle('Scene.Earths_Magnetosphere.Renderable.maskingEnabled', true);openspace.setPropertyValueSingle('Scene.Earths_Magnetosphere.Renderable.Masking.maskingQuantity', 5.000000);openspace.setPropertyValueSingle('Scene.Earths_Magnetosphere.Renderable.Masking.maskingMinLimit', '0');openspace.setPropertyValueSingle('Scene.Earths_Magnetosphere.Renderable.Masking.maskingMaxLimit', '0.5');openspace.setPropertyValueSingle('Scene.Sun.Renderable.Layers.ColorLayers.magnetogram-1.Enabled', false);openspace.setPropertyValueSingle('Scene.Sun.Renderable.Layers.ColorLayers.magnetogram-2.Enabled', false);openspace.setPropertyValueSingle('Scene.Sun.Renderable.Layers.ColorLayers.magnetogram-3.Enabled', false);openspace.setPropertyValueSingle('Scene.Sun.Renderable.Layers.ColorLayers.magnetogram-4.Enabled', false);openspace.setPropertyValueSingle('Scene.Sun.Renderable.Layers.ColorLayers.magnetogram-5.Enabled', false);openspace.setPropertyValueSingle('Scene.Sun.Renderable.Layers.ColorLayers.magnetogram-6.Enabled', false);openspace.setPropertyValueSingle('Scene.Sun.Renderable.Layers.ColorLayers.Texture.Enabled', true);"
},
@@ -247,7 +245,7 @@
"documentation": "Long loop: Restarts time at 09:30 and stops at 11:50, delta time to 4 min/ second (240 seconds/ second)",
"gui_path": "/CCMC/Nodes",
"is_local": false,
"key": "Shift+y",
"key": "SHIFT+Y",
"name": "Loop 09:30 - 11:50, delta time 4 min/ second",
"script": "openspace.scriptScheduler.clear();openspace.time.setDeltaTime(240);openspace.time.setTime('2000-JUL-14 09:30:00.00');StarttimescriptLongLoop = \"openspace.time.setTime('2000 JUL 14 09:30:00')\";openspace.scriptScheduler.loadScheduledScript('2000 JUL 14 11:50:00', StarttimescriptLongLoop);"
}
@@ -277,32 +275,32 @@
{
"name": "Scene.Sun.Renderable.Enabled",
"type": "setPropertyValue",
"value": "true"
"value": "true"
},
{
"name": "Scene.SunGlare.Renderable.Enabled",
"type": "setPropertyValue",
"value": "false"
"value": "false"
},
{
"name": "Scene.Sun.Renderable.Layers.ColorLayers.Texture.Enabled",
"type": "setPropertyValue",
"value": "false"
"value": "false"
},
{
"name": "Scene.Sun.Renderable.Layers.ColorLayers.magnetogram-2.Enabled",
"type": "setPropertyValue",
"value": "true"
"value": "true"
},
{
"name": "Scene.Earth.Renderable.Layers.ColorLayers.ESRI_VIIRS_Combo.Enabled",
"type": "setPropertyValue",
"value": "false"
"value": "false"
},
{
"name": "Scene.Earth.Renderable.Layers.ColorLayers.ESRI_World_Imagery.Enabled",
"type": "setPropertyValue",
"value": "true"
"value": "true"
}
],
"time": {