changed: unify ASM(Cube|Square) and ASMmx(Cube|Square)
in particular do not call generateFEMTopology in the latter's constructor.
This commit is contained in:
parent
53f5d1f830
commit
dc7a2e444a
@ -43,7 +43,6 @@ public:
|
||||
{
|
||||
std::stringstream geo(cube);
|
||||
this->read(geo);
|
||||
this->generateFEMTopology();
|
||||
}
|
||||
virtual ~ASMmxCube() {}
|
||||
};
|
||||
|
@ -40,7 +40,6 @@ public:
|
||||
{
|
||||
std::stringstream geo(square);
|
||||
this->read(geo);
|
||||
this->generateFEMTopology();
|
||||
}
|
||||
virtual ~ASMmxSquare() {}
|
||||
};
|
||||
|
@ -51,6 +51,7 @@ TEST(TestSplineFields, Value2Dmx)
|
||||
{
|
||||
ASMmxBase::Type = ASMmxBase::DIV_COMPATIBLE;
|
||||
ASMmxSquare patch({1,1,1});
|
||||
EXPECT_TRUE(patch.generateFEMTopology());
|
||||
|
||||
// {x+y+x*y, x-y+x*y}
|
||||
std::vector<double> vc = {0.0,
|
||||
@ -203,6 +204,7 @@ TEST(TestSplineFields, Value3Dmx)
|
||||
{
|
||||
ASMmxBase::Type = ASMmxBase::DIV_COMPATIBLE;
|
||||
ASMmxCube patch({1,1,1,1});
|
||||
EXPECT_TRUE(patch.generateFEMTopology());
|
||||
|
||||
// {x+y+z+x*y*z, x+y-z+x*y*z, x-y+z+x*y*z}
|
||||
std::vector<double> vc = {0.0, 0.5, 1.0,
|
||||
|
Loading…
Reference in New Issue
Block a user