diff --git a/.gitignore b/.gitignore index 095333a7d3c..219d50897b4 100644 --- a/.gitignore +++ b/.gitignore @@ -17,12 +17,17 @@ __pycache__ */cython_version.py htmlcov .coverage +.ipynb_checkpoints/ # IDE Specific files ### Pycharm IDE - Jetbrains .idea/* +# VSCode +.vscode/ +*.code-workspace + ### PyDev IDE - Eclipse .metadata tmp/ @@ -40,11 +45,13 @@ local.properties # Sphinx _build +docs/api # Packages/installer info *.egg *.egg-info +.eggs/ dist build eggs @@ -64,3 +71,6 @@ distribute-*.tar.gz # Mac OSX .DS_Store + +# Jupyter checkpoints +.ipynb_checkpoints \ No newline at end of file diff --git a/.mailmap b/.mailmap index 439eace1302..aded3e04eb2 100644 --- a/.mailmap +++ b/.mailmap @@ -116,3 +116,10 @@ Andreas Flörs Andreas Flörs <33418619+afloers@us Alice Harpole Alice Harpole Alice Harpole +Sampark Sharma + +Jordi Eguren +Jordi Eguren Jordi Eguren <45364266+jordi5@users.noreply.github.com> + +Atul Kumar + diff --git a/.zenodo.json b/.zenodo.json index 01ea13690e3..2785f8b09d7 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -90,10 +90,10 @@ "name": "Barna, Barnab\u00e1s" }, { - "name": "Barbosa, Talytha" + "name": "Gautam, Gaurav" }, { - "name": "Gautam, Gaurav" + "name": "Barbosa, Talytha" }, { "name": "Patel, Maryam" @@ -122,6 +122,9 @@ { "name": "Reichenbach, John" }, + { + "name": "Singhal, Jaladh" + }, { "name": "Jain, Rinkle" }, @@ -129,7 +132,7 @@ "name": "Singh, Sourav" }, { - "name": "Talegaonkar, Chinmay" + "name": "Pipelines, Azure" }, { "name": "Kowalski, Nathan" @@ -137,21 +140,39 @@ { "name": "Sofiatti, Caroline" }, + { + "name": "Talegaonkar, Chinmay" + }, { "name": "Selsing, Jonatan" }, + { + "name": "Savel, Arjun" + }, + { + "name": "Nayak, Ashwin" + }, { "name": "Wahi, Ujjwal" }, { - "name": "Sarafina, Nance" + "name": "Kumar, Atul" }, { - "name": "Gillanders, James" + "name": "Mishra, Sashank" }, { "name": "Dasgupta, Debajyoti" }, + { + "name": "Gillanders, James" + }, + { + "name": "Sharma, Sampark" + }, + { + "name": "Eguren, Jordi" + }, { "name": "Gupta, Suyash" }, @@ -162,10 +183,13 @@ "name": "Magee, Mark" }, { - "name": "Patel, Pratik" + "name": "Sarafina, Nance" }, { "name": "Patra, Nilesh" + }, + { + "name": "Patel, Pratik" } ] } \ No newline at end of file diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 00000000000..5c29f5c1efd --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,60 @@ +# TARDIS Community Code of Conduct + +The community of participants in open source Astronomy +projects is made up of members from around the globe +with a diverse set of skills, personalities, and +experiences. It is through these differences that our +community experiences success and continued growth. +We expect everyone in our community to follow these +guidelines when interacting with others both inside +and outside of our community. Our goal is to keep ours +a positive, inclusive, successful, and growing community. + +As members of the community, + +* We pledge to treat all people with respect and provide +a harassment- and bullying-free environment, regardless +of sex, sexual orientation and/or gender identity, +disability, physical appearance, body size, race, +nationality, ethnicity, and religion. In particular, +sexual language and imagery, sexist, racist, or +otherwise exclusionary jokes are not appropriate. +* We pledge to respect the work of others by recognizing +acknowledgment/citation requests of original authors. As +authors, we pledge to be explicit about how we want our +own work to be cited or acknowledged. +* We pledge to welcome those interested in joining the +community, and realize that including people with a variety +of opinions and backgrounds will only serve to enrich our +community. In particular, discussions relating to pros/cons +of various technologies, programming languages, and so on are +welcome, but these should be done with respect, taking proactive +measure to ensure that all participants are heard and feel +confident that they can freely express their opinions. +* We pledge to welcome questions and answer them respectfully, +paying particular attention to those new to the community. We +pledge to provide respectful criticisms and feedback in forums, +especially in discussion threads resulting from code contributions. +* We pledge to be conscientious of the perceptions of the wider +community and to respond to criticism respectfully. We will strive +to model behaviors that encourage productive debate and disagreement, +both within our community and where we are criticized. We will treat +those outside our community with the same respect as people within +our community. +* We pledge to help the entire community follow the code of conduct, +and to not remain silent when we see violations of the code of conduct. +We will take action when members of our community violate this code +such as contacting lead developers of the TARDIS team. + + +This code of conduct applies to all community situations online and +offline, including mailing lists, forums, social media, conferences, +meetings, associated social events, and one-to-one interactions. + +Any related activity or project organized by members of the TARDIS +community, including affiliated packages, are welcome to have their +own codes of conduct, but agree to also abide by the present code of +conduct. + +This code of conduct has been adapted from the Astropy Code of Conduct, +which in turn uses parts of the PSF code of conduct. diff --git a/README.rst b/README.rst index 7d8afb81bb3..c8098e74541 100644 --- a/README.rst +++ b/README.rst @@ -84,7 +84,7 @@ The following bibtex entries are needed for the references. } - @misc{kerzendorf_wolfgang_2019_2590539, + @software{kerzendorf_wolfgang_2019_2590539, author = {Kerzendorf, Wolfgang and Nöbauer, Ulrich and Sim, Stuart and diff --git a/azure-pipelines/compare-refdata.yml b/azure-pipelines/compare-refdata.yml index 520a18cbef3..749d2ce719b 100644 --- a/azure-pipelines/compare-refdata.yml +++ b/azure-pipelines/compare-refdata.yml @@ -3,6 +3,9 @@ # Add steps that build, run tests, deploy, and more: # https://aka.ms/yaml +trigger: none +pr: none + variables: system.debug: "true" ref.data.home: "$(Agent.BuildDirectory)/tardis-refdata" diff --git a/azure-pipelines/release-version.yml b/azure-pipelines/release-version.yml index e6e6ccb5eae..79999451412 100644 --- a/azure-pipelines/release-version.yml +++ b/azure-pipelines/release-version.yml @@ -15,92 +15,14 @@ schedules: variables: system.debug: "true" - tardis.zenodo.home: "$(Agent.BuildDirectory)/tardis_zenodo" tardis.build.dir: $(Build.Repository.LocalPath) pool: vmImage: "ubuntu-latest" jobs: - - job: zenodo_json - displayName: Create Zenodo JSON file - steps: - - task: DownloadSecureFile@1 - name: zenodoSecretKey - displayName: "Download Zenodo secret key" - inputs: - secureFile: "key_secret.json" - - - task: DownloadSecureFile@1 - name: authorOrder - displayName: "Download author order file" - inputs: - secureFile: "author_order.txt" - - - task: DownloadSecureFile@1 - name: nonCommitContributors - displayName: "Download non commit contributors file" - inputs: - secureFile: "non_commit_contributors.txt" - - - bash: | - echo "##vso[task.prependpath]$CONDA/bin" - sudo chown -R $USER $CONDA - displayName: "Add CONDA to path" - - - bash: | - conda create -n zenodo python=3.6 --yes - source activate zenodo - conda install jupyter nbconvert numpy pandas orcid -c conda-forge --yes - displayName: "Create Zenodo env" - - # Actually this is a workaround. We need to grab this from `tardis_zenodo` private repo. - - bash: | - cd ..; mkdir tardis_zenodo - cd $(tardis.zenodo.home) - wget https://gist.githubusercontent.com/epassaro/12364cd3b33e4b2923ff1861d80ef6d8/raw/d71ca46ca1816f6f46c768314c2da59ed017861e/gather_data.ipynb - displayName: "Downloading notebook (workaround)" - - - bash: | - cp $(zenodoSecretKey.secureFilePath) $(tardis.zenodo.home) - cp $(authorOrder.secureFilePath) $(tardis.zenodo.home) - cp $(nonCommitContributors.secureFilePath) $(tardis.zenodo.home) - displayName: "Recovering secrets" - - - bash: | - source activate zenodo - cd $(tardis.zenodo.home) - jupyter nbconvert gather_data.ipynb --to html --allow-errors --execute --ExecutePreprocessor.timeout=6000 - displayName: "Running notebook (allow errors)" - - - bash: | - source activate zenodo - cd $(tardis.zenodo.home) - jupyter nbconvert gather_data.ipynb --to html --execute --ExecutePreprocessor.timeout=6000 - displayName: "Running notebook (not allow errors)" - - # This step should fail if there are changes in .zenodo.json - - bash: | - diff $(tardis.zenodo.home)/.zenodo.json .zenodo.json - displayName: "Look for changes in JSON" - - - task: PublishPipelineArtifact@1 - inputs: - targetPath: "$(tardis.zenodo.home)/.zenodo.json" - artifact: "zenodo_json" - publishLocation: "pipeline" - condition: succeededOrFailed() - - - task: PublishPipelineArtifact@1 - inputs: - targetPath: "$(tardis.zenodo.home)/gather_data.html" - artifact: "report" - publishLocation: "pipeline" - condition: succeededOrFailed() - - job: gh_release displayName: Upload GitHub release - dependsOn: zenodo_json steps: - bash: | echo "##vso[task.prependpath]$CONDA/bin" diff --git a/azure-pipelines/simple_test_framework.yml b/azure-pipelines/simple_test_framework.yml index 815502f8111..748df8b4074 100644 --- a/azure-pipelines/simple_test_framework.yml +++ b/azure-pipelines/simple_test_framework.yml @@ -28,7 +28,7 @@ jobs: vm_Image: 'Ubuntu-16.04' conda: '/usr/share/miniconda' mac: - vm_Image: 'macOS-10.13' + vm_Image: 'macOS-10.14' miniconda.url: 'http://repo.continuum.io/miniconda/Miniconda2-latest-mac-x86_64.sh' maxParallel: 4 @@ -63,16 +63,6 @@ jobs: pytest tardis --tardis-refdata=$(ref.data.home) --cov=tardis --cov-report=xml --cov-report=html export QT_API=pyqt displayName: 'TARDIS test' - - -# - task: PublishTestResults@2 -# condition: succeededOrFailed() -# inputs: -# testResultsFiles: '**/test-*.xml' -# testRunTitle: 'Test results for TARDIS on $(vm_Image)' - -# - task: PublishCodeCoverageResults@1 -# inputs: -# codeCoverageTool: Cobertura -# summaryFileLocation: '$(System.DefaultWorkingDirectory)/**/coverage.xml' -# reportDirectory: '$(System.DefaultWorkingDirectory)/**/htmlcov' + - script: | + bash <(curl -s https://codecov.io/bash) + displayName: 'Upload to codecov.io' diff --git a/azure-pipelines/update-zenodo-json.yml b/azure-pipelines/update-zenodo-json.yml new file mode 100644 index 00000000000..666fc543abd --- /dev/null +++ b/azure-pipelines/update-zenodo-json.yml @@ -0,0 +1,129 @@ +# Starter pipeline +# Start with a minimal pipeline that you can customize to build and deploy your code. +# Add steps that build, run tests, deploy, and more: +# https://aka.ms/yaml + +trigger: none +pr: none +schedules: + - cron: "30 22 * * 5" + displayName: Weekly update + branches: + include: + - master + always: true + +variables: + system.debug: "true" + tardis.zenodo.home: "$(Agent.BuildDirectory)/tardis_zenodo" + tardis.zenodo.access: $(epassaro_pat) + tardis.build.dir: $(Build.Repository.LocalPath) + +pool: + vmImage: "ubuntu-latest" + +jobs: + - job: zenodo_json + displayName: Create Zenodo JSON file + steps: + - task: DownloadSecureFile@1 + inputs: + secureFile: "id_azure_rsa" + + - task: InstallSSHKey@0 + inputs: + knownHostsEntry: $(gh_host) + sshPublicKey: $(public_key) + sshKeySecureFile: "id_azure_rsa" + + - task: DownloadSecureFile@1 + name: zenodoSecretKey + displayName: "Download Zenodo secret key" + inputs: + secureFile: "key_secret.json" + + - task: DownloadSecureFile@1 + name: authorOrder + displayName: "Download author order file" + inputs: + secureFile: "author_order.txt" + + - task: DownloadSecureFile@1 + name: nonCommitContributors + displayName: "Download non commit contributors file" + inputs: + secureFile: "non_commit_contributors.txt" + + - bash: | + echo "##vso[task.prependpath]$CONDA/bin" + sudo chown -R $USER $CONDA + displayName: "Add CONDA to path" + + - bash: | + conda create -n zenodo python=3.6 --yes + source activate zenodo + conda install jupyter nbconvert numpy pandas orcid -c conda-forge --yes + displayName: "Create Zenodo env" + + - bash: | + cd .. + git clone https://$(tardis.zenodo.access)@github.com/tardis-sn/tardis_zenodo.git + displayName: "Clone tardis_zenodo repo" + + - bash: | + cp $(zenodoSecretKey.secureFilePath) $(tardis.zenodo.home) + cp $(authorOrder.secureFilePath) $(tardis.zenodo.home) + cp $(nonCommitContributors.secureFilePath) $(tardis.zenodo.home) + displayName: "Recovering secrets" + + - bash: | + source activate zenodo + cd $(tardis.zenodo.home) + jupyter nbconvert gather_data.ipynb --to html --allow-errors --execute --ExecutePreprocessor.timeout=6000 + displayName: "Running notebook (allow errors)" + + - bash: | + source activate zenodo + cd $(tardis.zenodo.home) + jupyter nbconvert gather_data.ipynb --to html --execute --ExecutePreprocessor.timeout=6000 + displayName: "Running notebook (not allow errors)" + + # This step should fail if there are changes in .zenodo.json + #- bash: | + # diff $(tardis.zenodo.home)/.zenodo.json .zenodo.json + # displayName: "Look for changes in JSON" + + - bash: | + set -e + + cd .. + git clone git@github.com:tardis-sn/tardis.git out + cd out + + git config --local user.name "Azure Pipelines" + git config --local user.email "azuredevops@microsoft.com" + cp $(tardis.zenodo.home)/.zenodo.json .zenodo.json + git add .zenodo.json + + if git diff --staged --quiet; then + echo "Exiting with no changes" + exit 0 + else + git commit -m "Update zenodo.json [skip ci]" + git push origin master + fi + displayName: "Push zenodo.json to master branch" + + - task: PublishPipelineArtifact@1 + inputs: + targetPath: "$(tardis.zenodo.home)/.zenodo.json" + artifact: "zenodo_json" + publishLocation: "pipeline" + condition: succeededOrFailed() + + - task: PublishPipelineArtifact@1 + inputs: + targetPath: "$(tardis.zenodo.home)/gather_data.html" + artifact: "report" + publishLocation: "pipeline" + condition: succeededOrFailed() diff --git a/docs/conf.py b/docs/conf.py index 56506d78e17..282e50e6663 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -130,7 +130,7 @@ # name of a builtin theme or the name of a custom theme in html_theme_path. #html_theme = None html_theme = 'sphinx_rtd_theme' -html_theme_path = sphinx_rtd_theme.get_html_theme_path() +html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] # Custom sidebar templates, maps document names to template names. #html_sidebars = {} diff --git a/docs/credits.rst b/docs/credits.rst index 1f69acdde71..02a4caddea4 100644 --- a/docs/credits.rst +++ b/docs/credits.rst @@ -78,7 +78,7 @@ The following BibTeX entries are needed for the references. } - @misc{kerzendorf_wolfgang_2019_2590539, + @software{kerzendorf_wolfgang_2019_2590539, author = {Kerzendorf, Wolfgang and Nöbauer, Ulrich and Sim, Stuart and diff --git a/docs/development/continuous_integration.rst b/docs/development/continuous_integration.rst index e2f267472c2..5464d9512a8 100644 --- a/docs/development/continuous_integration.rst +++ b/docs/development/continuous_integration.rst @@ -203,7 +203,7 @@ After defining the variable, one could optionally encrypt it using this lock sym Variables are referenced as $(variable_name), as seen in the InstallSSHKey@0 task in the hostName and sshPublicKey inputs. Azure provides a list of agent hosts that can run the pipeline on a virtual machine. In our pipelines, we -use the vm_Images: Ubuntu 16.04 and macOS-10.13. +use the vm_Images: Ubuntu 16.04 and macOs-10.14. In a job, you can list a single vm as:: @@ -224,7 +224,7 @@ addition to specifying variables as key-value pairs such as conda and miniconda. vmImage: "Ubuntu 16.04" conda: '/usr/share/miniconda' mac: - vm_Image: 'macOS-10.13' + vm_Image: 'macOS-10.14' miniconda.url: 'http://repo.continuum.io/miniconda/Miniconda2-latest-mac-x86_64.sh' maxParallel: 2 pool: diff --git a/docs/quickstart/quickstart.ipynb b/docs/quickstart/quickstart.ipynb index 2fd236b74b2..c38853dd154 100644 --- a/docs/quickstart/quickstart.ipynb +++ b/docs/quickstart/quickstart.ipynb @@ -11,10 +11,13 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "After the [installation](../installation.rst), start a Jupyter server executing `jupyter notebook` on the commandline in a directory that contains the configuration file (in our example `tardis_example.yml`, which can be downloaded [here](https://raw.githubusercontent.com/tardis-sn/tardis/master/docs/models/examples/tardis_example.yml)). The atomic database (for more info refer to [atomic data](../atomic/atomic_data.rst)) and a configuration file (more info at [configuration](../configuration/index.rst)). You can obtain a copy of the atomic database from the\n", + "Every simulation run requires the atomic database (for more info refer to [atomic data](../atomic/atomic_data.rst) ) and a configuration file (more info at [configuration](../configuration/index.rst) ).\n", + "You can obtain a copy of the atomic database from the\n", "(https://github.com/tardis-sn/tardis-refdata) repository\n", "(`atom_data` subfolder). We recommend using the\n", - "`kurucz_cd23_chianti_H_He.h5` dataset (which is auto-downloaded in the second cell already)." + "`kurucz_cd23_chianti_H_He.h5` dataset (which is auto-downloaded in the second cell already). The configuration file for this quickstart is `tardis_example.yml`, which can be downloaded [here](https://raw.githubusercontent.com/tardis-sn/tardis/master/docs/models/examples/tardis_example.yml)), though this file is auto-downloaded in the third cell.\n", + "\n", + "After the [installation](../installation.rst) start a Jupyter server executing `jupyter notebook` on the commandline in a directory that contains this quickstart." ] }, { @@ -26,8 +29,8 @@ "name": "stderr", "output_type": "stream", "text": [ - "/Users/wkerzend/miniconda/envs/tardis3/lib/python3.6/site-packages/tqdm/autonotebook/__init__.py:14: TqdmExperimentalWarning: Using `tqdm.autonotebook.tqdm` in notebook mode. Use `tqdm.tqdm` instead to force console mode (e.g. in jupyter console)\n", - " \" (e.g. in jupyter console)\", TqdmExperimentalWarning)\n" + "/Users/wkerzend/miniconda/envs/tardis/lib/python3.6/importlib/_bootstrap.py:219: QAWarning: pyne.data is not yet QA compliant.\n", + " return f(*args, **kwds)\n" ] } ], @@ -52,7 +55,7 @@ "name": "stdout", "output_type": "stream", "text": [ - "[\u001b[1mtardis.io.atom_data.atom_web_download\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Downloading atomic data from https://media.githubusercontent.com/media/tardis-sn/tardis-refdata/master/atom_data/kurucz_cd23_chianti_H_He.h5 to /Users/wkerzend/projects/tardis/tardis-data/kurucz_cd23_chianti_H_He.h5 (\u001b[1matom_web_download.py\u001b[0m:37)\n" + "[\u001b[1mtardis.io.atom_data.atom_web_download\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Downloading atomic data from https://media.githubusercontent.com/media/tardis-sn/tardis-refdata/master/atom_data/kurucz_cd23_chianti_H_He.h5 to /Users/wkerzend/projects/tardis/tardis-data/kurucz_cd23_chianti_H_He.h5 (\u001b[1matom_web_download.py\u001b[0m:47)\n" ] } ], @@ -65,7 +68,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "#### Running the simulation (long output) ####" + "#### Downloading the example file ####" ] }, { @@ -77,290 +80,279 @@ "name": "stdout", "output_type": "stream", "text": [ - "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /Users/wkerzend/miniconda/envs/tardis3/lib/python3.6/importlib/_bootstrap.py:219: QAWarning: pyne.data is not yet QA compliant.\n", - " return f(*args, **kwds)\n", - " (\u001b[1mwarnings.py\u001b[0m:99)\n", - "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /Users/wkerzend/miniconda/envs/tardis3/lib/python3.6/importlib/_bootstrap.py:219: QAWarning: pyne.material is not yet QA compliant.\n", - " return f(*args, **kwds)\n", - " (\u001b[1mwarnings.py\u001b[0m:99)\n", - "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /Users/wkerzend/miniconda/envs/tardis3/lib/python3.6/site-packages/astropy/units/quantity.py:1067: AstropyDeprecationWarning: The truth value of a Quantity is ambiguous. In the future this will raise a ValueError.\n", - " AstropyDeprecationWarning)\n", - " (\u001b[1mwarnings.py\u001b[0m:99)\n", + " % Total % Received % Xferd Average Speed Time Time Time Current\n", + " Dload Upload Total Spent Left Speed\n", + "100 980 100 980 0 0 4394 0 --:--:-- --:--:-- --:--:-- 4394\n" + ] + } + ], + "source": [ + "!curl -O https://raw.githubusercontent.com/tardis-sn/tardis/master/docs/models/examples/tardis_example.yml" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### Running the simulation (long output) ####" + ] + }, + { + "cell_type": "code", + "execution_count": 4, + "metadata": {}, + "outputs": [ + { + "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:74)\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 /Users/wkerzend/projects/tardis/tardis-data/kurucz_cd23_chianti_H_He.h5 (\u001b[1mutil.py\u001b[0m:29)\n", - "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /Users/wkerzend/miniconda/envs/tardis3/lib/python3.6/site-packages/IPython/core/interactiveshell.py:3267: 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:184)\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:187)\n", - "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /Users/wkerzend/miniconda/envs/tardis3/lib/python3.6/site-packages/astropy/units/quantity.py:1067: AstropyDeprecationWarning: The truth value of a Quantity is ambiguous. In the future this will raise a ValueError.\n", - " AstropyDeprecationWarning)\n", - " (\u001b[1mwarnings.py\u001b[0m:99)\n", - "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /Users/wkerzend/python/tardis/tardis/plasma/properties/ion_population.py:63: FutureWarning: \n", - "Passing list-likes to .loc or [] with any missing label will raise\n", - "KeyError in the future, you can use .reindex() as an alternative.\n", - "\n", - "See the documentation here:\n", - "https://pandas.pydata.org/pandas-docs/stable/indexing.html#deprecate-loc-reindex-listlike\n", - " partition_function.index].dropna())\n", - " (\u001b[1mwarnings.py\u001b[0m:99)\n", - "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /Users/wkerzend/miniconda/envs/tardis3/lib/python3.6/site-packages/astropy/units/equivalencies.py:90: 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:99)\n", - "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /Users/wkerzend/miniconda/envs/tardis3/lib/python3.6/site-packages/astropy/units/quantity.py:1067: AstropyDeprecationWarning: The truth value of a Quantity is ambiguous. In the future this will raise a ValueError.\n", - " AstropyDeprecationWarning)\n", - " (\u001b[1mwarnings.py\u001b[0m:99)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 1/20 (\u001b[1mbase.py\u001b[0m:266)\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:357)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 1/20 (\u001b[1mbase.py\u001b[0m:268)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 7.93730e+42 erg / s Luminosity absorbed = 2.66400e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:359)\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 10168.422346 0.400392 0.501001\n", + "\t5 9852.611678 10367.510165 0.211205 0.186556\n", + "\t10 9779.813302 10222.882075 0.142695 0.113985\n", + "\t15 9708.082813 9928.649533 0.104556 0.085217\n", "\n", - " (\u001b[1mbase.py\u001b[0m:348)\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:350)\n", - "[\u001b[1mpy.warnings \u001b[0m][\u001b[1;33mWARNING\u001b[0m] /Users/wkerzend/python/tardis/tardis/plasma/properties/ion_population.py:63: FutureWarning: \n", - "Passing list-likes to .loc or [] with any missing label will raise\n", - "KeyError in the future, you can use .reindex() as an alternative.\n", - "\n", - "See the documentation here:\n", - "https://pandas.pydata.org/pandas-docs/stable/indexing.html#deprecate-loc-reindex-listlike\n", - " partition_function.index].dropna())\n", - " (\u001b[1mwarnings.py\u001b[0m:99)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 2/20 (\u001b[1mbase.py\u001b[0m:266)\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:357)\n", + " (\u001b[1mbase.py\u001b[0m:350)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 9933.952 K -- next t_inner 11475.997 K (\u001b[1mbase.py\u001b[0m:352)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 2/20 (\u001b[1mbase.py\u001b[0m:268)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.41371e+43 erg / s Luminosity absorbed = 4.73752e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:359)\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 10168.422346 11497.903617 0.501001 0.545136\n", + "\t5 10367.510165 11621.417600 0.186556 0.212874\n", + "\t10 10222.882075 11335.692704 0.113985 0.135635\n", + "\t15 9928.649533 11018.841465 0.085217 0.101203\n", "\n", - " (\u001b[1mbase.py\u001b[0m:348)\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:350)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 3/20 (\u001b[1mbase.py\u001b[0m:266)\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:357)\n", + " (\u001b[1mbase.py\u001b[0m:350)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 11475.997 K -- next t_inner 9933.797 K (\u001b[1mbase.py\u001b[0m:352)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 3/20 (\u001b[1mbase.py\u001b[0m:268)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 8.04734e+42 erg / s Luminosity absorbed = 2.55640e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:359)\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 11497.903617 10477.653343 0.545136 0.439296\n", + "\t5 11621.417600 10856.518852 0.212874 0.159058\n", + "\t10 11335.692704 10635.474976 0.135635 0.100253\n", + "\t15 11018.841465 10290.254692 0.101203 0.075529\n", "\n", - " (\u001b[1mbase.py\u001b[0m:348)\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:350)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 4/20 (\u001b[1mbase.py\u001b[0m:266)\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:357)\n", + " (\u001b[1mbase.py\u001b[0m:350)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 9933.797 K -- next t_inner 11397.084 K (\u001b[1mbase.py\u001b[0m:352)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 4/20 (\u001b[1mbase.py\u001b[0m:268)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.38199e+43 erg / s Luminosity absorbed = 4.54590e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:359)\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 10477.653343 11608.211738 0.439296 0.506501\n", + "\t5 10856.518852 11859.259666 0.159058 0.192802\n", + "\t10 10635.474976 11479.604579 0.100253 0.125779\n", + "\t15 10290.254692 11149.192411 0.075529 0.094052\n", "\n", - " (\u001b[1mbase.py\u001b[0m:348)\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:350)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 5/20 (\u001b[1mbase.py\u001b[0m:266)\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:357)\n", + " (\u001b[1mbase.py\u001b[0m:350)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 11397.084 K -- next t_inner 9978.058 K (\u001b[1mbase.py\u001b[0m:352)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 5/20 (\u001b[1mbase.py\u001b[0m:268)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 8.16431e+42 erg / s Luminosity absorbed = 2.62454e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:359)\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 11608.211738 10556.913414 0.506501 0.440229\n", + "\t5 11859.259666 11021.144022 0.192802 0.153136\n", + "\t10 11479.604579 10713.104080 0.125779 0.099268\n", + "\t15 11149.192411 10399.079825 0.094052 0.073482\n", "\n", - " (\u001b[1mbase.py\u001b[0m:348)\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:350)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 6/20 (\u001b[1mbase.py\u001b[0m:266)\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:357)\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + " (\u001b[1mbase.py\u001b[0m:350)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 9978.058 K -- next t_inner 11365.561 K (\u001b[1mbase.py\u001b[0m:352)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 6/20 (\u001b[1mbase.py\u001b[0m:268)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.36136e+43 erg / s Luminosity absorbed = 4.54590e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:359)\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 10556.913414 11562.006340 0.440229 0.509603\n", + "\t5 11021.144022 11799.980145 0.153136 0.194437\n", + "\t10 10713.104080 11482.742597 0.099268 0.124721\n", + "\t15 10399.079825 11124.799749 0.073482 0.093597\n", "\n", - " (\u001b[1mbase.py\u001b[0m:348)\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:350)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 7/20 (\u001b[1mbase.py\u001b[0m:266)\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:357)\n", + " (\u001b[1mbase.py\u001b[0m:350)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 11365.561 K -- next t_inner 10025.564 K (\u001b[1mbase.py\u001b[0m:352)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 7/20 (\u001b[1mbase.py\u001b[0m:268)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 8.33278e+42 erg / s Luminosity absorbed = 2.66283e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:359)\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 11562.006340 10655.549804 0.509603 0.430187\n", + "\t5 11799.980145 11063.665621 0.194437 0.155127\n", + "\t10 11482.742597 10926.058943 0.124721 0.094642\n", + "\t15 11124.799749 10477.041314 0.093597 0.072578\n", "\n", - " (\u001b[1mbase.py\u001b[0m:348)\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:350)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 8/20 (\u001b[1mbase.py\u001b[0m:266)\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:357)\n", + " (\u001b[1mbase.py\u001b[0m:350)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 10025.564 K -- next t_inner 11303.643 K (\u001b[1mbase.py\u001b[0m:352)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 8/20 (\u001b[1mbase.py\u001b[0m:268)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.34650e+43 erg / s Luminosity absorbed = 4.30670e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:359)\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 10655.549804 11572.119736 0.430187 0.496558\n", + "\t5 11063.665621 11696.304249 0.155127 0.198228\n", + "\t10 10926.058943 11482.609682 0.094642 0.124382\n", + "\t15 10477.041314 11098.080451 0.072578 0.093537\n", "\n", - " (\u001b[1mbase.py\u001b[0m:348)\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:350)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 9/20 (\u001b[1mbase.py\u001b[0m:266)\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:357)\n", + " (\u001b[1mbase.py\u001b[0m:350)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 11303.643 K -- next t_inner 10025.810 K (\u001b[1mbase.py\u001b[0m:352)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 9/20 (\u001b[1mbase.py\u001b[0m:268)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 8.36983e+42 erg / s Luminosity absorbed = 2.63049e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:359)\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 11572.119736 10590.775937 0.496558 0.439574\n", + "\t5 11696.304249 11060.842307 0.198228 0.154917\n", + "\t10 11482.609682 10761.665022 0.124382 0.099840\n", + "\t15 11098.080451 10436.629671 0.093537 0.074676\n", "\n", - " (\u001b[1mbase.py\u001b[0m:348)\n", - "[\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:350)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 10/20 (\u001b[1mbase.py\u001b[0m:266)\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:357)\n", + " (\u001b[1mbase.py\u001b[0m:350)\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 10025.810 K -- next t_inner 11278.874 K (\u001b[1mbase.py\u001b[0m:352)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 10/20 (\u001b[1mbase.py\u001b[0m:268)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.32624e+43 erg / s Luminosity absorbed = 4.34986e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:359)\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 10590.775937 11489.769556 0.439574 0.511403\n", + "\t5 11060.842307 11791.517605 0.154917 0.191127\n", + "\t10 10761.665022 11527.732208 0.099840 0.120106\n", + "\t15 10436.629671 11111.114390 0.074676 0.091713\n", "\n", - " (\u001b[1mbase.py\u001b[0m:348)\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:350)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 11/20 (\u001b[1mbase.py\u001b[0m:266)\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:357)\n", + " (\u001b[1mbase.py\u001b[0m:350)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 11278.874 K -- next t_inner 10079.967 K (\u001b[1mbase.py\u001b[0m:352)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 11/20 (\u001b[1mbase.py\u001b[0m:268)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 8.51915e+42 erg / s Luminosity absorbed = 2.72009e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:359)\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 11489.769556 10664.234475 0.511403 0.437272\n", + "\t5 11791.517605 11091.518839 0.191127 0.156638\n", + "\t10 11527.732208 10885.771059 0.120106 0.096973\n", + "\t15 11111.114390 10484.177251 0.091713 0.074261\n", "\n", - " (\u001b[1mbase.py\u001b[0m:348)\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:350)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 12/20 (\u001b[1mbase.py\u001b[0m:266)\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:357)\n", + " (\u001b[1mbase.py\u001b[0m:350)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 10079.967 K -- next t_inner 11239.980 K (\u001b[1mbase.py\u001b[0m:352)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 12/20 (\u001b[1mbase.py\u001b[0m:268)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.30886e+43 erg / s Luminosity absorbed = 4.28617e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:359)\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 10664.234475 11510.842068 0.437272 0.495944\n", + "\t5 11091.518839 11716.009425 0.156638 0.189856\n", + "\t10 10885.771059 11479.636914 0.096973 0.120067\n", + "\t15 10484.177251 11117.963837 0.074261 0.090628\n", "\n", - " (\u001b[1mbase.py\u001b[0m:348)\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:350)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 13/20 (\u001b[1mbase.py\u001b[0m:266)\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:357)\n", + " (\u001b[1mbase.py\u001b[0m:350)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 11239.980 K -- next t_inner 10111.668 K (\u001b[1mbase.py\u001b[0m:352)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 13/20 (\u001b[1mbase.py\u001b[0m:268)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 8.65047e+42 erg / s Luminosity absorbed = 2.72874e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:359)\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 11510.842068 10636.025493 0.495944 0.446635\n", + "\t5 11716.009425 11175.711706 0.189856 0.154916\n", + "\t10 11479.636914 10916.188023 0.120067 0.097843\n", + "\t15 11117.963837 10431.720831 0.090628 0.077032\n", "\n", - " (\u001b[1mbase.py\u001b[0m:348)\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:350)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 14/20 (\u001b[1mbase.py\u001b[0m:266)\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:357)\n", + " (\u001b[1mbase.py\u001b[0m:350)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 10111.668 K -- next t_inner 11189.420 K (\u001b[1mbase.py\u001b[0m:352)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 14/20 (\u001b[1mbase.py\u001b[0m:268)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.28712e+43 erg / s Luminosity absorbed = 4.19242e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:359)\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 10636.025493 11423.118214 0.446635 0.503706\n", + "\t5 11175.711706 11682.224028 0.154916 0.189577\n", + "\t10 10916.188023 11389.994295 0.097843 0.121114\n", + "\t15 10431.720831 11029.450833 0.077032 0.091350\n", "\n", - " (\u001b[1mbase.py\u001b[0m:348)\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:350)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 15/20 (\u001b[1mbase.py\u001b[0m:266)\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:357)\n", + " (\u001b[1mbase.py\u001b[0m:350)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 11189.420 K -- next t_inner 10150.866 K (\u001b[1mbase.py\u001b[0m:352)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 15/20 (\u001b[1mbase.py\u001b[0m:268)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 8.76501e+42 erg / s Luminosity absorbed = 2.79433e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:359)\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 11423.118214 10634.831735 0.503706 0.452948\n", + "\t5 11682.224028 11112.411355 0.189577 0.159316\n", + "\t10 11389.994295 10831.887277 0.121114 0.101805\n", + "\t15 11029.450833 10396.372864 0.091350 0.078776\n", "\n", - " (\u001b[1mbase.py\u001b[0m:348)\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:350)\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 16/20 (\u001b[1mbase.py\u001b[0m:266)\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:357)\n", + " (\u001b[1mbase.py\u001b[0m:350)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 10150.866 K -- next t_inner 11159.164 K (\u001b[1mbase.py\u001b[0m:352)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 16/20 (\u001b[1mbase.py\u001b[0m:268)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.27462e+43 erg / s Luminosity absorbed = 4.13373e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:359)\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 10634.831735 11415.925493 0.452948 0.501153\n", + "\t5 11112.411355 11688.667754 0.159316 0.188430\n", + "\t10 10831.887277 11397.519913 0.101805 0.120134\n", + "\t15 10396.372864 11045.200458 0.078776 0.090180\n", "\n", - " (\u001b[1mbase.py\u001b[0m:348)\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:350)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 17/20 (\u001b[1mbase.py\u001b[0m:266)\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:357)\n", + " (\u001b[1mbase.py\u001b[0m:350)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 11159.164 K -- next t_inner 10172.913 K (\u001b[1mbase.py\u001b[0m:352)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 17/20 (\u001b[1mbase.py\u001b[0m:268)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 8.86785e+42 erg / s Luminosity absorbed = 2.79094e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:359)\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 11415.925493 10678.510651 0.501153 0.453127\n", + "\t5 11688.667754 11152.822099 0.188430 0.159726\n", + "\t10 11397.519913 10907.112682 0.120134 0.099725\n", + "\t15 11045.200458 10508.816973 0.090180 0.076667\n", "\n", - " (\u001b[1mbase.py\u001b[0m:348)\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:350)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 18/20 (\u001b[1mbase.py\u001b[0m:266)\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:357)\n", + " (\u001b[1mbase.py\u001b[0m:350)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 10172.913 K -- next t_inner 11118.359 K (\u001b[1mbase.py\u001b[0m:352)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 18/20 (\u001b[1mbase.py\u001b[0m:268)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.24749e+43 erg / s Luminosity absorbed = 4.15445e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:359)\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 10678.510651 11482.446420 0.453127 0.481917\n", + "\t5 11152.822099 11693.549165 0.159726 0.184456\n", + "\t10 10907.112682 11472.013555 0.099725 0.115208\n", + "\t15 10508.816973 10997.309982 0.076667 0.089730\n", "\n", - " (\u001b[1mbase.py\u001b[0m:348)\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:350)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 19/20 (\u001b[1mbase.py\u001b[0m:266)\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:357)\n", + " (\u001b[1mbase.py\u001b[0m:350)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 11118.359 K -- next t_inner 10245.337 K (\u001b[1mbase.py\u001b[0m:352)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 19/20 (\u001b[1mbase.py\u001b[0m:268)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 9.09476e+42 erg / s Luminosity absorbed = 2.89713e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:359)\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 11482.446420 10834.729769 0.481917 0.438322\n", + "\t5 11693.549165 11346.133670 0.184456 0.154204\n", + "\t10 11472.013555 10996.421420 0.115208 0.099677\n", + "\t15 10997.309982 10625.479432 0.089730 0.075531\n", "\n", - " (\u001b[1mbase.py\u001b[0m:348)\n", - "[\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:350)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 20/20 (\u001b[1mbase.py\u001b[0m:266)\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:357)\n", - "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Simulation finished in 20 iterations and took 22.57 s (\u001b[1mbase.py\u001b[0m:306)\n" + " (\u001b[1mbase.py\u001b[0m:350)\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] t_inner 10245.337 K -- next t_inner 11056.949 K (\u001b[1mbase.py\u001b[0m:352)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Starting iteration 20/20 (\u001b[1mbase.py\u001b[0m:268)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Luminosity emitted = 1.22623e+43 erg / s Luminosity absorbed = 4.00603e+42 erg / s Luminosity requested = 1.05928e+43 erg / s (\u001b[1mbase.py\u001b[0m:359)\n", + "[\u001b[1mtardis.simulation.base\u001b[0m][\u001b[1;37mINFO\u001b[0m ] Simulation finished in 20 iterations and took 23.52 s (\u001b[1mbase.py\u001b[0m:308)\n" ] } ], @@ -378,7 +370,7 @@ }, { "cell_type": "code", - "execution_count": 9, + "execution_count": 5, "metadata": {}, "outputs": [ { @@ -390,814 +382,35 @@ }, { "data": { - "application/javascript": [ - "/* Put everything inside the global mpl namespace */\n", - "window.mpl = {};\n", - "\n", - "\n", - "mpl.get_websocket_type = function() {\n", - " if (typeof(WebSocket) !== 'undefined') {\n", - " return WebSocket;\n", - " } else if (typeof(MozWebSocket) !== 'undefined') {\n", - " return MozWebSocket;\n", - " } else {\n", - " alert('Your browser does not have WebSocket support.' +\n", - " 'Please try Chrome, Safari or Firefox ≥ 6. ' +\n", - " 'Firefox 4 and 5 are also supported but you ' +\n", - " 'have to enable WebSockets in about:config.');\n", - " };\n", - "}\n", - "\n", - "mpl.figure = function(figure_id, websocket, ondownload, parent_element) {\n", - " this.id = figure_id;\n", - "\n", - " this.ws = websocket;\n", - "\n", - " this.supports_binary = (this.ws.binaryType != undefined);\n", - "\n", - " if (!this.supports_binary) {\n", - " var warnings = document.getElementById(\"mpl-warnings\");\n", - " if (warnings) {\n", - " warnings.style.display = 'block';\n", - " warnings.textContent = (\n", - " \"This browser does not support binary websocket messages. \" +\n", - " \"Performance may be slow.\");\n", - " }\n", - " }\n", - "\n", - " this.imageObj = new Image();\n", - "\n", - " this.context = undefined;\n", - " this.message = undefined;\n", - " this.canvas = undefined;\n", - " this.rubberband_canvas = undefined;\n", - " this.rubberband_context = undefined;\n", - " this.format_dropdown = undefined;\n", - "\n", - " this.image_mode = 'full';\n", - "\n", - " this.root = $('
');\n", - " this._root_extra_style(this.root)\n", - " this.root.attr('style', 'display: inline-block');\n", - "\n", - " $(parent_element).append(this.root);\n", - "\n", - " this._init_header(this);\n", - " this._init_canvas(this);\n", - " this._init_toolbar(this);\n", - "\n", - " var fig = this;\n", - "\n", - " this.waiting = false;\n", - "\n", - " this.ws.onopen = function () {\n", - " fig.send_message(\"supports_binary\", {value: fig.supports_binary});\n", - " fig.send_message(\"send_image_mode\", {});\n", - " if (mpl.ratio != 1) {\n", - " fig.send_message(\"set_dpi_ratio\", {'dpi_ratio': mpl.ratio});\n", - " }\n", - " fig.send_message(\"refresh\", {});\n", - " }\n", - "\n", - " this.imageObj.onload = function() {\n", - " if (fig.image_mode == 'full') {\n", - " // Full images could contain transparency (where diff images\n", - " // almost always do), so we need to clear the canvas so that\n", - " // there is no ghosting.\n", - " fig.context.clearRect(0, 0, fig.canvas.width, fig.canvas.height);\n", - " }\n", - " fig.context.drawImage(fig.imageObj, 0, 0);\n", - " };\n", - "\n", - " this.imageObj.onunload = function() {\n", - " fig.ws.close();\n", - " }\n", - "\n", - " this.ws.onmessage = this._make_on_message_function(this);\n", - "\n", - " this.ondownload = ondownload;\n", - "}\n", - "\n", - "mpl.figure.prototype._init_header = function() {\n", - " var titlebar = $(\n", - " '
');\n", - " var titletext = $(\n", - " '
');\n", - " titlebar.append(titletext)\n", - " this.root.append(titlebar);\n", - " this.header = titletext[0];\n", - "}\n", - "\n", - "\n", - "\n", - "mpl.figure.prototype._canvas_extra_style = function(canvas_div) {\n", - "\n", - "}\n", - "\n", - "\n", - "mpl.figure.prototype._root_extra_style = function(canvas_div) {\n", - "\n", - "}\n", - "\n", - "mpl.figure.prototype._init_canvas = function() {\n", - " var fig = this;\n", - "\n", - " var canvas_div = $('
');\n", - "\n", - " canvas_div.attr('style', 'position: relative; clear: both; outline: 0');\n", - "\n", - " function canvas_keyboard_event(event) {\n", - " return fig.key_event(event, event['data']);\n", - " }\n", - "\n", - " canvas_div.keydown('key_press', canvas_keyboard_event);\n", - " canvas_div.keyup('key_release', canvas_keyboard_event);\n", - " this.canvas_div = canvas_div\n", - " this._canvas_extra_style(canvas_div)\n", - " this.root.append(canvas_div);\n", - "\n", - " var canvas = $('');\n", - " canvas.addClass('mpl-canvas');\n", - " canvas.attr('style', \"left: 0; top: 0; z-index: 0; outline: 0\")\n", - "\n", - " this.canvas = canvas[0];\n", - " this.context = canvas[0].getContext(\"2d\");\n", - "\n", - " var backingStore = this.context.backingStorePixelRatio ||\n", - "\tthis.context.webkitBackingStorePixelRatio ||\n", - "\tthis.context.mozBackingStorePixelRatio ||\n", - "\tthis.context.msBackingStorePixelRatio ||\n", - "\tthis.context.oBackingStorePixelRatio ||\n", - "\tthis.context.backingStorePixelRatio || 1;\n", - "\n", - " mpl.ratio = (window.devicePixelRatio || 1) / backingStore;\n", - "\n", - " var rubberband = $('');\n", - " rubberband.attr('style', \"position: absolute; left: 0; top: 0; z-index: 1;\")\n", - "\n", - " var pass_mouse_events = true;\n", - "\n", - " canvas_div.resizable({\n", - " start: function(event, ui) {\n", - " pass_mouse_events = false;\n", - " },\n", - " resize: function(event, ui) {\n", - " fig.request_resize(ui.size.width, ui.size.height);\n", - " },\n", - " stop: function(event, ui) {\n", - " pass_mouse_events = true;\n", - " fig.request_resize(ui.size.width, ui.size.height);\n", - " },\n", - " });\n", - "\n", - " function mouse_event_fn(event) {\n", - " if (pass_mouse_events)\n", - " return fig.mouse_event(event, event['data']);\n", - " }\n", - "\n", - " rubberband.mousedown('button_press', mouse_event_fn);\n", - " rubberband.mouseup('button_release', mouse_event_fn);\n", - " // Throttle sequential mouse events to 1 every 20ms.\n", - " rubberband.mousemove('motion_notify', mouse_event_fn);\n", - "\n", - " rubberband.mouseenter('figure_enter', mouse_event_fn);\n", - " rubberband.mouseleave('figure_leave', mouse_event_fn);\n", - "\n", - " canvas_div.on(\"wheel\", function (event) {\n", - " event = event.originalEvent;\n", - " event['data'] = 'scroll'\n", - " if (event.deltaY < 0) {\n", - " event.step = 1;\n", - " } else {\n", - " event.step = -1;\n", - " }\n", - " mouse_event_fn(event);\n", - " });\n", - "\n", - " canvas_div.append(canvas);\n", - " canvas_div.append(rubberband);\n", - "\n", - " this.rubberband = rubberband;\n", - " this.rubberband_canvas = rubberband[0];\n", - " this.rubberband_context = rubberband[0].getContext(\"2d\");\n", - " this.rubberband_context.strokeStyle = \"#000000\";\n", - "\n", - " this._resize_canvas = function(width, height) {\n", - " // Keep the size of the canvas, canvas container, and rubber band\n", - " // canvas in synch.\n", - " canvas_div.css('width', width)\n", - " canvas_div.css('height', height)\n", - "\n", - " canvas.attr('width', width * mpl.ratio);\n", - " canvas.attr('height', height * mpl.ratio);\n", - " canvas.attr('style', 'width: ' + width + 'px; height: ' + height + 'px;');\n", - "\n", - " rubberband.attr('width', width);\n", - " rubberband.attr('height', height);\n", - " }\n", - "\n", - " // Set the figure to an initial 600x600px, this will subsequently be updated\n", - " // upon first draw.\n", - " this._resize_canvas(600, 600);\n", - "\n", - " // Disable right mouse context menu.\n", - " $(this.rubberband_canvas).bind(\"contextmenu\",function(e){\n", - " return false;\n", - " });\n", - "\n", - " function set_focus () {\n", - " canvas.focus();\n", - " canvas_div.focus();\n", - " }\n", - "\n", - " window.setTimeout(set_focus, 100);\n", - "}\n", - "\n", - "mpl.figure.prototype._init_toolbar = function() {\n", - " var fig = this;\n", - "\n", - " var nav_element = $('
')\n", - " nav_element.attr('style', 'width: 100%');\n", - " this.root.append(nav_element);\n", - "\n", - " // Define a callback function for later on.\n", - " function toolbar_event(event) {\n", - " return fig.toolbar_button_onclick(event['data']);\n", - " }\n", - " function toolbar_mouse_event(event) {\n", - " return fig.toolbar_button_onmouseover(event['data']);\n", - " }\n", - "\n", - " for(var toolbar_ind in mpl.toolbar_items) {\n", - " var name = mpl.toolbar_items[toolbar_ind][0];\n", - " var tooltip = mpl.toolbar_items[toolbar_ind][1];\n", - " var image = mpl.toolbar_items[toolbar_ind][2];\n", - " var method_name = mpl.toolbar_items[toolbar_ind][3];\n", - "\n", - " if (!name) {\n", - " // put a spacer in here.\n", - " continue;\n", - " }\n", - " var button = $('