The final carsus merge #786
Conversation
| @@ -1,7 +1,8 @@ | |||
| import os | |||
| from matplotlib import pyplot as plt | |||
| from matplotlib import colors | |||
| from tardis import atomic, plasma_array, util | |||
| from tardis import plasma_array, util | |||
There was a problem hiding this comment.
I should fix that, right?
| @@ -1,7 +1,8 @@ | |||
| import os | |||
|
|
|||
| from matplotlib import colors | |||
| from tardis import atomic, plasma_array, util | |||
| from tardis import plasma_array, util | |||
There was a problem hiding this comment.
Same as above, there is no plasma_array
| @@ -162,14 +162,14 @@ def _main_nlte_calculation( | |||
| (number_of_levels**2, len(t_electrons))) | |||
| r_lu_matrix_reshaped[r_lu_index] = B_lus[np.newaxis].T * \ | |||
| j_blues_filtered * beta_sobolevs_filtered | |||
| if atomic_data.has_collision_data: | |||
| if atomic_data.collision_data is not None: | |||
| if previous_electron_densities is None: | |||
| collision_matrix = r_ul_matrix.copy() | |||
There was a problem hiding this comment.
collision_matrix = np.zeros_like(r_ul_matrix)
| initial_t_inner + initial_t_rad + helium_treatment) | ||
|
|
||
|
|
||
| def idfn(fixture_value): |
There was a problem hiding this comment.
can you quickly document this
|
My verification show that the
|
|
Found the bug, nevermind. |
|
After fixing the bug, all tests involving However my NLTE test setup (with no NLTE species) does have a slightly different spectrum: @wkerzendorf How should we proceed? |
yeganer
force-pushed
the
carsus_merge
branch
3 times, most recently
from
45b369d
to
1483138
Compare
That means we don't need to set indexes in tardis. Additionally all 'copys' were removed as there does not seem to be a special need for them.
As a result, there will be SettingWithCopy warnings but my tests showed they are not problematic.
Additionally: Internally rename 'tardis-refdata' config variable to 'tardis_refdata'.
Also we only close if we opened the HDFStore
This should show up if any property is not found during testing
This is to see the travis error message
|
@wkerzendorf Tests are passing. Looks like this might be ready to merge. |
This PR replaces #770