Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev-TNG_fix #101

Merged
merged 37 commits into from
Mar 27, 2024
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
d1944a2
Removing the read functions from utilities to "read_files" which now …
kateharborne Feb 5, 2024
ea3a4ae
A new read_tipsy method initialised.
kateharborne Feb 5, 2024
929fa58
Modifications for tispy file read-in support.
kateharborne Feb 13, 2024
b22c8d7
Adding in methods for getting the Hydrogen mass fraction using pynbod…
kateharborne Mar 6, 2024
77c8616
Removing carbon tracking, as this element isnt used for further image…
kateharborne Mar 6, 2024
c55d744
Adding in a computation of internal energy as taken from pynbody reci…
kateharborne Mar 6, 2024
f81d1d5
Moving the read functions to a new file.
kateharborne Mar 20, 2024
326e8e2
Removing reference to the carbon read-in for gas properties - we don'…
kateharborne Mar 26, 2024
ae335b7
Modifying the NumPart-Total requirement (as TNG outpts from the auto-…
kateharborne Mar 26, 2024
e9d1d12
Merge branch 'dev-TNG_fix' of github.com:kateharborne/SimSpin into de…
kateharborne Mar 26, 2024
f8ff53e
Added in check for attributes of HDF5 files ONLY for the necessary da…
kateharborne Mar 26, 2024
38a327f
Modified the method of determining the file type and read in choice.
kateharborne Mar 26, 2024
8b61dcd
Added the "Smoothed" naming convention.
kateharborne Mar 26, 2024
4bd96d2
Updating number of expected gas properties (no longer write out Carbo…
kateharborne Mar 26, 2024
ebd474b
Adding the catch for smoothed properties in HAGN treatment.
kateharborne Mar 26, 2024
05d2274
Modification to check that the necessary dataset attributes are actua…
kateharborne Mar 26, 2024
ee37e7a
Updating the package version number.
kateharborne Mar 26, 2024
a375fb9
Updating the package version number.
kateharborne Mar 26, 2024
6285949
Updating the NEWS.
kateharborne Mar 26, 2024
2fe0801
Rebasing utilities to include the new file "read_files.R" with the r…
kateharborne Mar 26, 2024
32c44b3
A new read_tipsy method initialised.
kateharborne Feb 5, 2024
69aee26
Modifications for tispy file read-in support.
kateharborne Feb 13, 2024
24723ca
Adding in methods for getting the Hydrogen mass fraction using pynbod…
kateharborne Mar 6, 2024
5095459
Removing carbon tracking, as this element isnt used for further image…
kateharborne Mar 6, 2024
75c34d2
Adding in a computation of internal energy as taken from pynbody reci…
kateharborne Mar 6, 2024
2670f39
Modifying the NumPart-Total requirement (as TNG outpts from the auto-…
kateharborne Mar 26, 2024
1d5bcd5
Removing reference to the carbon read-in for gas properties - we don'…
kateharborne Mar 26, 2024
76f501c
Added in check for attributes of HDF5 files ONLY for the necessary da…
kateharborne Mar 26, 2024
cd47120
Modified the method of determining the file type and read in choice.
kateharborne Mar 26, 2024
8aabcbf
Added the "Smoothed" naming convention.
kateharborne Mar 26, 2024
8f924c6
Updating number of expected gas properties (no longer write out Carbo…
kateharborne Mar 26, 2024
c5895b3
Adding the catch for smoothed properties in HAGN treatment.
kateharborne Mar 26, 2024
6e5d0e9
Modification to check that the necessary dataset attributes are actua…
kateharborne Mar 26, 2024
9ec9723
Updating the package version number
kateharborne Mar 26, 2024
6b54d5f
Updating the package version number and name spelling.
kateharborne Mar 26, 2024
144d53b
Updating the NEWS
kateharborne Mar 26, 2024
9bb7b4f
Merging conflicts in rebase.
kateharborne Mar 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Adding the catch for smoothed properties in HAGN treatment.
  • Loading branch information
kateharborne committed Mar 26, 2024
commit c5895b37298ad400300d6c82cf42e34f1afbe350
8 changes: 5 additions & 3 deletions R/read_files.R
Original file line number Diff line number Diff line change
@@ -559,8 +559,9 @@
PT0_attr = hdf5r::list.datasets(data[["PartType0"]])

expected_names_gas = c("Coordinates", "Density", "Mass", "ParticleIDs",
"ElementAbundance/Oxygen",
"ElementAbundance/Hydrogen", "Metallicity",
"ElementAbundance/Oxygen", "SmoothedElementAbundance/Oxygen",
"ElementAbundance/Hydrogen", "SmoothedElementAbundance/Hydrogen",
"Metallicity", "SmoothedMetallicity",
"StarFormationRate", "Velocity", "Temperature",
"Pressure")
PT0_attr = PT0_attr[which(PT0_attr %in% expected_names_gas)] # trim list to only read in necessary data sets
@@ -615,7 +616,8 @@
PT4_attr = hdf5r::list.datasets(data[["PartType4"]])

expected_names_stars = c("Coordinates", "InitialMass", "Mass", "ParticleIDs",
"Metallicity", "StellarFormationTime", "Velocity")
"Metallicity", "SmoothedMetallicity",
"StellarFormationTime", "Velocity")
PT4_attr = PT4_attr[which(PT4_attr %in% expected_names_stars)] # trim list to only read in necessary data sets

n_star_prop = length(PT4_attr)