diff --git a/configure.ac b/configure.ac index 9212202e54a89fdff2986355c0543f1f57413ad0..d64fe1911a616179125c971c7645d4f4380835d2 100644 --- a/configure.ac +++ b/configure.ac @@ -533,7 +533,7 @@ if test "x$with_grackle" != "xno"; then [grackle], [initialize_chemistry_data], [AC_DEFINE([HAVE_GRACKLE],1,[The GRACKLE library appears to be present.]) - AC_DEFINE([CONFIG_BFLOAT_8],1,[Use double in grackle]) + AC_DEFINE([CONFIG_BFLOAT_8],1,[Use doubles in grackle]) ], [AC_MSG_ERROR(Cannot find grackle library!)], [$GRACKLE_LIBS $GRACKLE_INCS $FCLIBS] diff --git a/src/cooling/grackle/cooling.h b/src/cooling/grackle/cooling.h index d1e7c30c9ca1eda671ea2d34c34f2dea8c8ec1ea..f81f2357682b24ee751e7c48482acbfc57b765be 100644 --- a/src/cooling/grackle/cooling.h +++ b/src/cooling/grackle/cooling.h @@ -497,7 +497,7 @@ __attribute__((always_inline)) INLINE static gr_float cooling_rate( /* set current time */ code_units units = cooling->units; if (cooling->redshift == -1) - error("TODO time dependant redshift"); + units.a_value = cosmo->a; else units.a_value = 1. / (1. + cooling->redshift); @@ -535,27 +535,27 @@ __attribute__((always_inline)) INLINE static gr_float cooling_rate( /* copy to grackle structure */ cooling_copy_to_grackle(data, p, xp, density); - /* solve chemistry with table */ - - + /* solve chemistry */ chemistry_data chemistry_grackle = cooling->chemistry; chemistry_data_storage my_rates = grackle_rates; - _solve_chemistry(&chemistry_grackle, - &my_rates, - &units, dt, data.grid_dx, - data.grid_rank, data.grid_dimension, - data.grid_start, data.grid_end, - data.density, data.internal_energy, - data.x_velocity, data.y_velocity, data.z_velocity, - data.HI_density, data.HII_density, data.HM_density, - data.HeI_density, data.HeII_density, data.HeIII_density, - data.H2I_density, data.H2II_density, - data.DI_density, data.DII_density, data.HDI_density, - data.e_density, data.metal_density, - data.volumetric_heating_rate, data.specific_heating_rate, - data.RT_heating_rate, data.RT_HI_ionization_rate, data.RT_HeI_ionization_rate, - data.RT_HeII_ionization_rate, data.RT_H2_dissociation_rate, - NULL); + int error_code = _solve_chemistry(&chemistry_grackle, + &my_rates, + &units, dt, data.grid_dx, + data.grid_rank, data.grid_dimension, + data.grid_start, data.grid_end, + data.density, data.internal_energy, + data.x_velocity, data.y_velocity, data.z_velocity, + data.HI_density, data.HII_density, data.HM_density, + data.HeI_density, data.HeII_density, data.HeIII_density, + data.H2I_density, data.H2II_density, + data.DI_density, data.DII_density, data.HDI_density, + data.e_density, data.metal_density, + data.volumetric_heating_rate, data.specific_heating_rate, + data.RT_heating_rate, data.RT_HI_ionization_rate, data.RT_HeI_ionization_rate, + data.RT_HeII_ionization_rate, data.RT_H2_dissociation_rate, + NULL); + if (error_code == 0) + error("Error in solve_chemistry."); //if (solve_chemistry(&units, &data, dt) == 0) { // error("Error in solve_chemistry."); //} diff --git a/src/parallel_io.c b/src/parallel_io.c index ef711b7206507386df88f894e0ad0984ae5137b8..00931a2ea9c293468cf72bdffd280875ae697c2b 100644 --- a/src/parallel_io.c +++ b/src/parallel_io.c @@ -856,7 +856,6 @@ void prepare_file(struct engine* e, const char* baseName, long long N_total[6], const struct xpart* xparts = e->s->xparts; const struct gpart* gparts = e->s->gparts; const struct spart* sparts = e->s->sparts; - struct gpart* dmparts = NULL; FILE* xmfFile = 0; int periodic = e->s->periodic; int numFiles = 1;