Skip to content

Commit d1c2d74

Browse files
UCaromelnicolasaunai
UCaromel
authored and
nicolasaunai
committed
tests setup
1 parent 883f39b commit d1c2d74

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+866
-496
lines changed

‎pyphare/pyphare/mock_mhd_simulator/simulation.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from . import global_vars
22

3+
34
class Simulation(object):
45
def __init__(self, **kwargs):
56
if global_vars.sim is not None:
@@ -14,3 +15,6 @@ def __init__(self, **kwargs):
1415

1516
def set_model(self, model):
1617
self.model = model
18+
19+
def clear(self):
20+
global_vars.sim = None

‎pyphare/pyphare/mock_mhd_simulator/simulator.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
from . import clearDict
2-
from . import populateDict
1+
from . import clearDict, populateDict
2+
33

44
def pyMHD():
55
import importlib
66

77
return importlib.import_module("pybindlibs.pyMHD")
88

9+
910
def make_cpp_simulator(dim, interp):
1011
import pybindlibs.pyMHD
1112

1213
make_sim = f"make_mhd_mock_simulator_{dim}_{interp}"
1314
return getattr(pyMHD(), make_sim)()
1415

16+
1517
class MHDMockSimulator:
1618
def __init__(self, simulation):
1719
self.cpp_sim = None
@@ -46,3 +48,7 @@ def run(self, filename, dumpfrequency=1):
4648
self._check_init()
4749
self.cpp_sim.advance(filename, dumpfrequency)
4850
return self
51+
52+
def clear_simulation(self):
53+
self.simulation.clear()
54+
return self

‎src/amr/amr_constants.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
#define AMR_CONSTANTS_HPP
33

44
#include <cstddef>
5-
namespace PHARE::amr {
5+
namespace PHARE::amr
6+
{
67
static std::size_t constexpr refinementRatio = 2;
78
}
89

‎src/amr/data/field/field_data_factory.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace amr
3535
FieldDataFactory(bool fineBoundaryRepresentsVariable, bool dataLivesOnPatchBorder,
3636
std::string const& name, PhysicalQuantity qty)
3737
: SAMRAI::hier::PatchDataFactory(
38-
SAMRAI::hier::IntVector{SAMRAI::tbox::Dimension(dimension), n_ghosts})
38+
SAMRAI::hier::IntVector{SAMRAI::tbox::Dimension(dimension), n_ghosts})
3939
, fineBoundaryRepresentsVariable_{fineBoundaryRepresentsVariable}
4040
, dataLivesOnPatchBorder_{dataLivesOnPatchBorder}
4141
, quantity_{qty}

‎src/amr/data/field/field_variable.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ namespace amr
3232
*/
3333
FieldVariable(std::string const& name, PhysicalQuantity qty,
3434
bool fineBoundaryRepresentsVariable = true)
35-
: SAMRAI::hier::Variable(
36-
name,
37-
std::make_shared<FieldDataFactory<GridLayoutT, FieldImpl>>(
38-
fineBoundaryRepresentsVariable, computeDataLivesOnPatchBorder_(qty), name, qty))
35+
: SAMRAI::hier::Variable(name,
36+
std::make_shared<FieldDataFactory<GridLayoutT, FieldImpl>>(
37+
fineBoundaryRepresentsVariable,
38+
computeDataLivesOnPatchBorder_(qty), name, qty))
3939
, fineBoundaryRepresentsVariable_{fineBoundaryRepresentsVariable}
4040
, dataLivesOnPatchBorder_{computeDataLivesOnPatchBorder_(qty)}
4141
{

‎src/amr/data/field/refine/linear_weighter.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,8 @@ LinearWeighter::LinearWeighter(core::QtyCentering centering, std::size_t ratio)
4949

5050

5151
std::transform(std::begin(distFromLeftNode_), std::end(distFromLeftNode_),
52-
std::back_inserter(weights_), [](auto const& d) {
53-
return std::array<double, 2>{{1. - d, d}};
54-
});
52+
std::back_inserter(weights_),
53+
[](auto const& d) { return std::array<double, 2>{{1. - d, d}}; });
5554
}
5655

