Merge branch 'release/2.x' into guilhem/test_large_mask

This commit is contained in:
Guilhem Lavaux 2021-02-25 14:39:02 +02:00
commit 41a5435c55
7 changed files with 42 additions and 12 deletions

View file

@ -455,7 +455,7 @@ void saveBox(SimuData *&boxed, const std::string& outbox, generateMock_info& arg
v.putVar({0}, {size_t(boxed->NumPart)}, particle_id);
v2.putVar({0}, {size_t(boxed->NumPart)}, expansion_fac);
v3.putVar({0}, {size_t(boxed->NumPart)}, snapshot_split);
v3.putVar({0}, {size_t(num_snapshots)}, snapshot_split);
if (uniqueID != 0)
{
NcVar v4 = f.addVar("unique_ids_lsb", ncInt, NumPart_dim);

View file

@ -170,8 +170,8 @@ int main(int argc, char **argv) {
double result, error;
size_t nEval;
int iZ, numZ = 4000;
double maxZ = 5.0, z, *dL, *redshifts;
int iZ, numZ = 8000;
double maxZ = 10.0, z, *dL, *redshifts;
dL = (double *) malloc(numZ * sizeof(double));
redshifts = (double *) malloc(numZ * sizeof(double));
for (iZ = 0; iZ < numZ; iZ++) {
@ -181,7 +181,7 @@ int main(int argc, char **argv) {
//printf("HERE %e %e\n", z, dL[iZ]);
redshifts[iZ] = z;
}
gsl_interp *interp = gsl_interp_alloc(gsl_interp_linear, 4000);
gsl_interp *interp = gsl_interp_alloc(gsl_interp_linear, numZ);
gsl_interp_init(interp, dL, redshifts, numZ);
gsl_interp_accel *acc = gsl_interp_accel_alloc();