diff --git a/docs/using/visualization/generating_widgets.ipynb b/docs/using/visualization/generating_widgets.ipynb index 34bc65c4b1b..859cf026a1b 100644 --- a/docs/using/visualization/generating_widgets.ipynb +++ b/docs/using/visualization/generating_widgets.ipynb @@ -21,271 +21,371 @@ "cell_type": "code", "execution_count": 1, "metadata": { + "ExecuteTime": { + "end_time": "2021-02-18T16:10:42.838867Z", + "start_time": "2021-02-18T16:09:22.826173Z" + }, "scrolled": true }, "outputs": [ - { - "name": "stderr", - "output_type": "stream", - "text": [ - "/home/jals/miniconda3/envs/tardis/lib/python3.6/importlib/_bootstrap.py:219: QAWarning: pyne.data is not yet QA compliant.\n", - " return f(*args, **kwds)\n" - ] - }, { "name": "stdout", "output_type": "stream", "text": [ "[\u001b[1mtardis.plasma.standard_plasmas\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Reading Atomic Data from kurucz_cd23_chianti_H_He.h5 (\u001b[1mstandard_plasmas.py\u001b[0m:87)\n", "[\u001b[1mtardis.io.atom_data.util\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Atom Data kurucz_cd23_chianti_H_He.h5 not found in local path. Exists in TARDIS Data repo /home/jals/Downloads/tardis-data/kurucz_cd23_chianti_H_He.h5 (\u001b[1mutil.py\u001b[0m:35)\n", - "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /home/jals/miniconda3/envs/tardis/lib/python3.6/site-packages/IPython/core/interactiveshell.py:3331: PerformanceWarning: indexing past lexsort depth may impact performance.\n", + "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /home/jals/miniconda3/envs/tardis/lib/python3.7/site-packages/IPython/core/interactiveshell.py:3417: PerformanceWarning: indexing past lexsort depth may impact performance.\n", " exec(code_obj, self.user_global_ns, self.user_ns)\n", - " (\u001b[1mwarnings.py\u001b[0m:99)\n", - "[\u001b[1mtardis.io.atom_data.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Read Atom Data with UUID=6f7b09e887a311e7a06b246e96350010 and MD5=864f1753714343c41f99cb065710cace. (\u001b[1mbase.py\u001b[0m:187)\n", - "[\u001b[1mtardis.io.atom_data.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Non provided atomic data: synpp_refs, photoionization_data (\u001b[1mbase.py\u001b[0m:193)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 1/20 (\u001b[1mbase.py\u001b[0m:325)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 7.96915e+42 erg / s Luminosity absorbed = 2.63370e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:447)\n", + " (\u001b[1mwarnings.py\u001b[0m:110)\n", + "[\u001b[1mtardis.io.atom_data.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Read Atom Data with UUID=6f7b09e887a311e7a06b246e96350010 and MD5=864f1753714343c41f99cb065710cace. (\u001b[1mbase.py\u001b[0m:172)\n", + "[\u001b[1mtardis.io.atom_data.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Non provided atomic data: synpp_refs, photoionization_data (\u001b[1mbase.py\u001b[0m:178)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 1/20 (\u001b[1mbase.py\u001b[0m:326)\n", + "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /home/jals/miniconda3/envs/tardis/lib/python3.7/site-packages/astropy/units/equivalencies.py:124: RuntimeWarning: divide by zero encountered in double_scalars\n", + " (si.m, si.Hz, lambda x: _si.c.value / x),\n", + " (\u001b[1mwarnings.py\u001b[0m:110)\n", + "Running post-merge numba montecarlo (with C close lines)!\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 7.94275e+42 erg / s Luminosity absorbed = 2.65805e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:450)\n", "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Plasma stratification:\n", "\t t_rad next_t_rad w next_w\n", "\tShell \n", - "\t0 9926.501965 10171.209103 0.400392 0.500372\n", - "\t5 9852.611678 10306.111379 0.211205 0.191331\n", - "\t10 9779.813302 10174.379204 0.142695 0.116864\n", - "\t15 9708.082813 9910.442275 0.104556 0.085962\n", + "\t0 9926.501965 10134.733717 0.400392 0.508204\n", + "\t5 9852.611678 10222.890845 0.211205 0.197026\n", + "\t10 9779.813302 10144.463169 0.142695 0.117179\n", + "\t15 9708.082813 9873.477846 0.104556 0.086941\n", "\n", - " (\u001b[1mbase.py\u001b[0m:433)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 9933.952 K -- next t_inner 11453.040 K (\u001b[1mbase.py\u001b[0m:436)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 2/20 (\u001b[1mbase.py\u001b[0m:325)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.40398e+43 erg / s Luminosity absorbed = 4.68639e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:447)\n", + " (\u001b[1mbase.py\u001b[0m:436)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 9933.952 K -- next t_inner 11472.055 K (\u001b[1mbase.py\u001b[0m:439)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 2/20 (\u001b[1mbase.py\u001b[0m:326)\n", + "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /home/jals/miniconda3/envs/tardis/lib/python3.7/site-packages/astropy/units/equivalencies.py:124: RuntimeWarning: divide by zero encountered in double_scalars\n", + " (si.m, si.Hz, lambda x: _si.c.value / x),\n", + " (\u001b[1mwarnings.py\u001b[0m:110)\n", + "Running post-merge numba montecarlo (with C close lines)!\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.40815e+43 erg / s Luminosity absorbed = 4.77001e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:450)\n", "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Plasma stratification:\n", "\t t_rad next_t_rad w next_w\n", "\tShell \n", - "\t0 10171.209103 11518.516702 0.500372 0.538298\n", - "\t5 10306.111379 11554.412119 0.191331 0.217946\n", - "\t10 10174.379204 11373.574056 0.116864 0.132935\n", - "\t15 9910.442275 11040.788763 0.085962 0.099700\n", + "\t0 10134.733717 11468.021903 0.508204 0.548671\n", + "\t5 10222.890845 11499.835340 0.197026 0.221374\n", + "\t10 10144.463169 11306.370330 0.117179 0.136291\n", + "\t15 9873.477846 10953.828130 0.086941 0.102617\n", "\n", - " (\u001b[1mbase.py\u001b[0m:433)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 11453.040 K -- next t_inner 9948.201 K (\u001b[1mbase.py\u001b[0m:436)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 3/20 (\u001b[1mbase.py\u001b[0m:325)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 8.16814e+42 erg / s Luminosity absorbed = 2.50161e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:447)\n", + " (\u001b[1mbase.py\u001b[0m:436)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 11472.055 K -- next t_inner 9949.978 K (\u001b[1mbase.py\u001b[0m:439)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 3/20 (\u001b[1mbase.py\u001b[0m:326)\n", + "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /home/jals/miniconda3/envs/tardis/lib/python3.7/site-packages/astropy/units/equivalencies.py:124: RuntimeWarning: divide by zero encountered in double_scalars\n", + " (si.m, si.Hz, lambda x: _si.c.value / x),\n", + " (\u001b[1mwarnings.py\u001b[0m:110)\n", + "Running post-merge numba montecarlo (with C close lines)!\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 8.12624e+42 erg / s Luminosity absorbed = 2.54722e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:450)\n", "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Plasma stratification:\n", "\t t_rad next_t_rad w next_w\n", "\tShell \n", - "\t0 11518.516702 10501.129902 0.538298 0.438591\n", - "\t5 11554.412119 10869.940791 0.217946 0.160809\n", - "\t10 11373.574056 10558.269547 0.132935 0.103807\n", - "\t15 11040.788763 10185.648701 0.099700 0.079165\n", + "\t0 11468.021903 10497.008397 0.548671 0.442299\n", + "\t5 11499.835340 10799.075913 0.221374 0.164288\n", + "\t10 11306.370330 10623.433274 0.136291 0.101820\n", + "\t15 10953.828130 10226.187071 0.102617 0.077629\n", "\n", - " (\u001b[1mbase.py\u001b[0m:433)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 9948.201 K -- next t_inner 11328.896 K (\u001b[1mbase.py\u001b[0m:436)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 4/20 (\u001b[1mbase.py\u001b[0m:325)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.34487e+43 erg / s Luminosity absorbed = 4.47931e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:447)\n", + " (\u001b[1mbase.py\u001b[0m:436)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 9949.978 K -- next t_inner 11360.097 K (\u001b[1mbase.py\u001b[0m:439)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 4/20 (\u001b[1mbase.py\u001b[0m:326)\n", + "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /home/jals/miniconda3/envs/tardis/lib/python3.7/site-packages/astropy/units/equivalencies.py:124: RuntimeWarning: divide by zero encountered in double_scalars\n", + " (si.m, si.Hz, lambda x: _si.c.value / x),\n", + " (\u001b[1mwarnings.py\u001b[0m:110)\n", + "Running post-merge numba montecarlo (with C close lines)!\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.36297e+43 erg / s Luminosity absorbed = 4.49721e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:450)\n", "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Plasma stratification:\n", "\t t_rad next_t_rad w next_w\n", "\tShell \n", - "\t0 10501.129902 11527.008679 0.438591 0.512509\n", - "\t5 10869.940791 11706.138980 0.160809 0.196458\n", - "\t10 10558.269547 11444.208532 0.103807 0.124092\n", - "\t15 10185.648701 11085.857161 0.079165 0.093694\n", + "\t0 10497.008397 11615.344313 0.442299 0.497714\n", + "\t5 10799.075913 11729.411389 0.164288 0.199205\n", + "\t10 10623.433274 11517.190317 0.101820 0.123849\n", + "\t15 10226.187071 11103.373456 0.077629 0.093930\n", "\n", - " (\u001b[1mbase.py\u001b[0m:433)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 11328.896 K -- next t_inner 10054.300 K (\u001b[1mbase.py\u001b[0m:436)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 5/20 (\u001b[1mbase.py\u001b[0m:325)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 8.44348e+42 erg / s Luminosity absorbed = 2.68000e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:447)\n", + " (\u001b[1mbase.py\u001b[0m:436)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 11360.097 K -- next t_inner 10014.843 K (\u001b[1mbase.py\u001b[0m:439)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 5/20 (\u001b[1mbase.py\u001b[0m:326)\n", + "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /home/jals/miniconda3/envs/tardis/lib/python3.7/site-packages/astropy/units/equivalencies.py:124: RuntimeWarning: divide by zero encountered in double_scalars\n", + " (si.m, si.Hz, lambda x: _si.c.value / x),\n", + " (\u001b[1mwarnings.py\u001b[0m:110)\n", + "Running post-merge numba montecarlo (with C close lines)!\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 8.27895e+42 erg / s Luminosity absorbed = 2.66933e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:450)\n", "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Plasma stratification:\n", "\t t_rad next_t_rad w next_w\n", "\tShell \n", - "\t0 11527.008679 10659.382763 0.512509 0.433573\n", - "\t5 11706.138980 11038.244897 0.196458 0.158494\n", - "\t10 11444.208532 10790.696726 0.124092 0.099660\n", - "\t15 11085.857161 10450.666394 0.093694 0.074550\n", + "\t0 11615.344313 10549.514128 0.497714 0.443441\n", + "\t5 11729.411389 10919.073481 0.199205 0.162199\n", + "\t10 11517.190317 10697.303300 0.123849 0.101289\n", + "\t15 11103.373456 10379.863073 0.093930 0.075372\n", "\n", - " (\u001b[1mbase.py\u001b[0m:433)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 10054.300 K -- next t_inner 11261.489 K (\u001b[1mbase.py\u001b[0m:436)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 6/20 (\u001b[1mbase.py\u001b[0m:325)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.32492e+43 erg / s Luminosity absorbed = 4.26229e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:447)\n", + " (\u001b[1mbase.py\u001b[0m:436)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 10014.843 K -- next t_inner 11328.210 K (\u001b[1mbase.py\u001b[0m:439)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 6/20 (\u001b[1mbase.py\u001b[0m:326)\n", + "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /home/jals/miniconda3/envs/tardis/lib/python3.7/site-packages/astropy/units/equivalencies.py:124: RuntimeWarning: divide by zero encountered in double_scalars\n", + " (si.m, si.Hz, lambda x: _si.c.value / x),\n", + " (\u001b[1mwarnings.py\u001b[0m:110)\n", + "Running post-merge numba montecarlo (with C close lines)!\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.34741e+43 erg / s Luminosity absorbed = 4.44727e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:450)\n", "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Plasma stratification:\n", "\t t_rad next_t_rad w next_w\n", "\tShell \n", - "\t0 10659.382763 11507.437689 0.433573 0.499441\n", - "\t5 11038.244897 11634.568776 0.158494 0.197953\n", - "\t10 10790.696726 11418.594559 0.099660 0.124085\n", - "\t15 10450.666394 10999.619473 0.074550 0.094676\n", + "\t0 10549.514128 11567.208184 0.443441 0.504178\n", + "\t5 10919.073481 11653.124121 0.162199 0.203042\n", + "\t10 10697.303300 11425.955010 0.101289 0.125249\n", + "\t15 10379.863073 11082.155938 0.075372 0.094028\n", "\n", - " (\u001b[1mbase.py\u001b[0m:433)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 11261.489 K -- next t_inner 10069.444 K (\u001b[1mbase.py\u001b[0m:436)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 7/20 (\u001b[1mbase.py\u001b[0m:325)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 8.49858e+42 erg / s Luminosity absorbed = 2.69247e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:447)\n", + " (\u001b[1mbase.py\u001b[0m:436)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 11328.210 K -- next t_inner 10044.200 K (\u001b[1mbase.py\u001b[0m:439)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 7/20 (\u001b[1mbase.py\u001b[0m:326)\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /home/jals/miniconda3/envs/tardis/lib/python3.7/site-packages/astropy/units/equivalencies.py:124: RuntimeWarning: divide by zero encountered in double_scalars\n", + " (si.m, si.Hz, lambda x: _si.c.value / x),\n", + " (\u001b[1mwarnings.py\u001b[0m:110)\n", + "Running post-merge numba montecarlo (with C close lines)!\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 8.39001e+42 erg / s Luminosity absorbed = 2.69230e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:450)\n", "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Plasma stratification:\n", "\t t_rad next_t_rad w next_w\n", "\tShell \n", - "\t0 11507.437689 10679.650246 0.499441 0.431088\n", - "\t5 11634.568776 11048.266431 0.197953 0.157179\n", - "\t10 11418.594559 10825.714870 0.124085 0.098608\n", - "\t15 10999.619473 10506.321595 0.094676 0.073794\n", + "\t0 11567.208184 10569.747403 0.504178 0.442290\n", + "\t5 11653.124121 11099.194259 0.203042 0.153253\n", + "\t10 11425.955010 10809.397890 0.125249 0.097256\n", + "\t15 11082.155938 10454.841299 0.094028 0.073809\n", "\n", - " (\u001b[1mbase.py\u001b[0m:433)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 10069.444 K -- next t_inner 11241.826 K (\u001b[1mbase.py\u001b[0m:436)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 8/20 (\u001b[1mbase.py\u001b[0m:325)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.30632e+43 erg / s Luminosity absorbed = 4.31719e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:447)\n", + " (\u001b[1mbase.py\u001b[0m:436)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 10044.200 K -- next t_inner 11285.966 K (\u001b[1mbase.py\u001b[0m:439)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 8/20 (\u001b[1mbase.py\u001b[0m:326)\n", + "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /home/jals/miniconda3/envs/tardis/lib/python3.7/site-packages/astropy/units/equivalencies.py:124: RuntimeWarning: divide by zero encountered in double_scalars\n", + " (si.m, si.Hz, lambda x: _si.c.value / x),\n", + " (\u001b[1mwarnings.py\u001b[0m:110)\n", + "Running post-merge numba montecarlo (with C close lines)!\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.33305e+43 erg / s Luminosity absorbed = 4.33011e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:450)\n", "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Plasma stratification:\n", "\t t_rad next_t_rad w next_w\n", "\tShell \n", - "\t0 10679.650246 11459.828312 0.431088 0.506176\n", - "\t5 11048.266431 11688.139012 0.157179 0.193468\n", - "\t10 10825.714870 11441.768967 0.098608 0.122412\n", - "\t15 10506.321595 11099.449886 0.073794 0.090915\n", + "\t0 10569.747403 11547.678162 0.442290 0.500345\n", + "\t5 11099.194259 11669.739508 0.153253 0.198338\n", + "\t10 10809.397890 11493.569590 0.097256 0.121915\n", + "\t15 10454.841299 11083.769586 0.073809 0.092834\n", "\n", - " (\u001b[1mbase.py\u001b[0m:433)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 11241.826 K -- next t_inner 10123.177 K (\u001b[1mbase.py\u001b[0m:436)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 9/20 (\u001b[1mbase.py\u001b[0m:325)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 8.68357e+42 erg / s Luminosity absorbed = 2.75015e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:447)\n", + " (\u001b[1mbase.py\u001b[0m:436)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 11285.966 K -- next t_inner 10060.511 K (\u001b[1mbase.py\u001b[0m:439)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 9/20 (\u001b[1mbase.py\u001b[0m:326)\n", + "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /home/jals/miniconda3/envs/tardis/lib/python3.7/site-packages/astropy/units/equivalencies.py:124: RuntimeWarning: divide by zero encountered in double_scalars\n", + " (si.m, si.Hz, lambda x: _si.c.value / x),\n", + " (\u001b[1mwarnings.py\u001b[0m:110)\n", + "Running post-merge numba montecarlo (with C close lines)!\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 8.44283e+42 erg / s Luminosity absorbed = 2.70894e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:450)\n", "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Plasma stratification:\n", "\t t_rad next_t_rad w next_w\n", "\tShell \n", - "\t0 11459.828312 10666.223660 0.506176 0.445097\n", - "\t5 11688.139012 11000.288585 0.193468 0.163424\n", - "\t10 11441.768967 10822.884326 0.122412 0.101641\n", - "\t15 11099.449886 10384.181273 0.090915 0.078432\n", + "\t0 11547.678162 10635.099217 0.500345 0.439520\n", + "\t5 11669.739508 11035.731464 0.198338 0.158320\n", + "\t10 11493.569590 10717.471486 0.121915 0.101642\n", + "\t15 11083.769586 10404.049299 0.092834 0.075794\n", "\n", - " (\u001b[1mbase.py\u001b[0m:433)\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 10123.177 K -- next t_inner 11180.783 K (\u001b[1mbase.py\u001b[0m:436)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 10/20 (\u001b[1mbase.py\u001b[0m:325)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.28170e+43 erg / s Luminosity absorbed = 4.19511e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:447)\n", + " (\u001b[1mbase.py\u001b[0m:436)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 10060.511 K -- next t_inner 11268.877 K (\u001b[1mbase.py\u001b[0m:439)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 10/20 (\u001b[1mbase.py\u001b[0m:326)\n", + "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /home/jals/miniconda3/envs/tardis/lib/python3.7/site-packages/astropy/units/equivalencies.py:124: RuntimeWarning: divide by zero encountered in double_scalars\n", + " (si.m, si.Hz, lambda x: _si.c.value / x),\n", + " (\u001b[1mwarnings.py\u001b[0m:110)\n", + "Running post-merge numba montecarlo (with C close lines)!\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.32925e+43 erg / s Luminosity absorbed = 4.25943e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:450)\n", "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Plasma stratification:\n", "\t t_rad next_t_rad w next_w\n", "\tShell \n", - "\t0 10666.223660 11427.410445 0.445097 0.500788\n", - "\t5 11000.288585 11612.349822 0.163424 0.193129\n", - "\t10 10822.884326 11373.245169 0.101641 0.121622\n", - "\t15 10384.181273 11047.955461 0.078432 0.090937\n", + "\t0 10635.099217 11500.557678 0.439520 0.506895\n", + "\t5 11035.731464 11715.267406 0.158320 0.196690\n", + "\t10 10717.471486 11451.270656 0.101642 0.123243\n", + "\t15 10404.049299 11094.423438 0.075794 0.092243\n", "\n", - " (\u001b[1mbase.py\u001b[0m:433)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 11180.783 K -- next t_inner 10164.432 K (\u001b[1mbase.py\u001b[0m:436)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 11/20 (\u001b[1mbase.py\u001b[0m:325)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 8.79074e+42 erg / s Luminosity absorbed = 2.82804e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:447)\n", + " (\u001b[1mbase.py\u001b[0m:436)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 11268.877 K -- next t_inner 10059.624 K (\u001b[1mbase.py\u001b[0m:439)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 11/20 (\u001b[1mbase.py\u001b[0m:326)\n", + "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /home/jals/miniconda3/envs/tardis/lib/python3.7/site-packages/astropy/units/equivalencies.py:124: RuntimeWarning: divide by zero encountered in double_scalars\n", + " (si.m, si.Hz, lambda x: _si.c.value / x),\n", + " (\u001b[1mwarnings.py\u001b[0m:110)\n", + "Running post-merge numba montecarlo (with C close lines)!\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 8.49497e+42 erg / s Luminosity absorbed = 2.65616e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:450)\n", "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Plasma stratification:\n", "\t t_rad next_t_rad w next_w\n", "\tShell \n", - "\t0 11427.410445 10741.337822 0.500788 0.439938\n", - "\t5 11612.349822 11230.515356 0.193129 0.153637\n", - "\t10 11373.245169 10870.696315 0.121622 0.101050\n", - "\t15 11047.955461 10538.170159 0.090937 0.074680\n", + "\t0 11500.557678 10570.856509 0.506895 0.445926\n", + "\t5 11715.267406 10957.336276 0.196690 0.162837\n", + "\t10 11451.270656 10916.410391 0.123243 0.096229\n", + "\t15 11094.423438 10441.053929 0.092243 0.075026\n", "\n", - " (\u001b[1mbase.py\u001b[0m:433)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 10164.432 K -- next t_inner 11157.711 K (\u001b[1mbase.py\u001b[0m:436)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 12/20 (\u001b[1mbase.py\u001b[0m:325)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.27128e+43 erg / s Luminosity absorbed = 4.15415e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:447)\n", + " (\u001b[1mbase.py\u001b[0m:436)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 10059.624 K -- next t_inner 11233.248 K (\u001b[1mbase.py\u001b[0m:439)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 12/20 (\u001b[1mbase.py\u001b[0m:326)\n", + "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /home/jals/miniconda3/envs/tardis/lib/python3.7/site-packages/astropy/units/equivalencies.py:124: RuntimeWarning: divide by zero encountered in double_scalars\n", + " (si.m, si.Hz, lambda x: _si.c.value / x),\n", + " (\u001b[1mwarnings.py\u001b[0m:110)\n", + "Running post-merge numba montecarlo (with C close lines)!\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.30417e+43 erg / s Luminosity absorbed = 4.28820e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:450)\n", "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Plasma stratification:\n", "\t t_rad next_t_rad w next_w\n", "\tShell \n", - "\t0 10741.337822 11507.877578 0.439938 0.483114\n", - "\t5 11230.515356 11808.852053 0.153637 0.181826\n", - "\t10 10870.696315 11557.412757 0.101050 0.113563\n", - "\t15 10538.170159 11117.762050 0.074680 0.087418\n", + "\t0 10570.856509 11533.554419 0.445926 0.494814\n", + "\t5 10957.336276 11764.967895 0.162837 0.189464\n", + "\t10 10916.410391 11444.191999 0.096229 0.121150\n", + "\t15 10441.053929 11084.736033 0.075026 0.090825\n", "\n", - " (\u001b[1mbase.py\u001b[0m:433)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 11157.711 K -- next t_inner 10184.966 K (\u001b[1mbase.py\u001b[0m:436)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 13/20 (\u001b[1mbase.py\u001b[0m:325)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 8.90399e+42 erg / s Luminosity absorbed = 2.80864e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:447)\n", + " (\u001b[1mbase.py\u001b[0m:436)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 11233.248 K -- next t_inner 10123.784 K (\u001b[1mbase.py\u001b[0m:439)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 13/20 (\u001b[1mbase.py\u001b[0m:326)\n", + "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /home/jals/miniconda3/envs/tardis/lib/python3.7/site-packages/astropy/units/equivalencies.py:124: RuntimeWarning: divide by zero encountered in double_scalars\n", + " (si.m, si.Hz, lambda x: _si.c.value / x),\n", + " (\u001b[1mwarnings.py\u001b[0m:110)\n", + "Running post-merge numba montecarlo (with C close lines)!\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 8.69244e+42 erg / s Luminosity absorbed = 2.74548e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:450)\n", "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Plasma stratification:\n", "\t t_rad next_t_rad w next_w\n", "\tShell \n", - "\t0 11507.877578 10727.217531 0.483114 0.443706\n", - "\t5 11808.852053 11171.758889 0.181826 0.160824\n", - "\t10 11557.412757 10971.722637 0.113563 0.098588\n", - "\t15 11117.762050 10574.916600 0.087418 0.075266\n", + "\t0 11533.554419 10680.784661 0.494814 0.439281\n", + "\t5 11764.967895 10887.379428 0.189464 0.170137\n", + "\t10 11444.191999 10825.792025 0.121150 0.100780\n", + "\t15 11084.736033 10402.120228 0.090825 0.077634\n", "\n", - " (\u001b[1mbase.py\u001b[0m:433)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 10184.966 K -- next t_inner 11108.923 K (\u001b[1mbase.py\u001b[0m:436)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 14/20 (\u001b[1mbase.py\u001b[0m:325)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.25052e+43 erg / s Luminosity absorbed = 4.07335e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:447)\n", + " (\u001b[1mbase.py\u001b[0m:436)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 10123.784 K -- next t_inner 11175.750 K (\u001b[1mbase.py\u001b[0m:439)\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 14/20 (\u001b[1mbase.py\u001b[0m:326)\n", + "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /home/jals/miniconda3/envs/tardis/lib/python3.7/site-packages/astropy/units/equivalencies.py:124: RuntimeWarning: divide by zero encountered in double_scalars\n", + " (si.m, si.Hz, lambda x: _si.c.value / x),\n", + " (\u001b[1mwarnings.py\u001b[0m:110)\n", + "Running post-merge numba montecarlo (with C close lines)!\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.28354e+43 erg / s Luminosity absorbed = 4.15095e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:450)\n", "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Plasma stratification:\n", "\t t_rad next_t_rad w next_w\n", "\tShell \n", - "\t0 10727.217531 11413.626870 0.443706 0.489526\n", - "\t5 11171.758889 11697.006992 0.160824 0.184795\n", - "\t10 10971.722637 11424.445844 0.098588 0.116722\n", - "\t15 10574.916600 11047.434163 0.075266 0.088067\n", + "\t0 10680.784661 11437.188130 0.439281 0.496749\n", + "\t5 10887.379428 11571.106856 0.170137 0.196714\n", + "\t10 10825.792025 11378.137918 0.100780 0.120954\n", + "\t15 10402.120228 10957.211814 0.077634 0.092896\n", "\n", - " (\u001b[1mbase.py\u001b[0m:433)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 11108.923 K -- next t_inner 10224.266 K (\u001b[1mbase.py\u001b[0m:436)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 15/20 (\u001b[1mbase.py\u001b[0m:325)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 9.00727e+42 erg / s Luminosity absorbed = 2.88724e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:447)\n", + " (\u001b[1mbase.py\u001b[0m:436)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 11175.750 K -- next t_inner 10152.603 K (\u001b[1mbase.py\u001b[0m:439)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 15/20 (\u001b[1mbase.py\u001b[0m:326)\n", + "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /home/jals/miniconda3/envs/tardis/lib/python3.7/site-packages/astropy/units/equivalencies.py:124: RuntimeWarning: divide by zero encountered in double_scalars\n", + " (si.m, si.Hz, lambda x: _si.c.value / x),\n", + " (\u001b[1mwarnings.py\u001b[0m:110)\n", + "Running post-merge numba montecarlo (with C close lines)!\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 8.75331e+42 erg / s Luminosity absorbed = 2.81319e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:450)\n", "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Plasma stratification:\n", "\t t_rad next_t_rad w next_w\n", "\tShell \n", - "\t0 11413.626870 10712.622749 0.489526 0.455660\n", - "\t5 11697.006992 11125.894032 0.184795 0.164091\n", - "\t10 11424.445844 10816.390451 0.116722 0.104037\n", - "\t15 11047.434163 10421.687097 0.088067 0.080401\n", + "\t0 11437.188130 10637.774893 0.496749 0.452668\n", + "\t5 11571.106856 11002.647927 0.196714 0.166197\n", + "\t10 11378.137918 10832.042108 0.120954 0.101284\n", + "\t15 10957.211814 10350.602742 0.092896 0.079468\n", "\n", - " (\u001b[1mbase.py\u001b[0m:433)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 10224.266 K -- next t_inner 11087.666 K (\u001b[1mbase.py\u001b[0m:436)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 16/20 (\u001b[1mbase.py\u001b[0m:325)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.23781e+43 erg / s Luminosity absorbed = 4.07435e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:447)\n", + " (\u001b[1mbase.py\u001b[0m:436)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 10152.603 K -- next t_inner 11168.529 K (\u001b[1mbase.py\u001b[0m:439)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 16/20 (\u001b[1mbase.py\u001b[0m:326)\n", + "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /home/jals/miniconda3/envs/tardis/lib/python3.7/site-packages/astropy/units/equivalencies.py:124: RuntimeWarning: divide by zero encountered in double_scalars\n", + " (si.m, si.Hz, lambda x: _si.c.value / x),\n", + " (\u001b[1mwarnings.py\u001b[0m:110)\n", + "Running post-merge numba montecarlo (with C close lines)!\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.27820e+43 erg / s Luminosity absorbed = 4.15606e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:450)\n", "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Plasma stratification:\n", "\t t_rad next_t_rad w next_w\n", "\tShell \n", - "\t0 10712.622749 11352.158138 0.455660 0.500754\n", - "\t5 11125.894032 11644.968350 0.164091 0.185289\n", - "\t10 10816.390451 11320.695930 0.104037 0.119195\n", - "\t15 10421.687097 10965.228363 0.080401 0.089940\n", + "\t0 10637.774893 11420.979987 0.452668 0.499488\n", + "\t5 11002.647927 11711.923994 0.166197 0.186857\n", + "\t10 10832.042108 11421.346118 0.101284 0.119700\n", + "\t15 10350.602742 11076.434180 0.079468 0.089402\n", "\n", - " (\u001b[1mbase.py\u001b[0m:433)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 11087.666 K -- next t_inner 10256.946 K (\u001b[1mbase.py\u001b[0m:436)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 17/20 (\u001b[1mbase.py\u001b[0m:325)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 9.18956e+42 erg / s Luminosity absorbed = 2.86249e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:447)\n", + " (\u001b[1mbase.py\u001b[0m:436)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 11168.529 K -- next t_inner 10167.208 K (\u001b[1mbase.py\u001b[0m:439)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 17/20 (\u001b[1mbase.py\u001b[0m:326)\n", + "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /home/jals/miniconda3/envs/tardis/lib/python3.7/site-packages/astropy/units/equivalencies.py:124: RuntimeWarning: divide by zero encountered in double_scalars\n", + " (si.m, si.Hz, lambda x: _si.c.value / x),\n", + " (\u001b[1mwarnings.py\u001b[0m:110)\n", + "Running post-merge numba montecarlo (with C close lines)!\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 8.81647e+42 erg / s Luminosity absorbed = 2.81681e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:450)\n", "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Plasma stratification:\n", "\t t_rad next_t_rad w next_w\n", "\tShell \n", - "\t0 11352.158138 10738.799194 0.500754 0.452965\n", - "\t5 11644.968350 11210.269586 0.185289 0.160945\n", - "\t10 11320.695930 10911.463205 0.119195 0.103910\n", - "\t15 10965.228363 10545.065525 0.089940 0.078433\n", + "\t0 11420.979987 10691.849845 0.499488 0.447482\n", + "\t5 11711.923994 11042.045712 0.186857 0.164090\n", + "\t10 11421.346118 10980.886609 0.119700 0.097369\n", + "\t15 11076.434180 10456.662007 0.089402 0.077097\n", "\n", - " (\u001b[1mbase.py\u001b[0m:433)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 10256.946 K -- next t_inner 11012.230 K (\u001b[1mbase.py\u001b[0m:436)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 18/20 (\u001b[1mbase.py\u001b[0m:325)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.20741e+43 erg / s Luminosity absorbed = 3.93375e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:447)\n", + " (\u001b[1mbase.py\u001b[0m:436)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 10167.208 K -- next t_inner 11144.459 K (\u001b[1mbase.py\u001b[0m:439)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 18/20 (\u001b[1mbase.py\u001b[0m:326)\n", + "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /home/jals/miniconda3/envs/tardis/lib/python3.7/site-packages/astropy/units/equivalencies.py:124: RuntimeWarning: divide by zero encountered in double_scalars\n", + " (si.m, si.Hz, lambda x: _si.c.value / x),\n", + " (\u001b[1mwarnings.py\u001b[0m:110)\n", + "Running post-merge numba montecarlo (with C close lines)!\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.26680e+43 erg / s Luminosity absorbed = 4.12238e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:450)\n", "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Plasma stratification:\n", "\t t_rad next_t_rad w next_w\n", "\tShell \n", - "\t0 10738.799194 11316.665617 0.452965 0.492135\n", - "\t5 11210.269586 11599.094127 0.160945 0.183929\n", - "\t10 10911.463205 11403.508986 0.103910 0.114400\n", - "\t15 10545.065525 10958.974248 0.078433 0.087415\n", + "\t0 10691.849845 11404.686443 0.447482 0.497739\n", + "\t5 11042.045712 11664.227712 0.164090 0.189070\n", + "\t10 10980.886609 11444.220669 0.097369 0.117732\n", + "\t15 10456.662007 11052.698087 0.077097 0.089141\n", "\n", - " (\u001b[1mbase.py\u001b[0m:433)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 11012.230 K -- next t_inner 10314.623 K (\u001b[1mbase.py\u001b[0m:436)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 19/20 (\u001b[1mbase.py\u001b[0m:325)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 9.29848e+42 erg / s Luminosity absorbed = 3.02011e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:447)\n", + " (\u001b[1mbase.py\u001b[0m:436)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 11144.459 K -- next t_inner 10190.841 K (\u001b[1mbase.py\u001b[0m:439)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 19/20 (\u001b[1mbase.py\u001b[0m:326)\n", + "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /home/jals/miniconda3/envs/tardis/lib/python3.7/site-packages/astropy/units/equivalencies.py:124: RuntimeWarning: divide by zero encountered in double_scalars\n", + " (si.m, si.Hz, lambda x: _si.c.value / x),\n", + " (\u001b[1mwarnings.py\u001b[0m:110)\n", + "Running post-merge numba montecarlo (with C close lines)!\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 8.87081e+42 erg / s Luminosity absorbed = 2.87116e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:450)\n", "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Plasma stratification:\n", "\t t_rad next_t_rad w next_w\n", "\tShell \n", - "\t0 11316.665617 10862.505720 0.492135 0.444495\n", - "\t5 11599.094127 11194.462074 0.183929 0.162842\n", - "\t10 11403.508986 11065.620645 0.114400 0.099372\n", - "\t15 10958.974248 10599.851144 0.087415 0.077690\n", + "\t0 11404.686443 10732.832306 0.497739 0.444436\n", + "\t5 11664.227712 11084.302807 0.189070 0.162591\n", + "\t10 11444.220669 10899.736539 0.117732 0.099122\n", + "\t15 11052.698087 10465.941519 0.089141 0.077378\n", "\n", - " (\u001b[1mbase.py\u001b[0m:433)\n" + " (\u001b[1mbase.py\u001b[0m:436)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 10190.841 K -- next t_inner 11136.097 K (\u001b[1mbase.py\u001b[0m:439)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 20/20 (\u001b[1mbase.py\u001b[0m:326)\n", + "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /home/jals/miniconda3/envs/tardis/lib/python3.7/site-packages/astropy/units/equivalencies.py:124: RuntimeWarning: divide by zero encountered in double_scalars\n", + " (si.m, si.Hz, lambda x: _si.c.value / x),\n", + " (\u001b[1mwarnings.py\u001b[0m:110)\n", + "Running post-merge numba montecarlo (with C close lines)!\n", + "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /home/jals/wrkspc/TARDIS/tardis/tardis/montecarlo/montecarlo_numba/base.py:84: VisibleDeprecationWarning: Creating an ndarray from ragged nested sequences (which is a list-or-tuple of lists-or-tuples-or ndarrays with different lengths or shapes) is deprecated. If you meant to do this, you must specify 'dtype=object' when creating the ndarray\n", + " np.array(virt_packet_nus)\n", + " (\u001b[1mwarnings.py\u001b[0m:110)\n", + "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /home/jals/wrkspc/TARDIS/tardis/tardis/montecarlo/montecarlo_numba/base.py:87: VisibleDeprecationWarning: Creating an ndarray from ragged nested sequences (which is a list-or-tuple of lists-or-tuples-or ndarrays with different lengths or shapes) is deprecated. If you meant to do this, you must specify 'dtype=object' when creating the ndarray\n", + " np.array(virt_packet_energies)\n", + " (\u001b[1mwarnings.py\u001b[0m:110)\n" ] }, { "name": "stdout", "output_type": "stream", "text": [ - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 10314.623 K -- next t_inner 11009.102 K (\u001b[1mbase.py\u001b[0m:436)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 20/20 (\u001b[1mbase.py\u001b[0m:325)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.21062e+43 erg / s Luminosity absorbed = 3.88405e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:447)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Simulation finished in 20 iterations and took 47.46 s (\u001b[1mbase.py\u001b[0m:380)\n" + "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /home/jals/wrkspc/TARDIS/tardis/tardis/montecarlo/montecarlo_numba/base.py:90: VisibleDeprecationWarning: Creating an ndarray from ragged nested sequences (which is a list-or-tuple of lists-or-tuples-or ndarrays with different lengths or shapes) is deprecated. If you meant to do this, you must specify 'dtype=object' when creating the ndarray\n", + " np.array(virt_packet_last_interaction_in_nu)\n", + " (\u001b[1mwarnings.py\u001b[0m:110)\n", + "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /home/jals/wrkspc/TARDIS/tardis/tardis/montecarlo/montecarlo_numba/base.py:93: VisibleDeprecationWarning: Creating an ndarray from ragged nested sequences (which is a list-or-tuple of lists-or-tuples-or ndarrays with different lengths or shapes) is deprecated. If you meant to do this, you must specify 'dtype=object' when creating the ndarray\n", + " np.array(virt_packet_last_interaction_type)\n", + " (\u001b[1mwarnings.py\u001b[0m:110)\n", + "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /home/jals/wrkspc/TARDIS/tardis/tardis/montecarlo/montecarlo_numba/base.py:96: VisibleDeprecationWarning: Creating an ndarray from ragged nested sequences (which is a list-or-tuple of lists-or-tuples-or ndarrays with different lengths or shapes) is deprecated. If you meant to do this, you must specify 'dtype=object' when creating the ndarray\n", + " np.array(virt_packet_last_line_interaction_in_id)\n", + " (\u001b[1mwarnings.py\u001b[0m:110)\n", + "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /home/jals/wrkspc/TARDIS/tardis/tardis/montecarlo/montecarlo_numba/base.py:99: VisibleDeprecationWarning: Creating an ndarray from ragged nested sequences (which is a list-or-tuple of lists-or-tuples-or ndarrays with different lengths or shapes) is deprecated. If you meant to do this, you must specify 'dtype=object' when creating the ndarray\n", + " np.array(virt_packet_last_line_interaction_out_id)\n", + " (\u001b[1mwarnings.py\u001b[0m:110)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.26319e+43 erg / s Luminosity absorbed = 4.10706e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:450)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Simulation finished in 20 iterations and took 53.57 s (\u001b[1mbase.py\u001b[0m:384)\n" ] } ], @@ -298,16 +398,25 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "Now, import tardis widgets subpackage:" + "Now, import functions & class to create widgets from `visualization` subpackage:" ] }, { "cell_type": "code", "execution_count": 2, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2021-02-18T17:29:30.986893Z", + "start_time": "2021-02-18T17:29:30.978764Z" + } + }, "outputs": [], "source": [ - "import tardis.widgets as tw" + "from tardis.visualization import (\n", + " shell_info_from_simulation,\n", + " shell_info_from_hdf,\n", + " LineInfoWidget,\n", + ")" ] }, { @@ -331,12 +440,17 @@ { "cell_type": "code", "execution_count": 3, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2021-02-18T16:11:15.097803Z", + "start_time": "2021-02-18T16:11:14.753761Z" + } + }, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "baa7bab2497b472391a33b3318393ba1", + "model_id": "9761279b548a48f69a0b7f0bf0cc823f", "version_major": 2, "version_minor": 0 }, @@ -349,7 +463,7 @@ } ], "source": [ - "shell_info_widget = tw.shell_info_from_simulation(sim)\n", + "shell_info_widget = shell_info_from_simulation(sim)\n", "shell_info_widget.display()" ] }, @@ -374,13 +488,17 @@ "cell_type": "code", "execution_count": 4, "metadata": { + "ExecuteTime": { + "end_time": "2021-02-18T17:24:41.195180Z", + "start_time": "2021-02-18T17:24:39.006861Z" + }, "scrolled": true }, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "c4014e98653940249a7254ec81fa0c45", + "model_id": "6844ae7639c841f5927e44f3500cd6af", "version_major": 2, "version_minor": 0 }, @@ -393,7 +511,7 @@ } ], "source": [ - "shell_info_widget = tw.shell_info_from_hdf('/tmp/sim_example.hdf')\n", + "shell_info_widget = shell_info_from_hdf('demo.hdf')\n", "shell_info_widget.display()" ] }, @@ -417,12 +535,17 @@ { "cell_type": "code", "execution_count": 5, - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2021-02-18T17:24:55.634945Z", + "start_time": "2021-02-18T17:24:49.354718Z" + } + }, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "460a99eb3d80445ca69d3070343a5f47", + "model_id": "e024dcf3edaa4b62968dfc1e8a2c9a0a", "version_major": 2, "version_minor": 0 }, @@ -438,7 +561,7 @@ } ], "source": [ - "line_info_widget = tw.LineInfoWidget.from_simulation(sim)\n", + "line_info_widget = LineInfoWidget.from_simulation(sim)\n", "line_info_widget.display()" ] }, @@ -475,7 +598,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.6.10" + "version": "3.7.8" }, "notify_time": "5", "toc": { @@ -489,7 +612,7 @@ "toc_cell": false, "toc_position": {}, "toc_section_display": true, - "toc_window_display": false + "toc_window_display": true }, "varInspector": { "cols": { @@ -4251,13 +4374,15 @@ "dtype": "float64", "shape": [ 10000 - ] + ], + "value": {} }, "y": { "dtype": "float64", "shape": [ 10000 - ] + ], + "value": {} } }, { @@ -4269,13 +4394,15 @@ "dtype": "float64", "shape": [ 10000 - ] + ], + "value": {} }, "y": { "dtype": "float64", "shape": [ 10000 - ] + ], + "value": {} } }, { @@ -4291,13 +4418,15 @@ "dtype": "float64", "shape": [ 1 - ] + ], + "value": {} }, "y": { "dtype": "float64", "shape": [ 1 - ] + ], + "value": {} } } ], @@ -5569,13 +5698,15 @@ "dtype": "float64", "shape": [ 10000 - ] + ], + "value": {} }, "y": { "dtype": "float64", "shape": [ 10000 - ] + ], + "value": {} } }, { @@ -5587,13 +5718,15 @@ "dtype": "float64", "shape": [ 10000 - ] + ], + "value": {} }, "y": { "dtype": "float64", "shape": [ 10000 - ] + ], + "value": {} } }, { @@ -5609,13 +5742,15 @@ "dtype": "float64", "shape": [ 1 - ] + ], + "value": {} }, "y": { "dtype": "float64", "shape": [ 1 - ] + ], + "value": {} } } ], diff --git a/docs/using/visualization/sdec_plot.ipynb b/docs/using/visualization/sdec_plot.ipynb index 530c7f0e7bc..30bf668dad6 100644 --- a/docs/using/visualization/sdec_plot.ipynb +++ b/docs/using/visualization/sdec_plot.ipynb @@ -13,8 +13,8 @@ "execution_count": 1, "metadata": { "ExecuteTime": { - "end_time": "2021-02-12T14:05:43.742242Z", - "start_time": "2021-02-12T14:05:43.739877Z" + "end_time": "2021-02-18T17:35:03.859695Z", + "start_time": "2021-02-18T17:35:03.851958Z" }, "nbsphinx": "hidden" }, @@ -36,8 +36,8 @@ "execution_count": 2, "metadata": { "ExecuteTime": { - "end_time": "2021-02-12T14:06:46.089440Z", - "start_time": "2021-02-12T14:05:43.746092Z" + "end_time": "2021-02-18T17:37:30.434925Z", + "start_time": "2021-02-18T17:35:06.936525Z" } }, "outputs": [ @@ -311,7 +311,7 @@ "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 20/20 (\u001b[1mbase.py\u001b[0m:326)\n", "Running post-merge numba montecarlo (with C close lines)!\n", "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.26319e+43 erg / s Luminosity absorbed = 4.10706e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:450)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Simulation finished in 20 iterations and took 54.49 s (\u001b[1mbase.py\u001b[0m:384)\n" + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Simulation finished in 20 iterations and took 85.37 s (\u001b[1mbase.py\u001b[0m:384)\n" ] } ], @@ -344,13 +344,13 @@ "execution_count": 3, "metadata": { "ExecuteTime": { - "end_time": "2021-02-12T14:06:49.123425Z", - "start_time": "2021-02-12T14:06:46.090887Z" + "end_time": "2021-02-18T17:37:42.468383Z", + "start_time": "2021-02-18T17:37:30.702418Z" } }, "outputs": [], "source": [ - "from tardis.widgets import SDECPlotter" + "from tardis.visualization import SDECPlotter" ] }, { @@ -365,8 +365,8 @@ "execution_count": 4, "metadata": { "ExecuteTime": { - "end_time": "2021-02-12T14:06:49.704614Z", - "start_time": "2021-02-12T14:06:49.125705Z" + "end_time": "2021-02-18T17:37:44.686809Z", + "start_time": "2021-02-18T17:37:42.534053Z" } }, "outputs": [], @@ -395,8 +395,8 @@ "execution_count": 5, "metadata": { "ExecuteTime": { - "end_time": "2021-02-12T14:06:52.444227Z", - "start_time": "2021-02-12T14:06:49.706660Z" + "end_time": "2021-02-18T17:37:48.944341Z", + "start_time": "2021-02-18T17:37:44.697819Z" } }, "outputs": [ @@ -430,8 +430,8 @@ "execution_count": 6, "metadata": { "ExecuteTime": { - "end_time": "2021-02-12T14:06:53.409156Z", - "start_time": "2021-02-12T14:06:52.446100Z" + "end_time": "2021-02-18T17:37:59.778634Z", + "start_time": "2021-02-18T17:37:56.684368Z" }, "scrolled": false }, @@ -1002079,7 +1002079,6 @@ } ], "metadata": { - "celltoolbar": "Edit Metadata", "kernelspec": { "display_name": "Python 3", "language": "python", diff --git a/tardis/visualization/__init__.py b/tardis/visualization/__init__.py new file mode 100644 index 00000000000..ff2a5e96037 --- /dev/null +++ b/tardis/visualization/__init__.py @@ -0,0 +1,8 @@ +"""Visualization tools and widgets for TARDIS.""" + +from tardis.visualization.widgets.shell_info import ( + shell_info_from_simulation, + shell_info_from_hdf, +) +from tardis.visualization.widgets.line_info import LineInfoWidget +from tardis.visualization.tools.sdec_plot import SDECPlotter diff --git a/tardis/widgets/plot_util.py b/tardis/visualization/plot_util.py similarity index 100% rename from tardis/widgets/plot_util.py rename to tardis/visualization/plot_util.py diff --git a/tardis/visualization/tools/__init__.py b/tardis/visualization/tools/__init__.py new file mode 100644 index 00000000000..430299ee2c2 --- /dev/null +++ b/tardis/visualization/tools/__init__.py @@ -0,0 +1,6 @@ +""" +Classes & functions to generate diagnostic visualizations. + +These interfaces (or tools) post-process TARDIS simulations allowing user to +produce a specific visualization through a function (or class method) call. +""" diff --git a/tardis/widgets/sdec_plot.py b/tardis/visualization/tools/sdec_plot.py similarity index 99% rename from tardis/widgets/sdec_plot.py rename to tardis/visualization/tools/sdec_plot.py index 7080226c585..3f06b58f6ec 100644 --- a/tardis/widgets/sdec_plot.py +++ b/tardis/visualization/tools/sdec_plot.py @@ -15,7 +15,7 @@ import plotly.graph_objects as go from tardis.util.base import atomic_number2element_symbol -from tardis.widgets import plot_util as pu +from tardis.visualization import plot_util as pu class SDECData: diff --git a/tardis/visualization/widgets/__init__.py b/tardis/visualization/widgets/__init__.py new file mode 100644 index 00000000000..f07825aa140 --- /dev/null +++ b/tardis/visualization/widgets/__init__.py @@ -0,0 +1,6 @@ +""" +Jupyter widgets to interactively explore TARDIS simulations. + +These are simple Graphical User Interfaces (GUIs) that run within Jupyter +Notebooks, making data exploration much easier. +""" diff --git a/tardis/widgets/line_info.py b/tardis/visualization/widgets/line_info.py similarity index 99% rename from tardis/widgets/line_info.py rename to tardis/visualization/widgets/line_info.py index 17ece8d5d14..69f852ae958 100644 --- a/tardis/widgets/line_info.py +++ b/tardis/visualization/widgets/line_info.py @@ -11,8 +11,11 @@ from tardis.analysis import LastLineInteraction from tardis.util.base import species_tuple_to_string, species_string_to_tuple -from tardis.widgets.util import create_table_widget, TableSummaryLabel -from tardis.widgets import plot_util as pu +from tardis.visualization.widgets.util import ( + create_table_widget, + TableSummaryLabel, +) +from tardis.visualization import plot_util as pu class LineInfoWidget: diff --git a/tardis/widgets/shell_info.py b/tardis/visualization/widgets/shell_info.py similarity index 99% rename from tardis/widgets/shell_info.py rename to tardis/visualization/widgets/shell_info.py index c006786dfdf..8bbefcb6715 100644 --- a/tardis/widgets/shell_info.py +++ b/tardis/visualization/widgets/shell_info.py @@ -5,7 +5,7 @@ species_tuple_to_string, ) from tardis.simulation import Simulation -from tardis.widgets.util import create_table_widget +from tardis.visualization.widgets.util import create_table_widget import pandas as pd import numpy as np diff --git a/tardis/widgets/tests/__init__.py b/tardis/visualization/widgets/tests/__init__.py similarity index 100% rename from tardis/widgets/tests/__init__.py rename to tardis/visualization/widgets/tests/__init__.py diff --git a/tardis/widgets/tests/test_line_info.py b/tardis/visualization/widgets/tests/test_line_info.py similarity index 99% rename from tardis/widgets/tests/test_line_info.py rename to tardis/visualization/widgets/tests/test_line_info.py index 5d9d055b269..112ca1ee191 100644 --- a/tardis/widgets/tests/test_line_info.py +++ b/tardis/visualization/widgets/tests/test_line_info.py @@ -2,7 +2,7 @@ import pandas as pd import numpy as np from plotly.callbacks import Points, BoxSelector -from tardis.widgets.line_info import LineInfoWidget +from tardis.visualization.widgets.line_info import LineInfoWidget from tardis.util.base import species_string_to_tuple diff --git a/tardis/widgets/tests/test_shell_info.py b/tardis/visualization/widgets/tests/test_shell_info.py similarity index 99% rename from tardis/widgets/tests/test_shell_info.py rename to tardis/visualization/widgets/tests/test_shell_info.py index 03cb156b2a3..91b9b41cfe7 100644 --- a/tardis/widgets/tests/test_shell_info.py +++ b/tardis/visualization/widgets/tests/test_shell_info.py @@ -2,7 +2,7 @@ import numpy as np import pandas.testing as pdt -from tardis.widgets.shell_info import ( +from tardis.visualization.widgets.shell_info import ( BaseShellInfo, SimulationShellInfo, HDFShellInfo, diff --git a/tardis/widgets/util.py b/tardis/visualization/widgets/util.py similarity index 100% rename from tardis/widgets/util.py rename to tardis/visualization/widgets/util.py diff --git a/tardis/widgets/__init__.py b/tardis/widgets/__init__.py deleted file mode 100644 index d4662b7a35c..00000000000 --- a/tardis/widgets/__init__.py +++ /dev/null @@ -1,8 +0,0 @@ -"""Visualization tools and widgets for TARDIS.""" - -from tardis.widgets.shell_info import ( - shell_info_from_simulation, - shell_info_from_hdf, -) -from tardis.widgets.line_info import LineInfoWidget -from tardis.widgets.sdec_plot import SDECPlotter