5756
} // namespace PHARE::amr

‎src/amr/data/particles/refine/particles_data_split.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,9 @@ namespace amr
243243
std::back_inserter(destDomainParticles), isInDest);
244244
}
245245
} // end is candidate for split
246-
} // end loop on particles
247-
} // end loop on source particle arrays
248-
} // loop on destination box
246+
} // end loop on particles
247+
} // end loop on source particle arrays
248+
} // loop on destination box
249249
}
250250

251251

‎src/amr/load_balancing/load_balancer_manager.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class LoadBalancerManager
2929
, id_{variableDatabase_->registerVariableAndContext(loadBalancerVar_, context_,
3030
SAMRAI::hier::IntVector::getZero(dim_))}
3131
, maxLevelNumber_{dict["simulation"]["AMR"]["max_nbr_levels"].template to<int>()}
32-
, loadBalancerEstimators_(maxLevelNumber_){};
32+
, loadBalancerEstimators_(maxLevelNumber_) {};
3333

3434
~LoadBalancerManager() { variableDatabase_->removeVariable("LoadBalancerVariable"); };
3535

‎src/amr/messengers/messenger.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <SAMRAI/hier/PatchHierarchy.h>
1111

1212
#include "messenger_info.hpp"
13-
//#include "core/data/grid/gridlayout.hpp"
13+
// #include "core/data/grid/gridlayout.hpp"
1414

1515

1616
namespace PHARE

‎src/amr/messengers/messenger_factory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ std::vector<MessengerDescriptor> makeDescriptors(std::vector<std::string> modelN
1616
else
1717
throw std::runtime_error("Error max number of models is 2");
1818
}
19-
}
19+
} // namespace PHARE::amr

‎src/amr/messengers/mhd_messenger_info.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ namespace amr
1414
class MHDMessengerInfo : public IMessengerInfo
1515
{
1616
using VecFieldNames = core::VecFieldNames;
17+
1718
public:
1819
// What is needed here ?
1920
virtual ~MHDMessengerInfo() = default;

‎src/amr/resources_manager/resources_manager.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ namespace amr
438438
ResourcesInfo info;
439439
info.variable = ResourcesResolver_t::make_shared_variable(view);
440440
info.id = variableDatabase_->registerVariableAndContext(
441-
info.variable, context_, SAMRAI::hier::IntVector::getZero(dimension_));
441+
info.variable, context_, SAMRAI::hier::IntVector::getZero(dimension_));
442442

443443
nameToResourceInfo_.emplace(view.name(), info);
444444
}

‎src/amr/solvers/solver.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ namespace solver
100100
* ResourcesManager of the given model, onto the given Patch, at the given time.
101101
*/
102102
virtual void allocate(IPhysicalModel<AMR_Types>& model, patch_t& patch,
103-
double const allocateTime) const = 0;
103+
double const allocateTime) const
104+
= 0;
104105

105106

106107

‎src/amr/tagging/hybrid_tagger_strategy.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ template<typename HybridModel>
1818
HybridTaggerStrategy<HybridModel>::~HybridTaggerStrategy()
1919
{
2020
}
21-
}
21+
} // namespace PHARE::amr
2222

2323
#endif // HYBRID_TAGGER_STRATEGY_HPP

‎src/amr/tagging/tagger.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class Tagger
2424
std::string name() { return name_; }
2525
virtual void tag(PHARE::solver::IPhysicalModel<amr_t>& model, patch_t& patch, int tag_index)
2626
= 0;
27-
virtual ~Tagger(){};
27+
virtual ~Tagger() {};
2828
};
2929

3030

