diff --git a/hyperion/model/analytical_yso_model.py b/hyperion/model/analytical_yso_model.py index 5feb8b6a..939ad670 100644 --- a/hyperion/model/analytical_yso_model.py +++ b/hyperion/model/analytical_yso_model.py @@ -723,6 +723,7 @@ def to_model(self, merge_if_possible=True): m._minimum_specific_energy = deepcopy(self._minimum_specific_energy) m._monochromatic = self._monochromatic + m._monochromatic_energy_threshold = self._monochromatic_energy_threshold m._frequencies = self._frequencies # Easiest way to copy over all settings diff --git a/hyperion/model/tests/data/test_pascucci.tau=0.1.rtout b/hyperion/model/tests/data/test_pascucci.tau=0.1.rtout index 8dc5ea57..c48391a4 100644 Binary files a/hyperion/model/tests/data/test_pascucci.tau=0.1.rtout and b/hyperion/model/tests/data/test_pascucci.tau=0.1.rtout differ diff --git a/hyperion/model/tests/data/test_pascucci.tau=1.rtout b/hyperion/model/tests/data/test_pascucci.tau=1.rtout index 60496db1..98bbf34a 100644 Binary files a/hyperion/model/tests/data/test_pascucci.tau=1.rtout and b/hyperion/model/tests/data/test_pascucci.tau=1.rtout differ diff --git a/hyperion/model/tests/data/test_pascucci.tau=10.rtout b/hyperion/model/tests/data/test_pascucci.tau=10.rtout index 54ff5a26..ffdd116d 100644 Binary files a/hyperion/model/tests/data/test_pascucci.tau=10.rtout and b/hyperion/model/tests/data/test_pascucci.tau=10.rtout differ diff --git a/hyperion/model/tests/data/test_pascucci.tau=100.rtout b/hyperion/model/tests/data/test_pascucci.tau=100.rtout index cae8f5ac..4495fff4 100644 Binary files a/hyperion/model/tests/data/test_pascucci.tau=100.rtout and b/hyperion/model/tests/data/test_pascucci.tau=100.rtout differ diff --git a/hyperion/model/tests/data/test_peeloff.grid_type=sph.raytracing=True.sample_sources_evenly=False.rtout b/hyperion/model/tests/data/test_peeloff.grid_type=sph.raytracing=True.sample_sources_evenly=False.rtout index 442514ef..4d9c2754 100644 Binary files a/hyperion/model/tests/data/test_peeloff.grid_type=sph.raytracing=True.sample_sources_evenly=False.rtout and b/hyperion/model/tests/data/test_peeloff.grid_type=sph.raytracing=True.sample_sources_evenly=False.rtout differ diff --git a/hyperion/model/tests/data/test_peeloff.grid_type=sph.raytracing=True.sample_sources_evenly=True.rtout b/hyperion/model/tests/data/test_peeloff.grid_type=sph.raytracing=True.sample_sources_evenly=True.rtout index 100b9df0..68cc5fc9 100644 Binary files a/hyperion/model/tests/data/test_peeloff.grid_type=sph.raytracing=True.sample_sources_evenly=True.rtout and b/hyperion/model/tests/data/test_peeloff.grid_type=sph.raytracing=True.sample_sources_evenly=True.rtout differ diff --git a/hyperion/model/tests/data/test_pinte_images.tau=1000.rtout b/hyperion/model/tests/data/test_pinte_images.tau=1000.rtout index e0f54b69..7bb7b5a8 100644 Binary files a/hyperion/model/tests/data/test_pinte_images.tau=1000.rtout and b/hyperion/model/tests/data/test_pinte_images.tau=1000.rtout differ diff --git a/hyperion/model/tests/data/test_pinte_images.tau=10000.rtout b/hyperion/model/tests/data/test_pinte_images.tau=10000.rtout index 7278487b..e3469b07 100644 Binary files a/hyperion/model/tests/data/test_pinte_images.tau=10000.rtout and b/hyperion/model/tests/data/test_pinte_images.tau=10000.rtout differ diff --git a/hyperion/model/tests/data/test_pinte_images.tau=100000.rtout b/hyperion/model/tests/data/test_pinte_images.tau=100000.rtout index 2b8efec6..e2546f99 100644 Binary files a/hyperion/model/tests/data/test_pinte_images.tau=100000.rtout and b/hyperion/model/tests/data/test_pinte_images.tau=100000.rtout differ diff --git a/hyperion/model/tests/data/test_pinte_images.tau=1000000.rtout b/hyperion/model/tests/data/test_pinte_images.tau=1000000.rtout index e6f3c129..c2ab3775 100644 Binary files a/hyperion/model/tests/data/test_pinte_images.tau=1000000.rtout and b/hyperion/model/tests/data/test_pinte_images.tau=1000000.rtout differ diff --git a/hyperion/model/tests/data/test_pinte_seds.tau=1000.rtout b/hyperion/model/tests/data/test_pinte_seds.tau=1000.rtout index 45c3317b..9bbb057a 100644 Binary files a/hyperion/model/tests/data/test_pinte_seds.tau=1000.rtout and b/hyperion/model/tests/data/test_pinte_seds.tau=1000.rtout differ diff --git a/hyperion/model/tests/data/test_pinte_seds.tau=10000.rtout b/hyperion/model/tests/data/test_pinte_seds.tau=10000.rtout index fa44b6c9..41856d1e 100644 Binary files a/hyperion/model/tests/data/test_pinte_seds.tau=10000.rtout and b/hyperion/model/tests/data/test_pinte_seds.tau=10000.rtout differ diff --git a/hyperion/model/tests/data/test_pinte_seds.tau=100000.rtout b/hyperion/model/tests/data/test_pinte_seds.tau=100000.rtout index 2ecba4cc..ced69f26 100644 Binary files a/hyperion/model/tests/data/test_pinte_seds.tau=100000.rtout and b/hyperion/model/tests/data/test_pinte_seds.tau=100000.rtout differ diff --git a/hyperion/model/tests/data/test_pinte_seds.tau=1000000.rtout b/hyperion/model/tests/data/test_pinte_seds.tau=1000000.rtout index 02ce7b36..97909411 100644 Binary files a/hyperion/model/tests/data/test_pinte_seds.tau=1000000.rtout and b/hyperion/model/tests/data/test_pinte_seds.tau=1000000.rtout differ diff --git a/src/grid/grid_geometry_spherical_3d.f90 b/src/grid/grid_geometry_spherical_3d.f90 index 9c8d8a22..db61c680 100644 --- a/src/grid/grid_geometry_spherical_3d.f90 +++ b/src/grid/grid_geometry_spherical_3d.f90 @@ -651,7 +651,7 @@ subroutine random_position_cell(icell,pos) call random(r) call random(t) call random(p) - r = (r * (geo%w1(icell%i1+1)**3. - geo%w1(icell%i1)**3.) + geo%w1(icell%i1)**3.) ** (1./3.) + r = (r * (geo%w1(icell%i1+1)**3 - geo%w1(icell%i1)**3) + geo%w1(icell%i1)**3) ** (1._dp/3._dp) t = acos(t * (geo%wcost(icell%i2+1) - geo%wcost(icell%i2)) + geo%wcost(icell%i2)) p = p * (geo%w3(icell%i3+1) - geo%w3(icell%i3)) + geo%w3(icell%i3)