Commit ed83daeb authored by Mark Meredith's avatar Mark Meredith
Browse files

Rename

parent 09ebad83

src/mesh.cpp

+6 −6
Original line number Diff line number Diff line
@@ -25,18 +25,18 @@ std::optional<solver::MeshSettings> make_mesh(solver::InputInfo ii) { 
  if (fabarray_size.size() != 3) {

    std::cout << FABARRAY_TILE_SZ << " needs 3 elements " << std::endl;

  } else {

    mx.fab_tile_size = fabarray_size[0];

    my.fab_tile_size = fabarray_size[1];

    mz.fab_tile_size = fabarray_size[2];

    mx.fluid_max_tile_size = fabarray_size[0];

    my.fluid_max_tile_size = fabarray_size[1];

    mz.fluid_max_tile_size = fabarray_size[2];

  }



  auto part_grid_size = std::get<solver::NumberArray>(ii[PARTICLE_TILE_SZ]);

  if (part_grid_size.size() != 3) {

    std::cout << PARTICLE_TILE_SZ << " needs 3 elements " << std::endl;

  } else {

    mx.particle_tile_size = part_grid_size[0];

    my.particle_tile_size = part_grid_size[1];

    mz.particle_tile_size = part_grid_size[2];

    mx.particle_max_tile_size = part_grid_size[0];

    my.particle_max_tile_size = part_grid_size[1];

    mz.particle_max_tile_size = part_grid_size[2];

  }



  auto grid_size_x = std::get<solver::NumberArray>(ii[GRID_SIZE_X]);

src/solver.hpp

+3 −3
Original line number Diff line number Diff line
@@ -28,11 +28,11 @@ struct GeometrySettings { 
};



struct MeshAxis {

  unsigned int fab_tile_size;

  unsigned int fluid_max_tile_size;

  unsigned int max_grid_size;

  unsigned int particle_max_grid_size;

  unsigned int n_cell;

  unsigned int particle_tile_size;

  unsigned int particle_max_grid_size;

  unsigned int particle_max_tile_size;

};



struct MeshSettings {

tests/solver.t.cpp

+6 −6
Original line number Diff line number Diff line
@@ -69,12 +69,12 @@ TEST_CASE("from_origin", "[]") { 
    CHECK(mx.particle_max_grid_size == 94);

    CHECK(my.particle_max_grid_size == 95);

    CHECK(mz.particle_max_grid_size == 96);

    CHECK(mx.particle_tile_size == 333);

    CHECK(my.particle_tile_size == 444);

    CHECK(mz.particle_tile_size == 555);

    CHECK(mx.fab_tile_size == 1234);

    CHECK(my.fab_tile_size == 4567);

    CHECK(mz.fab_tile_size == 7890);

    CHECK(mx.particle_max_tile_size == 333);

    CHECK(my.particle_max_tile_size == 444);

    CHECK(mz.particle_max_tile_size == 555);

    CHECK(mx.fluid_max_tile_size == 1234);

    CHECK(my.fluid_max_tile_size == 4567);

    CHECK(mz.fluid_max_tile_size == 7890);

  }



  SECTION(" Time fields ") {