‎src/amr/wrappers/hierarchy.hpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -394,15 +394,15 @@ auto patchHierarchyDatabase(PHARE::initializer::PHAREDict const& amr)
394394
template<std::size_t _dimension>
395395
DimHierarchy<_dimension>::DimHierarchy(PHARE::initializer::PHAREDict const& dict)
396396
: Hierarchy{
397-
dict,
398-
std::make_shared<SAMRAI::geom::CartesianGridGeometry>(
399-
SAMRAI::tbox::Dimension{dimension}, "CartesianGridGeom",
400-
griddingAlgorithmDatabase<dimension>(dict["simulation"]["grid"])),
401-
patchHierarchyDatabase<dimension>(dict["simulation"]["AMR"]),
402-
shapeToBox(parseDimXYZType<int, dimension>(dict["simulation"]["grid"], "nbr_cells")),
403-
parseDimXYZType<double, dimension>(dict["simulation"]["grid"], "origin"),
404-
parseDimXYZType<double, dimension>(dict["simulation"]["grid"], "meshsize"),
405-
parseDimXYZType<std::string, dimension>(dict["simulation"]["grid"], "boundary_type")}
397+
dict,
398+
std::make_shared<SAMRAI::geom::CartesianGridGeometry>(
399+
SAMRAI::tbox::Dimension{dimension}, "CartesianGridGeom",
400+
griddingAlgorithmDatabase<dimension>(dict["simulation"]["grid"])),
401+
patchHierarchyDatabase<dimension>(dict["simulation"]["AMR"]),
402+
shapeToBox(parseDimXYZType<int, dimension>(dict["simulation"]["grid"], "nbr_cells")),
403+
parseDimXYZType<double, dimension>(dict["simulation"]["grid"], "origin"),
404+
parseDimXYZType<double, dimension>(dict["simulation"]["grid"], "meshsize"),
405+
parseDimXYZType<std::string, dimension>(dict["simulation"]["grid"], "boundary_type")}
406406
{
407407
}
408408

‎src/core/data/field/initializers/field_user_initializer.hpp

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,22 @@
77
#include "core/utilities/span.hpp"
88
#include "initializer/data_provider.hpp"
99

