Commit ad13d19c authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Fix ClusterIterationData double section size estimate

parent 57f65b4a

src/cluster/cluster.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -2192,7 +2192,7 @@ long ClusterIterationData::get_size(GeometryConfiguration *gconf, ScattererConfi 
  upsmp = new double[3](); argi = new double[1](); args = new double[1](); duk = new double[3]();

  upsmp = new double[3](); argi = new double[1](); args = new double[1](); duk = new double[3]();

  cextlr[] = new double[16](); cext[] = new double[16](); cmullr[] = new double[16]();

  cextlr[] = new double[16](); cext[] = new double[16](); cmullr[] = new double[16]();

  cmul[] = new double[16](); zpv[][] = new double[12 * lm];

  cmul[] = new double[16](); zpv[][] = new double[12 * lm];

  (99 + 5 * NSPH + 12 * LM) double values

  (132 + 5 * NSPH + 12 * LM) double values





  tqspe[] = new dcomplex[2 * c1->nsph](); tqsps[] = new dcomplex[2 * c1->nsph]();

  tqspe[] = new dcomplex[2 * c1->nsph](); tqsps[] = new dcomplex[2 * c1->nsph]();

  tqcpe[] = new dcomplex[6](); tqcps[] = new dcomplex[6](); gapp[] = new dcomplex[6]();

  tqcpe[] = new dcomplex[6](); tqcps[] = new dcomplex[6](); gapp[] = new dcomplex[6]();
@@ -2211,7 +2211,7 @@ long ClusterIterationData::get_size(GeometryConfiguration *gconf, ScattererConfi 
  result += sizeof(int) * 7;

  result += sizeof(int) * 7;

  result += sizeof(bool);

  result += sizeof(bool);

  result += sizeof(long) * (44 + 6 * lm + ndit);

  result += sizeof(long) * (44 + 6 * lm + ndit);

  result += sizeof(double) * (99 + 5 * nsph + 12 * lm);

  result += sizeof(double) * (132 + 5 * nsph + 12 * lm);

  result += sizeof(dcomplex) * (24 + 4 * nsph + ndit * ndit);

  result += sizeof(dcomplex) * (24 + 4 * nsph + ndit * ndit);

  result += ParticleDescriptorCluster::get_size(gconf, sconf);

  result += ParticleDescriptorCluster::get_size(gconf, sconf);

  return result;

  return result;

src/scripts/model_maker.py

+1 −1
Original line number Original line Diff line number Diff line
@@ -918,7 +918,7 @@ def test_system_resources(model, gconf, sconf): 
                required_ram_bytes += 4 * 7

                required_ram_bytes += 4 * 7

                required_ram_bytes += 1

                required_ram_bytes += 1

                required_ram_bytes += 8 * (44 + 6 * lm + ndit)

                required_ram_bytes += 8 * (44 + 6 * lm + ndit)

                required_ram_bytes += 8 * (99 + 5 * nsph + 12 * lm)

                required_ram_bytes += 8 * (132 + 5 * nsph + 12 * lm)

                required_ram_bytes += 16 * (24 + 4 * nsph + ndit * ndit)

                required_ram_bytes += 16 * (24 + 4 * nsph + ndit * ndit)

                # ParticleDescriptorCluster section

                # ParticleDescriptorCluster section

                required_ram_bytes += 2 * 2

                required_ram_bytes += 2 * 2