-
-
Notifications
You must be signed in to change notification settings - Fork 402
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix issue with custom_composition reader (#843)
* Update read_csv call in read_csv_isotope_abundances * Update docstring * Update documentation * Add testing data files * Update cmfgen_density reader * Fix remaining shape mismatches in model_reader.py * Extend tests * Fix reference values in tests * Fix cmfgen composition reader * Fix cmfgen reader tests
- Loading branch information
1 parent
8eea19f
commit 78aa633
Showing
6 changed files
with
81 additions
and
61 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
C O Mg Si Ni56 Ni58 | ||
0 0 0 0.6 0.4 0 | ||
0 0 0 0.1 0.5 0.4 | ||
0 0 0 0.3 0 0.7 | ||
0 0.2 0.8 0 0 0 | ||
0 0.3 0.7 0 0 0 | ||
0 0.2 0.8 0 0 0 | ||
0 0.2 0.8 0 0 0 | ||
0 0.2 0.8 0 0 0 | ||
0.5 0.5 0 0 0 0 | ||
0.5 0.5 0 0 0 0 | ||
Index C O Mg Si Ni56 Ni58 | ||
0 0 0 0 0.6 0.4 0 | ||
1 0 0 0 0.1 0.5 0.4 | ||
2 0 0 0 0.3 0 0.7 | ||
3 0 0.2 0.8 0 0 0 | ||
4 0 0.3 0.7 0 0 0 | ||
5 0 0.2 0.8 0 0 0 | ||
6 0 0.2 0.8 0 0 0 | ||
7 0 0.2 0.8 0 0 0 | ||
8 0.5 0.5 0 0 0 0 | ||
9 0.5 0.5 0 0 0 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,13 @@ | ||
t0: 0.976 day | ||
velocity temperature densities electron_densities C O Mg Si Ni56 Ni58 | ||
km/s K g/cm^3 /cm^3 1 1 1 1 1 1 | ||
871.66905 76395.577 4.2537191E-09 2.60E+14 0 0 0 0.6 0.4 0 | ||
877.44269 76395.577 4.2537191E-09 2.60E+14 0 0 0 0.1 0.5 0.4 | ||
894.99407 76395.631 4.2537191E-09 2.60E+14 0 0 0 0.3 0 0.7 | ||
931.1571 76396.057 4.2537191E-09 2.60E+14 0 0.2 0.8 0 0 0 | ||
990.30752 76399.042 4.2537271E-09 2.60E+14 0 0.3 0.7 0 0 0 | ||
1050.8676 76411.983 4.2539537E-09 2.60E+14 0 0.2 0.8 0 0 0 | ||
1115.1545 76459.592 4.2563604E-09 2.60E+14 0 0.2 0.8 0 0 0 | ||
1183.3741 76633.367 4.2683079E-09 2.61E+14 0 0.2 0.8 0 0 0 | ||
1255.767 77312.12 4.290997E-09 2.64E+14 0.5 0.5 0 0 0 0 | ||
1332.5886 79602.375 4.3396835E-09 2.72E+14 0.5 0.5 0 0 0 0 | ||
Index velocity temperature densities electron_densities C O Mg Si Ni56 Ni58 | ||
- km/s K g/cm^3 /cm^3 1 1 1 1 1 1 | ||
0 871.66905 76395.577 4.2537191E-09 2.60E+14 0 0 0 0.6 0.4 0 | ||
1 877.44269 76395.577 4.2537191E-09 2.60E+14 0 0 0 0.1 0.5 0.4 | ||
2 894.99407 76395.631 4.2537191E-09 2.60E+14 0 0 0 0.3 0 0.7 | ||
3 931.1571 76396.057 4.2537191E-09 2.60E+14 0 0.2 0.8 0 0 0 | ||
4 990.30752 76399.042 4.2537271E-09 2.60E+14 0 0.3 0.7 0 0 0 | ||
5 1050.8676 76411.983 4.2539537E-09 2.60E+14 0 0.2 0.8 0 0 0 | ||
6 1115.1545 76459.592 4.2563604E-09 2.60E+14 0 0.2 0.8 0 0 0 | ||
7 1183.3741 76633.367 4.2683079E-09 2.61E+14 0 0.2 0.8 0 0 0 | ||
8 1255.767 77312.12 4.290997E-09 2.64E+14 0.5 0.5 0 0 0 0 | ||
9 1332.5886 79602.375 4.3396835E-09 2.72E+14 0.5 0.5 0 0 0 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,12 @@ | ||
C O Mg Si Ni56 Ni58 | ||
1 1 1 1 1 1 | ||
0 0 0 0.6 0.4 0 | ||
0 0 0 0.1 0.5 0.4 | ||
0 0 0 0.3 0 0.7 | ||
0 0.2 0.8 0 0 0 | ||
0 0.3 0.7 0 0 0 | ||
0 0.2 0.8 0 0 0 | ||
0 0.2 0.8 0 0 0 | ||
0 0.2 0.8 0 0 0 | ||
0.5 0.5 0 0 0 0 | ||
0.5 0.5 0 0 0 0 | ||
Index C O Mg Si Ni56 Ni58 | ||
0 1 1 1 1 1 1 | ||
1 0 0 0 0.6 0.4 0 | ||
2 0 0 0 0.1 0.5 0.4 | ||
3 0 0 0 0.3 0 0.7 | ||
4 0 0.2 0.8 0 0 0 | ||
5 0 0.3 0.7 0 0 0 | ||
6 0 0.2 0.8 0 0 0 | ||
7 0 0.2 0.8 0 0 0 | ||
8 0 0.2 0.8 0 0 0 | ||
9 0.5 0.5 0 0 0 0 | ||
10 0.5 0.5 0 0 0 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters