From 9716029c36ea9e5945ff30706452e81c722b31a6 Mon Sep 17 00:00:00 2001 From: Swayam Shah Date: Sun, 5 Jan 2025 01:00:17 +0530 Subject: [PATCH 1/9] moves non-physical input check --- .../parse_radiation_field_configuration.py | 8 ++--- tardis/physics/radiation_field.py | 31 +++++++++++++++++++ 2 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 tardis/physics/radiation_field.py diff --git a/tardis/io/model/parse_radiation_field_configuration.py b/tardis/io/model/parse_radiation_field_configuration.py index d0ff62badc9..38d949c454d 100644 --- a/tardis/io/model/parse_radiation_field_configuration.py +++ b/tardis/io/model/parse_radiation_field_configuration.py @@ -8,6 +8,7 @@ parse_structure_from_config, ) from tardis.plasma.radiation_field import DilutePlanckianRadiationField +from tardis.physics.radiation_field import validate_radiative_temperature logger = logging.getLogger(__name__) @@ -113,12 +114,7 @@ def parse_radiation_field_state_from_csvy( geometry, packet_source ) - if np.any(t_radiative < 1000 * u.K): - logging.critical( - "Radiative temperature is too low in some of the shells, temperatures below 1000K " - f"(e.g., T_rad = {t_radiative[np.argmin(t_radiative)]} in shell {np.argmin(t_radiative)} in your model) " - "are not accurately handled by TARDIS.", - ) + validate_radiative_temperature(t_radiative) if hasattr(csvy_model_data, "columns") and ( "dilution_factor" in csvy_model_data.columns diff --git a/tardis/physics/radiation_field.py b/tardis/physics/radiation_field.py new file mode 100644 index 00000000000..d914ced2208 --- /dev/null +++ b/tardis/physics/radiation_field.py @@ -0,0 +1,31 @@ +import logging +import numpy as np +from astropy import units as u + +logger = logging.getLogger(__name__) + +def validate_radiative_temperature(t_radiative): + """ + Validates the radiative temperature to ensure it is physically reasonable. + + Parameters + ---------- + t_radiative : Quantity + The radiative temperature array. + + Raises + ------ + ValueError + If any radiative temperature is below 1000 K. + """ + if np.any(t_radiative < 1000 * u.K): + min_t_rad = t_radiative[np.argmin(t_radiative)] + min_shell = np.argmin(t_radiative) + logging.critical( + "Radiative temperature is too low in some of the shells, temperatures below 1000K " + f"(e.g., T_rad = {min_t_rad} in shell {min_shell} in your model) " + "are not accurately handled by TARDIS." + ) + raise ValueError( + f"Radiative temperature below 1000 K detected: T_rad = {min_t_rad} in shell {min_shell}." + ) \ No newline at end of file From 1a1d8b9f25162fdffdc58628498857f0e7af2c25 Mon Sep 17 00:00:00 2001 From: Swayam Shah Date: Sun, 5 Jan 2025 01:02:12 +0530 Subject: [PATCH 2/9] fixes codespell failure as in #2908 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index da196d6c396..1f0a2f6d8de 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -190,5 +190,5 @@ owner = "tardis-sn" repo = "tardis" [tool.codespell] -skip = "*.png,*.ggb,*.jpg,*.gif,*.ico,docs/contributing/CHANGELOG.md,docs/tardis.bib" +skip = "*.ipynb,*.png,*.ggb,*.jpg,*.gif,*.ico,docs/contributing/CHANGELOG.md,docs/tardis.bib" quiet-level = 3 \ No newline at end of file From d6609b3e1c4d6561a0f41eeb2e433691d521f959 Mon Sep 17 00:00:00 2001 From: Swayam Shah Date: Sun, 5 Jan 2025 01:03:03 +0530 Subject: [PATCH 3/9] updated mailmap --- .mailmap | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.mailmap b/.mailmap index ed00506c00f..b238be626b3 100644 --- a/.mailmap +++ b/.mailmap @@ -215,6 +215,8 @@ Stuart Sim ssim Stuart Sim Stuart Sim Stuart Sim Stuart Sim +Swayam Shah Sonu0305 + TARDIS Bot TARDIS Bot tardis-bot TARDIS Bot TARDIS Bot From aa7a3ed8c60e9ab2b8922f20940e65c2eab25fb8 Mon Sep 17 00:00:00 2001 From: Swayam Shah Date: Sun, 5 Jan 2025 01:12:31 +0530 Subject: [PATCH 4/9] fixes codespell failure as in #2908 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 1f0a2f6d8de..17ad0e69cba 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -190,5 +190,5 @@ owner = "tardis-sn" repo = "tardis" [tool.codespell] -skip = "*.ipynb,*.png,*.ggb,*.jpg,*.gif,*.ico,docs/contributing/CHANGELOG.md,docs/tardis.bib" +skip = "*.ipynb,*.png,*.ggb,*.jpg,*.gif,*.ico,docs/contributing/CHANGELOG.md,docs/tardis.bib,docs/resources/research_done_using_TARDIS/research_papers.rst" quiet-level = 3 \ No newline at end of file From 3fd4ab7af934b3f6ed00aeaeaae05df27252d883 Mon Sep 17 00:00:00 2001 From: Swayam Shah Date: Tue, 7 Jan 2025 20:10:06 +0530 Subject: [PATCH 5/9] made necessary changes to path --- tardis/io/model/parse_radiation_field_configuration.py | 2 +- .../test_radiation_field.py} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename tardis/{physics/radiation_field.py => radiation_field/test_radiation_field.py} (100%) diff --git a/tardis/io/model/parse_radiation_field_configuration.py b/tardis/io/model/parse_radiation_field_configuration.py index 38d949c454d..9728e2901f4 100644 --- a/tardis/io/model/parse_radiation_field_configuration.py +++ b/tardis/io/model/parse_radiation_field_configuration.py @@ -8,7 +8,7 @@ parse_structure_from_config, ) from tardis.plasma.radiation_field import DilutePlanckianRadiationField -from tardis.physics.radiation_field import validate_radiative_temperature +from tardis.radiation_field.test_radiation_field import validate_radiative_temperature logger = logging.getLogger(__name__) diff --git a/tardis/physics/radiation_field.py b/tardis/radiation_field/test_radiation_field.py similarity index 100% rename from tardis/physics/radiation_field.py rename to tardis/radiation_field/test_radiation_field.py From 7a77bff484b4e652f38ba980a6c05459af91f9a5 Mon Sep 17 00:00:00 2001 From: Swayam Shah Date: Tue, 7 Jan 2025 21:42:28 +0530 Subject: [PATCH 6/9] Revert "fixes codespell failure as in #2908" This reverts commit aa7a3ed8c60e9ab2b8922f20940e65c2eab25fb8. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 17ad0e69cba..1f0a2f6d8de 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -190,5 +190,5 @@ owner = "tardis-sn" repo = "tardis" [tool.codespell] -skip = "*.ipynb,*.png,*.ggb,*.jpg,*.gif,*.ico,docs/contributing/CHANGELOG.md,docs/tardis.bib,docs/resources/research_done_using_TARDIS/research_papers.rst" +skip = "*.ipynb,*.png,*.ggb,*.jpg,*.gif,*.ico,docs/contributing/CHANGELOG.md,docs/tardis.bib" quiet-level = 3 \ No newline at end of file From 30560cccef1b73c5d433f0f9fa8da537fd245023 Mon Sep 17 00:00:00 2001 From: Swayam Shah Date: Tue, 7 Jan 2025 21:44:00 +0530 Subject: [PATCH 7/9] Revert "fixes codespell failure as in #2908" This reverts commit 1a1d8b9f25162fdffdc58628498857f0e7af2c25. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 1f0a2f6d8de..da196d6c396 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -190,5 +190,5 @@ owner = "tardis-sn" repo = "tardis" [tool.codespell] -skip = "*.ipynb,*.png,*.ggb,*.jpg,*.gif,*.ico,docs/contributing/CHANGELOG.md,docs/tardis.bib" +skip = "*.png,*.ggb,*.jpg,*.gif,*.ico,docs/contributing/CHANGELOG.md,docs/tardis.bib" quiet-level = 3 \ No newline at end of file From d78865c05b2c30b317c48009b18ab1d622830d53 Mon Sep 17 00:00:00 2001 From: Swayam Shah Date: Wed, 8 Jan 2025 08:37:43 +0530 Subject: [PATCH 8/9] Rename test_radiation_field.py to validate_radiation_field.py --- .../{test_radiation_field.py => validate_radiation_field.py} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename tardis/radiation_field/{test_radiation_field.py => validate_radiation_field.py} (98%) diff --git a/tardis/radiation_field/test_radiation_field.py b/tardis/radiation_field/validate_radiation_field.py similarity index 98% rename from tardis/radiation_field/test_radiation_field.py rename to tardis/radiation_field/validate_radiation_field.py index d914ced2208..3d0a71f9b08 100644 --- a/tardis/radiation_field/test_radiation_field.py +++ b/tardis/radiation_field/validate_radiation_field.py @@ -28,4 +28,4 @@ def validate_radiative_temperature(t_radiative): ) raise ValueError( f"Radiative temperature below 1000 K detected: T_rad = {min_t_rad} in shell {min_shell}." - ) \ No newline at end of file + ) From 0fdc3fbf43d34ca05cc0b6e4212d51a499cb4a77 Mon Sep 17 00:00:00 2001 From: Swayam Shah Date: Wed, 8 Jan 2025 08:40:24 +0530 Subject: [PATCH 9/9] Update parse_radiation_field_configuration.py --- tardis/io/model/parse_radiation_field_configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tardis/io/model/parse_radiation_field_configuration.py b/tardis/io/model/parse_radiation_field_configuration.py index 9728e2901f4..11b878ed2e8 100644 --- a/tardis/io/model/parse_radiation_field_configuration.py +++ b/tardis/io/model/parse_radiation_field_configuration.py @@ -8,7 +8,7 @@ parse_structure_from_config, ) from tardis.plasma.radiation_field import DilutePlanckianRadiationField -from tardis.radiation_field.test_radiation_field import validate_radiative_temperature +from tardis.radiation_field.validate_radiation_field import validate_radiative_temperature logger = logging.getLogger(__name__)