Skip to content

Commit 49dabe9

Browse files
tcadusertcaduser
committed
edge_solution, element_solution, set_edge_values, set_element_values
1 parent cb5903c commit 49dabe9

26 files changed

Lines changed: 387 additions & 159 deletions

‎src/Equation/Equation.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -311,13 +311,13 @@ void Equation<DoubleType>::DefaultACUpdate(NodeModel &nm, const std::vector<std:
311311
if (!rnm)
312312
{
313313
dsErrors::CreateModelOnRegion(*myregion, realnodemodel, OutputStream::OutputType::INFO);
314-
rnm = CreateNodeSolution(realnodemodel, myregion);
314+
rnm = CreateNodeSolution(realnodemodel, myregion, NodeModel::DisplayType::SCALAR);
315315
}
316316

317317
if (!inm)
318318
{
319319
dsErrors::CreateModelOnRegion(*myregion, imagnodemodel, OutputStream::OutputType::INFO);
320-
inm = CreateNodeSolution(imagnodemodel, myregion);
320+
inm = CreateNodeSolution(imagnodemodel, myregion, NodeModel::DisplayType::SCALAR);
321321
}
322322

323323
NodeScalarList<DoubleType> realout(nl.size());
@@ -361,13 +361,13 @@ void Equation<DoubleType>::DefaultNoiseUpdate(const std::string &outputname, con
361361
if (!rnm)
362362
{
363363
dsErrors::CreateModelOnRegion(*myregion, realnodemodel, OutputStream::OutputType::INFO);
364-
rnm = CreateNodeSolution(realnodemodel, myregion);
364+
rnm = CreateNodeSolution(realnodemodel, myregion, NodeModel::DisplayType::SCALAR);
365365
}
366366

367367
if (!inm)
368368
{
369369
dsErrors::CreateModelOnRegion(*myregion, imagnodemodel, OutputStream::OutputType::INFO);
370-
inm = CreateNodeSolution(imagnodemodel, myregion);
370+
inm = CreateNodeSolution(imagnodemodel, myregion, NodeModel::DisplayType::SCALAR);
371371
}
372372

373373
NodeScalarList<DoubleType> realout(nl.size());

‎src/GeomModels/NodePosition.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ template <typename DoubleType>
3030
NodePosition<DoubleType>::NodePosition(RegionPtr rp)
3131
: NodeModel("x", rp, NodeModel::DisplayType::SCALAR)
3232
{
33-
yposition = CreateNodeSolution("y", rp, this->GetSelfPtr());
34-
zposition = CreateNodeSolution("z", rp, this->GetSelfPtr());
35-
node_index = CreateNodeSolution("node_index", rp, this->GetSelfPtr());
36-
coordinate_index = CreateNodeSolution("coordinate_index", rp, this->GetSelfPtr());
33+
yposition = CreateNodeSolution("y", rp, NodeModel::DisplayType::SCALAR, this->GetSelfPtr());
34+
zposition = CreateNodeSolution("z", rp, NodeModel::DisplayType::SCALAR, this->GetSelfPtr());
35+
node_index = CreateNodeSolution("node_index", rp, NodeModel::DisplayType::SCALAR, this->GetSelfPtr());
36+
coordinate_index = CreateNodeSolution("coordinate_index", rp, NodeModel::DisplayType::SCALAR, this->GetSelfPtr());
3737
}
3838

3939
template <typename DoubleType>

‎src/GeomModels/SurfaceArea.cc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ SurfaceArea<DoubleType>::SurfaceArea(RegionPtr rp)
3838
{
3939
const size_t dimension = GetRegion().GetDimension();
4040

41-
contact_area = CreateNodeSolution("ContactSurfaceArea", rp, this->GetSelfPtr());
41+
contact_area = CreateNodeSolution("ContactSurfaceArea", rp, NodeModel::DisplayType::SCALAR, this->GetSelfPtr());
4242

4343
if (dimension == 1)
4444
{
@@ -50,14 +50,14 @@ SurfaceArea<DoubleType>::SurfaceArea(RegionPtr rp)
5050
RegisterCallback("unitx");
5151
RegisterCallback("unity");
5252

53-
nsurf_x = CreateNodeSolution("NSurfaceNormal_x", rp, this->GetSelfPtr());
54-
nsurf_y = CreateNodeSolution("NSurfaceNormal_y", rp, this->GetSelfPtr());
53+
nsurf_x = CreateNodeSolution("NSurfaceNormal_x", rp, NodeModel::DisplayType::SCALAR, this->GetSelfPtr());
54+
nsurf_y = CreateNodeSolution("NSurfaceNormal_y", rp, NodeModel::DisplayType::SCALAR, this->GetSelfPtr());
5555
}
5656
else if (dimension == 3)
5757
{
58-
nsurf_x = CreateNodeSolution("NSurfaceNormal_x", rp, this->GetSelfPtr());
59-
nsurf_y = CreateNodeSolution("NSurfaceNormal_y", rp, this->GetSelfPtr());
60-
nsurf_z = CreateNodeSolution("NSurfaceNormal_z", rp, this->GetSelfPtr());
58+
nsurf_x = CreateNodeSolution("NSurfaceNormal_x", rp, NodeModel::DisplayType::SCALAR, this->GetSelfPtr());
59+
nsurf_y = CreateNodeSolution("NSurfaceNormal_y", rp, NodeModel::DisplayType::SCALAR, this->GetSelfPtr());
60+
nsurf_z = CreateNodeSolution("NSurfaceNormal_z", rp, NodeModel::DisplayType::SCALAR, this->GetSelfPtr());
6161
}
6262
RegisterCallback("@@@InterfaceChange");
6363
RegisterCallback("@@@ContactChange");

‎src/GeomModels/VectorGradient.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ VectorGradient<DoubleType>::VectorGradient(RegionPtr rp, const std::string &name
5252
if (dimension == 2)
5353
{
5454
RegisterCallback("unity");
55-
yfield_ = CreateNodeSolution(name + "_grady", rp, this->GetSelfPtr());
55+
yfield_ = CreateNodeSolution(name + "_grady", rp, NodeModel::DisplayType::SCALAR, this->GetSelfPtr());
5656
}
5757
else if (dimension == 3)
5858
{
5959
RegisterCallback("unity");
6060
RegisterCallback("unitz");
61-
yfield_ = CreateNodeSolution(name + "_grady", rp, this->GetSelfPtr());
62-
zfield_ = CreateNodeSolution(name + "_gradz", rp, this->GetSelfPtr());
61+
yfield_ = CreateNodeSolution(name + "_grady", rp, NodeModel::DisplayType::SCALAR, this->GetSelfPtr());
62+
zfield_ = CreateNodeSolution(name + "_gradz", rp, NodeModel::DisplayType::SCALAR, this->GetSelfPtr());
6363
}
6464
}
6565

‎src/Geometry/Region.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1450,11 +1450,11 @@ void Region::BackupSolutions(const std::string &suffix)
14501450
{
14511451
if (std::dynamic_pointer_cast<const NodeSolution<extended_type>>(nm))
14521452
{
1453-
bnm = CreateNodeSolution(bname, this);
1453+
bnm = CreateNodeSolution(bname, this, NodeModel::DisplayType::SCALAR);
14541454
}
14551455
else if (std::dynamic_pointer_cast<const NodeSolution<double>>(nm))
14561456
{
1457-
bnm = CreateNodeSolution(bname, this);
1457+
bnm = CreateNodeSolution(bname, this, NodeModel::DisplayType::SCALAR);
14581458
}
14591459
else
14601460
{

0 commit comments

Comments
 (0)