diff --git a/tests/makeInput.py b/tests/makeInput.py index 5f784471e376d38eb1117aa3a70c327ee33e1b2b..97fb6c7ffd88c172d04a4441f2caf0d34c45663c 100644 --- a/tests/makeInput.py +++ b/tests/makeInput.py @@ -33,24 +33,13 @@ P = 1. # Pressure gamma = 5./3. # Gas adiabatic index fileName = "input.hdf5" -# read flags from config.h -flags = {} -config_file = "../config.h" -with open(config_file, "r") as f: - reg = "#define (\w*) (.*)\n" - for line in f: - m = regex.match(reg, line) - if m: - flags[m.group(1)] = m.group(2) - -cooling_grackle = "COOLING_GRACKLE" in flags - #--------------------------------------------------- numPart = L**3 mass = boxSize**3 * rho / numPart internalEnergy = P / ((gamma - 1.)*rho) -if cooling_grackle: - he_density = rho * 0.24 + +# chemistry data +he_density = rho * 0.24 #Generate particles coords = zeros((numPart, 3)) @@ -59,8 +48,9 @@ m = zeros((numPart, 1)) h = zeros((numPart, 1)) u = zeros((numPart, 1)) ids = zeros((numPart, 1), dtype='L') -if cooling_grackle: - he = zeros((numPart, 1)) + +# chemistry data +he = zeros((numPart, 1)) for i in range(L): for j in range(L): @@ -79,8 +69,8 @@ for i in range(L): h[index] = 2.251 * boxSize / L u[index] = internalEnergy ids[index] = index - if cooling_grackle: - he[index] = he_density + # chemistry data + he[index] = he_density #-------------------------------------------------- @@ -127,8 +117,8 @@ ds = grp.create_dataset('InternalEnergy', (numPart,1), 'f') ds[()] = u ds = grp.create_dataset('ParticleIDs', (numPart, 1), 'L') ds[()] = ids -if cooling_grackle: - ds = grp.create_dataset('HeDensity', (numPart, 1), 'f') - ds[()] = he +# chemistry +ds = grp.create_dataset('HeDensity', (numPart, 1), 'f') +ds[()] = he file.close()