10-
namespace PHARE::core {
11-
class FieldUserFunctionInitializer {
12-
public:
13-
template <typename Field, typename GridLayout>
10+
namespace PHARE::core
11+
{
12+
class FieldUserFunctionInitializer
13+
{
14+
public:
15+
template<typename Field, typename GridLayout>
1416
void static initialize(Field& field, GridLayout const& layout,
15-
initializer::InitFunction<GridLayout::dimension> const& init) {
17+
initializer::InitFunction<GridLayout::dimension> const& init)
18+
{
1619
auto const indices = layout.ghostStartToEndIndices(field, /*includeEnd=*/true);
1720
auto const coords = layout.template indexesToCoordVectors</*WithField=*/true>(
1821
indices, field, [](auto& gridLayout, auto& field_, auto const&... args) {
1922
return gridLayout.fieldNodeCoordinates(field_, gridLayout.origin(), args...);
2023
});
2124

22-
std::shared_ptr<Span<double>> gridPtr // keep grid data alive
25+
std::shared_ptr<Span<double>> gridPtr // keep grid data alive
2326
= std::apply([&](auto&... args) { return init(args...); }, coords);
2427
Span<double>& grid = *gridPtr;
2528

@@ -28,6 +31,6 @@ class FieldUserFunctionInitializer {
2831
}
2932
};
3033

31-
} // namespace PHARE::core
34+
} // namespace PHARE::core
3235

3336
#endif

‎src/core/data/grid/gridlayout_impl.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
#include "gridlayoutimplyee.hpp"
55
#include "gridlayoutimplyee_mhd.hpp"
66

7-
#endif // PHARE_CORE_DATA_GRID_GRIDLAYOUT_IMPL_HPP
7+
#endif // PHARE_CORE_DATA_GRID_GRIDLAYOUT_IMPL_HPP

‎src/core/data/particles/particle.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ inline constexpr auto is_phare_particle_type
121121

122122
template<std::size_t dim, template<std::size_t> typename ParticleA,
123123
template<std::size_t> typename ParticleB>
124-
NO_DISCARD typename std::enable_if_t<
125-
is_phare_particle_type<dim, ParticleA<dim>> and is_phare_particle_type<dim, ParticleB<dim>>,
126-
bool>
124+
NO_DISCARD typename std::enable_if_t<is_phare_particle_type<dim, ParticleA<dim>>
125+
and is_phare_particle_type<dim, ParticleB<dim>>,
126+
bool>
127127
operator==(ParticleA<dim> const& particleA, ParticleB<dim> const& particleB)
128128
{
129129
return particleA.weight == particleB.weight and //

‎src/core/data/vecfield/vecfield_initializer.hpp

Lines changed: 39 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,36 +8,42 @@
88
#include "core/data/vecfield/vecfield_component.hpp"
99
#include "initializer/data_provider.hpp"
1010

11-
namespace PHARE {
12-
namespace core {
13-
template <std::size_t dimension>
14-
class VecFieldInitializer {
15-
public:
16-
VecFieldInitializer() = default;
17-
18-
VecFieldInitializer(initializer::PHAREDict const& dict)
19-
: x_{dict["x_component"].template to<initializer::InitFunction<dimension>>()},
20-
y_{dict["y_component"].template to<initializer::InitFunction<dimension>>()},
21-
z_{dict["z_component"].template to<initializer::InitFunction<dimension>>()} {}
22-
23-
template <typename VecField, typename GridLayout>
24-
void initialize(VecField& v, GridLayout const& layout) {
25-
static_assert(GridLayout::dimension == VecField::dimension,
26-
"dimension mismatch between vecfield and gridlayout");
27-
28-
FieldUserFunctionInitializer::initialize(v.getComponent(Component::X), layout, x_);
29-
FieldUserFunctionInitializer::initialize(v.getComponent(Component::Y), layout, y_);
30-
FieldUserFunctionInitializer::initialize(v.getComponent(Component::Z), layout, z_);
31-
}
32-
33-
private:
34-
initializer::InitFunction<dimension> x_;
35-
initializer::InitFunction<dimension> y_;
36-
initializer::InitFunction<dimension> z_;
37-
};
38-
39-
} // namespace core
40-
41-
} // namespace PHARE
42-
43-
#endif // VECFIELD_INITIALIZER_HPP
11+
namespace PHARE
12+
{
13+
namespace core
14+
{
15+
template<std::size_t dimension>
16+
class VecFieldInitializer
17+
{
18+
public:
19+
VecFieldInitializer() = default;
20+
21+
VecFieldInitializer(initializer::PHAREDict const& dict)
22+
: x_{dict["x_component"].template to<initializer::InitFunction<dimension>>()}
23+
, y_{dict["y_component"].template to<initializer::InitFunction<dimension>>()}
24+
, z_{dict["z_component"].template to<initializer::InitFunction<dimension>>()}
25+
{
26+
}
27+
28+
template<typename VecField, typename GridLayout>
29+
void initialize(VecField& v, GridLayout const& layout)
30+
{
31+
static_assert(GridLayout::dimension == VecField::dimension,
32+
"dimension mismatch between vecfield and gridlayout");
33+
34+
FieldUserFunctionInitializer::initialize(v.getComponent(Component::X), layout, x_);
35+
FieldUserFunctionInitializer::initialize(v.getComponent(Component::Y), layout, y_);
36+
FieldUserFunctionInitializer::initialize(v.getComponent(Component::Z), layout, z_);
37+
}
38+
39+
private:
40+
initializer::InitFunction<dimension> x_;
41+
initializer::InitFunction<dimension> y_;
42+
initializer::InitFunction<dimension> z_;
43+
};
44+
45+
} // namespace core
46+
47+
} // namespace PHARE
48+
49+
#endif // VECFIELD_INITIALIZER_HPP

‎src/core/def/pragma_disable.hpp

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,25 @@
1212
#define DIAG_PRAGMA(compiler, x) DIAG_DO_PRAGMA(compiler diagnostic x)
1313
#endif
1414
#if defined(__clang__)
15-
#define DISABLE_WARNING(gcc_unused, clang_option, msvc_unused) \
16-
DIAG_PRAGMA(clang, push) \
17-
DIAG_PRAGMA(clang, ignored DIAG_JOINSTR(-W, clang_option))
18-
#define ENABLE_WARNING(gcc_unused, clang_option, msvc_unused) \
19-
DIAG_PRAGMA(clang, pop)
15+
#define DISABLE_WARNING(gcc_unused, clang_option, msvc_unused) \
16+
DIAG_PRAGMA(clang, push) \
17+
DIAG_PRAGMA(clang, ignored DIAG_JOINSTR(-W, clang_option))
18+
#define ENABLE_WARNING(gcc_unused, clang_option, msvc_unused) DIAG_PRAGMA(clang, pop)
2019
#elif defined(_MSC_VER)
21-
#define DISABLE_WARNING(gcc_unused, clang_unused, msvc_errorcode) \
22-
DIAG_PRAGMA(msvc, push) DIAG_DO_PRAGMA(warning(disable :##msvc_errorcode))
23-
#define ENABLE_WARNING(gcc_unused, clang_unused, msvc_errorcode) \
24-
DIAG_PRAGMA(msvc, pop)
20+
#define DISABLE_WARNING(gcc_unused, clang_unused, msvc_errorcode) \
21+
DIAG_PRAGMA(msvc, push) DIAG_DO_PRAGMA(warning(disable :##msvc_errorcode))
22+
#define ENABLE_WARNING(gcc_unused, clang_unused, msvc_errorcode) DIAG_PRAGMA(msvc, pop)
2523
#elif defined(__GNUC__)
2624
#if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406
27-
#define DISABLE_WARNING(gcc_option, clang_unused, msvc_unused) \
28-
DIAG_PRAGMA(GCC, push) DIAG_PRAGMA(GCC, ignored DIAG_JOINSTR(-W, gcc_option))
29-
#define ENABLE_WARNING(gcc_option, clang_unused, msvc_unused) \
30-
DIAG_PRAGMA(GCC, pop)
25+
#define DISABLE_WARNING(gcc_option, clang_unused, msvc_unused) \
26+
DIAG_PRAGMA(GCC, push) DIAG_PRAGMA(GCC, ignored DIAG_JOINSTR(-W, gcc_option))
27+
#define ENABLE_WARNING(gcc_option, clang_unused, msvc_unused) DIAG_PRAGMA(GCC, pop)
3128
#else
32-
#define DISABLE_WARNING(gcc_option, clang_unused, msvc_unused) \
33-
DIAG_PRAGMA(GCC, ignored DIAG_JOINSTR(-W, gcc_option))
34-
#define ENABLE_WARNING(gcc_option, clang_option, msvc_unused) \
35-
DIAG_PRAGMA(GCC, warning DIAG_JOINSTR(-W, gcc_option))
29+
#define DISABLE_WARNING(gcc_option, clang_unused, msvc_unused) \
30+
DIAG_PRAGMA(GCC, ignored DIAG_JOINSTR(-W, gcc_option))
31+
#define ENABLE_WARNING(gcc_option, clang_option, msvc_unused) \
32+
DIAG_PRAGMA(GCC, warning DIAG_JOINSTR(-W, gcc_option))
3633
#endif
3734
#endif
3835

39-
#endif // PHARE_PRAGMA_DISABLE_HPP
36+
#endif // PHARE_PRAGMA_DISABLE_HPP

0 commit comments

Comments
 (0)