Merge branch 'main' into rotation_broadening

tardis-sn · Jun 21, 2024 · fc9e098 · fc9e098
2 parents c544eb1 + 5c82a2f
commit fc9e098
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -1,7 +1,7 @@
 name: benchmarks
 
 env:
-  TARDIS_VER: master # release-2023.06.18
+  TARDIS_VER: master 
 
 on:
   push:

diff --git a/asv.conf.json b/asv.conf.json
@@ -1,16 +1,21 @@
-
 {
     "version": 1,
     "project": "stardis",
     "project_url": "https://tardis-sn.github.io/tardis",
     "repo": ".",
-    "install_command": ["in-dir={env_dir} python -mpip install {wheel_file}"],
-    "uninstall_command": ["return-code=any python -mpip uninstall -y {project}"],
+    "install_command": [
+        "in-dir={env_dir} python -mpip install {wheel_file}"
+    ],
+    "uninstall_command": [
+        "return-code=any python -mpip uninstall -y {project}"
+    ],
     "build_command": [
         "python setup.py build",
         "PIP_NO_BUILD_ISOLATION=false python -mpip wheel --no-deps --no-index -w {build_cache_dir} {build_dir}"
     ],
-    "branches": ["main"],
+    "branches": [
+        "main"
+    ],
     "environment_type": "conda",
     "show_commit_url": "https://github.com/tardis-sn/stardis/commit",
     "conda_environment_file": "tardis_env3.yml",

diff --git a/benchmarks/benchmark_config.yml b/benchmarks/benchmark_config.yml
@@ -15,7 +15,5 @@ opacity:
     line:
         disable: False
         broadening: [radiation, linear_stark, quadratic_stark, van_der_waals]
-        min: 6500 AA
-        max: 6600 AA
         broadening_range: 3 AA
 no_of_thetas: 20
diff --git a/stardis/plasma/base.py b/stardis/plasma/base.py
@@ -33,6 +33,7 @@
 )
 
 import tardis.plasma
+from tardis.opacities.tau_sobolev import TauSobolev
 
 
 THERMAL_DE_BROGLIE_CONST = const.h**2 / (2 * np.pi * const.k_B)
@@ -516,7 +517,7 @@ def create_stellar_plasma(
     plasma_modules.append(
         tardis.plasma.properties.partition_function.LevelBoltzmannFactorNoNLTE
     )
-    plasma_modules.remove(tardis.plasma.properties.radiative_properties.TauSobolev)
+    plasma_modules.remove(TauSobolev)
     plasma_modules.remove(tardis.plasma.properties.plasma_input.TimeExplosion)
     plasma_modules.remove(tardis.plasma.properties.plasma_input.DilutionFactor)
     plasma_modules.remove(tardis.plasma.properties.plasma_input.HeliumTreatment)