Resolving conflicts with the master branch.
@@ -107,6 +107,10 @@ static void compare_distances(int model, struct distances_data * data)
data->Omega_k[model], data->Omega_n,
data->w_0[model], data->w_a[model],
data->h, data->A_s, data->n_s,-1,NULL,NULL);
+ //ccl_parameters params = ccl_parameters_create(data->Omega_c, data->Omega_b,
+ // data->Omega_k[model], data->N_nu_rel, data->N_nu_mass, data->mnu,
+ // data->w_0[model], data->w_a[model],
+ // data->h, data->A_s, data->n_s,-1,NULL,NULL, &status);_
params.Omega_g=0;
// Make a cosmology object from the parameters with the default configuration
ccl_cosmology * cosmo = ccl_cosmology_create(params, default_config);
