OilfieldToolsNet/IFEM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed: unify ASM(Cube|Square) and ASMmx(Cube|Square)

Browse Source 
in particular do not call generateFEMTopology in the latter's
constructor.
This commit is contained in:
Arne Morten Kvarving 2023-08-25 12:53:49 +02:00
parent 53f5d1f830
commit dc7a2e444a
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ASM/Test/ASMCube.h
View File

@ -43,7 +43,6 @@ public:
{ {
std::stringstream geo(cube); std::stringstream geo(cube);
this->read(geo); this->read(geo);
this->generateFEMTopology();
} }
virtual ~ASMmxCube() {} virtual ~ASMmxCube() {}
}; };

1
src/ASM/Test/ASMSquare.h
View File

@ -40,7 +40,6 @@ public:
{ {
std::stringstream geo(square); std::stringstream geo(square);
this->read(geo); this->read(geo);
this->generateFEMTopology();
} }
virtual ~ASMmxSquare() {} virtual ~ASMmxSquare() {}
}; };

2
src/ASM/Test/TestSplineFields.C
View File

@ -51,6 +51,7 @@ TEST(TestSplineFields, Value2Dmx)
{ {
ASMmxBase::Type = ASMmxBase::DIV_COMPATIBLE; ASMmxBase::Type = ASMmxBase::DIV_COMPATIBLE;
ASMmxSquare patch({1,1,1}); ASMmxSquare patch({1,1,1});
EXPECT_TRUE(patch.generateFEMTopology());
// {x+y+x*y, x-y+x*y} // {x+y+x*y, x-y+x*y}
std::vector<double> vc = {0.0, std::vector<double> vc = {0.0,
@ -203,6 +204,7 @@ TEST(TestSplineFields, Value3Dmx)
{ {
ASMmxBase::Type = ASMmxBase::DIV_COMPATIBLE; ASMmxBase::Type = ASMmxBase::DIV_COMPATIBLE;
ASMmxCube patch({1,1,1,1}); 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} // {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, std::vector<double> vc = {0.0, 0.5, 1.0,