Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
pugs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
code
pugs
Commits
75ec66e3
Commit
75ec66e3
authored
2 years ago
by
Axelle Drouard
Browse files
Options
Downloads
Patches
Plain Diff
Change to Dirichlet BC at the nodes and Neumann BC at the faces
parent
df9d6468
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/scheme/ScalarNodalScheme.cpp
+74
-38
74 additions, 38 deletions
src/scheme/ScalarNodalScheme.cpp
with
74 additions
and
38 deletions
src/scheme/ScalarNodalScheme.cpp
+
74
−
38
View file @
75ec66e3
...
@@ -67,18 +67,18 @@ class ScalarNodalSchemeHandler::ScalarNodalScheme : public ScalarNodalSchemeHand
...
@@ -67,18 +67,18 @@ class ScalarNodalSchemeHandler::ScalarNodalScheme : public ScalarNodalSchemeHand
const
Array
<
const
NodeId
>
m_node_list
;
const
Array
<
const
NodeId
>
m_node_list
;
public:
public:
const
Array
<
const
FaceId
>&
faceList
()
const
{
return
m_face_list
;
}
const
Array
<
const
NodeId
>&
const
Array
<
const
NodeId
>&
nodeList
()
const
nodeList
()
const
{
{
return
m_node_list
;
return
m_node_list
;
}
}
const
Array
<
const
FaceId
>&
faceList
()
const
{
return
m_face_list
;
}
const
Array
<
const
double
>&
const
Array
<
const
double
>&
valueList
()
const
valueList
()
const
{
{
...
@@ -90,7 +90,7 @@ class ScalarNodalSchemeHandler::ScalarNodalScheme : public ScalarNodalSchemeHand
...
@@ -90,7 +90,7 @@ class ScalarNodalSchemeHandler::ScalarNodalScheme : public ScalarNodalSchemeHand
const
Array
<
const
double
>&
value_list
)
const
Array
<
const
double
>&
value_list
)
:
m_value_list
{
value_list
},
m_face_list
{
face_list
},
m_node_list
{
node_list
}
:
m_value_list
{
value_list
},
m_face_list
{
face_list
},
m_node_list
{
node_list
}
{
{
Assert
(
m_value_list
.
size
()
==
m_
nod
e_list
.
size
());
Assert
(
m_value_list
.
size
()
==
m_
fac
e_list
.
size
());
}
}
~
NeumannBoundaryCondition
()
=
default
;
~
NeumannBoundaryCondition
()
=
default
;
...
@@ -101,13 +101,13 @@ class ScalarNodalSchemeHandler::ScalarNodalScheme : public ScalarNodalSchemeHand
...
@@ -101,13 +101,13 @@ class ScalarNodalSchemeHandler::ScalarNodalScheme : public ScalarNodalSchemeHand
private:
private:
const
Array
<
const
double
>
m_coef_list
;
const
Array
<
const
double
>
m_coef_list
;
const
Array
<
const
double
>
m_value_list
;
const
Array
<
const
double
>
m_value_list
;
const
Array
<
const
Nod
eId
>
m_
nod
e_list
;
const
Array
<
const
Fac
eId
>
m_
fac
e_list
;
public:
public:
const
Array
<
const
Nod
eId
>&
const
Array
<
const
Fac
eId
>&
nod
eList
()
const
fac
eList
()
const
{
{
return
m_
nod
e_list
;
return
m_
fac
e_list
;
}
}
const
Array
<
const
double
>&
const
Array
<
const
double
>&
...
@@ -123,13 +123,13 @@ class ScalarNodalSchemeHandler::ScalarNodalScheme : public ScalarNodalSchemeHand
...
@@ -123,13 +123,13 @@ class ScalarNodalSchemeHandler::ScalarNodalScheme : public ScalarNodalSchemeHand
}
}
public
:
public
:
FourierBoundaryCondition
(
const
Array
<
const
Nod
eId
>&
nod
e_list
,
FourierBoundaryCondition
(
const
Array
<
const
Fac
eId
>&
fac
e_list
,
const
Array
<
const
double
>&
coef_list
,
const
Array
<
const
double
>&
coef_list
,
const
Array
<
const
double
>&
value_list
)
const
Array
<
const
double
>&
value_list
)
:
m_coef_list
{
coef_list
},
m_value_list
{
value_list
},
m_
nod
e_list
{
nod
e_list
}
:
m_coef_list
{
coef_list
},
m_value_list
{
value_list
},
m_
fac
e_list
{
fac
e_list
}
{
{
Assert
(
m_coef_list
.
size
()
==
m_
nod
e_list
.
size
());
Assert
(
m_coef_list
.
size
()
==
m_
fac
e_list
.
size
());
Assert
(
m_value_list
.
size
()
==
m_
nod
e_list
.
size
());
Assert
(
m_value_list
.
size
()
==
m_
fac
e_list
.
size
());
}
}
~
FourierBoundaryCondition
()
=
default
;
~
FourierBoundaryCondition
()
=
default
;
...
@@ -202,12 +202,13 @@ class ScalarNodalSchemeHandler::ScalarNodalScheme : public ScalarNodalSchemeHand
...
@@ -202,12 +202,13 @@ class ScalarNodalSchemeHandler::ScalarNodalScheme : public ScalarNodalSchemeHand
getMeshNodeBoundary
(
*
mesh
,
neumann_bc_descriptor
.
boundaryDescriptor
());
getMeshNodeBoundary
(
*
mesh
,
neumann_bc_descriptor
.
boundaryDescriptor
());
const
FunctionSymbolId
g_id
=
neumann_bc_descriptor
.
rhsSymbolId
();
const
FunctionSymbolId
g_id
=
neumann_bc_descriptor
.
rhsSymbolId
();
//
MeshDataType& mesh_data = MeshDataManager::instance().getMeshData(*mesh);
MeshDataType
&
mesh_data
=
MeshDataManager
::
instance
().
getMeshData
(
*
mesh
);
Array
<
const
double
>
value_list
=
Array
<
const
double
>
value_list
=
InterpolateItemValue
<
double
(
TinyVector
<
Dimension
>
)
>::
template
interpolate
<
ItemType
::
node
>(
g_id
,
mesh
->
xr
(),
InterpolateItemValue
<
double
(
TinyVector
<
Dimension
>
)
>::
template
interpolate
<
ItemType
::
face
>(
g_id
,
mesh_node_boundary
mesh_data
.
xl
(),
.
nodeList
());
mesh_face_boundary
.
faceList
());
boundary_condition_list
.
push_back
(
boundary_condition_list
.
push_back
(
NeumannBoundaryCondition
{
mesh_face_boundary
.
faceList
(),
mesh_node_boundary
.
nodeList
(),
value_list
});
NeumannBoundaryCondition
{
mesh_face_boundary
.
faceList
(),
mesh_node_boundary
.
nodeList
(),
value_list
});
...
@@ -273,12 +274,13 @@ class ScalarNodalSchemeHandler::ScalarNodalScheme : public ScalarNodalSchemeHand
...
@@ -273,12 +274,13 @@ class ScalarNodalSchemeHandler::ScalarNodalScheme : public ScalarNodalSchemeHand
getMeshNodeBoundary
(
*
mesh
,
neumann_bc_prev_descriptor
.
boundaryDescriptor
());
getMeshNodeBoundary
(
*
mesh
,
neumann_bc_prev_descriptor
.
boundaryDescriptor
());
const
FunctionSymbolId
g_id
=
neumann_bc_prev_descriptor
.
rhsSymbolId
();
const
FunctionSymbolId
g_id
=
neumann_bc_prev_descriptor
.
rhsSymbolId
();
//
MeshDataType& mesh_data = MeshDataManager::instance().getMeshData(*mesh);
MeshDataType
&
mesh_data
=
MeshDataManager
::
instance
().
getMeshData
(
*
mesh
);
Array
<
const
double
>
value_list
=
Array
<
const
double
>
value_list
=
InterpolateItemValue
<
double
(
TinyVector
<
Dimension
>
)
>::
template
interpolate
<
ItemType
::
node
>(
g_id
,
mesh
->
xr
(),
InterpolateItemValue
<
double
(
TinyVector
<
Dimension
>
)
>::
template
interpolate
<
ItemType
::
face
>(
g_id
,
mesh_node_boundary
mesh_data
.
xl
(),
.
nodeList
());
mesh_face_boundary
.
faceList
());
boundary_prev_condition_list
.
push_back
(
boundary_prev_condition_list
.
push_back
(
NeumannBoundaryCondition
{
mesh_face_boundary
.
faceList
(),
mesh_node_boundary
.
nodeList
(),
value_list
});
NeumannBoundaryCondition
{
mesh_face_boundary
.
faceList
(),
mesh_node_boundary
.
nodeList
(),
value_list
});
...
@@ -312,7 +314,7 @@ class ScalarNodalSchemeHandler::ScalarNodalScheme : public ScalarNodalSchemeHand
...
@@ -312,7 +314,7 @@ class ScalarNodalSchemeHandler::ScalarNodalScheme : public ScalarNodalSchemeHand
const
auto
is_boundary_face
=
mesh
->
connectivity
().
isBoundaryFace
();
const
auto
is_boundary_face
=
mesh
->
connectivity
().
isBoundaryFace
();
const
auto
&
node_to_face_matrix
=
mesh
->
connectivity
().
nodeToFaceMatrix
();
const
auto
&
node_to_face_matrix
=
mesh
->
connectivity
().
nodeToFaceMatrix
();
//
const auto& face_to_node_matrix = mesh->connectivity().faceToNodeMatrix();
const
auto
&
face_to_node_matrix
=
mesh
->
connectivity
().
faceToNodeMatrix
();
const
auto
&
cell_to_node_matrix
=
mesh
->
connectivity
().
cellToNodeMatrix
();
const
auto
&
cell_to_node_matrix
=
mesh
->
connectivity
().
cellToNodeMatrix
();
const
auto
&
node_local_numbers_in_their_cells
=
mesh
->
connectivity
().
nodeLocalNumbersInTheirCells
();
const
auto
&
node_local_numbers_in_their_cells
=
mesh
->
connectivity
().
nodeLocalNumbersInTheirCells
();
const
CellValue
<
const
double
>
Vj
=
mesh_data
.
Vj
();
const
CellValue
<
const
double
>
Vj
=
mesh_data
.
Vj
();
...
@@ -327,12 +329,16 @@ class ScalarNodalSchemeHandler::ScalarNodalScheme : public ScalarNodalSchemeHand
...
@@ -327,12 +329,16 @@ class ScalarNodalSchemeHandler::ScalarNodalScheme : public ScalarNodalSchemeHand
[
&
](
auto
&&
bc
)
{
[
&
](
auto
&&
bc
)
{
using
T
=
std
::
decay_t
<
decltype
(
bc
)
>
;
using
T
=
std
::
decay_t
<
decltype
(
bc
)
>
;
if
constexpr
(
std
::
is_same_v
<
T
,
NeumannBoundaryCondition
>
)
{
if
constexpr
(
std
::
is_same_v
<
T
,
NeumannBoundaryCondition
>
)
{
const
auto
&
node_list
=
bc
.
nodeList
();
const
auto
&
face_list
=
bc
.
faceList
();
for
(
size_t
i_node
=
0
;
i_node
<
node_list
.
size
();
++
i_node
)
{
for
(
size_t
i_face
=
0
;
i_face
<
face_list
.
size
();
++
i_face
)
{
const
NodeId
node_id
=
node_list
[
i_node
];
const
FaceId
face_id
=
face_list
[
i_face
];
const
auto
&
face_nodes
=
face_to_node_matrix
[
face_id
];
for
(
size_t
i_node
=
0
;
i_node
<
face_nodes
.
size
();
++
i_node
)
{
const
NodeId
node_id
=
face_nodes
[
i_node
];
compute_node_is_neumann
[
node_id
]
=
true
;
compute_node_is_neumann
[
node_id
]
=
true
;
}
}
}
}
}
},
},
boundary_condition
);
boundary_condition
);
}
}
...
@@ -471,12 +477,25 @@ class ScalarNodalSchemeHandler::ScalarNodalScheme : public ScalarNodalSchemeHand
...
@@ -471,12 +477,25 @@ class ScalarNodalSchemeHandler::ScalarNodalScheme : public ScalarNodalSchemeHand
[
&
](
auto
&&
bc
)
{
[
&
](
auto
&&
bc
)
{
using
T
=
std
::
decay_t
<
decltype
(
bc
)
>
;
using
T
=
std
::
decay_t
<
decltype
(
bc
)
>
;
if
constexpr
(
std
::
is_same_v
<
T
,
NeumannBoundaryCondition
>
)
{
if
constexpr
(
std
::
is_same_v
<
T
,
NeumannBoundaryCondition
>
)
{
const
auto
&
nod
e_list
=
bc
.
nod
eList
();
const
auto
&
fac
e_list
=
bc
.
fac
eList
();
const
auto
&
value_list
=
bc
.
valueList
();
const
auto
&
value_list
=
bc
.
valueList
();
for
(
size_t
i_node
=
0
;
i_node
<
node_list
.
size
();
++
i_node
)
{
for
(
size_t
i_face
=
0
;
i_face
<
face_list
.
size
();
++
i_face
)
{
const
NodeId
node_id
=
node_list
[
i_node
];
const
FaceId
face_id
=
face_list
[
i_face
];
compute_node_boundary_values
[
node_id
]
=
value_list
[
i_node
];
const
auto
&
face_nodes
=
face_to_node_matrix
[
face_id
];
for
(
size_t
i_node
=
0
;
i_node
<
face_nodes
.
size
();
++
i_node
)
{
const
NodeId
node_id
=
face_nodes
[
i_node
];
if
(
not
node_is_dirichlet
[
node_id
])
{
if
(
node_is_angle
[
node_id
])
{
compute_node_boundary_values
[
node_id
]
+=
value_list
[
i_face
]
*
std
::
abs
(
dot
(
nl
[
face_id
],
exterior_normal
[
node_id
]));
}
else
{
compute_node_boundary_values
[
node_id
]
+=
value_list
[
i_face
]
*
mes_l
[
face_id
];
sum_mes_l
[
node_id
]
+=
mes_l
[
face_id
];
}
}
}
}
}
}
else
if
constexpr
(
std
::
is_same_v
<
T
,
DirichletBoundaryCondition
>
)
{
}
else
if
constexpr
(
std
::
is_same_v
<
T
,
DirichletBoundaryCondition
>
)
{
...
@@ -492,7 +511,12 @@ class ScalarNodalSchemeHandler::ScalarNodalScheme : public ScalarNodalSchemeHand
...
@@ -492,7 +511,12 @@ class ScalarNodalSchemeHandler::ScalarNodalScheme : public ScalarNodalSchemeHand
},
},
boundary_condition
);
boundary_condition
);
}
}
for
(
NodeId
node_id
=
0
;
node_id
<
mesh
->
numberOfNodes
();
++
node_id
)
{
if
((
not
node_is_dirichlet
[
node_id
])
&&
(
node_is_neumann
[
node_id
])
and
not
node_is_angle
[
node_id
])
{
compute_node_boundary_values
[
node_id
]
/=
sum_mes_l
[
node_id
];
}
// std::cout << node_id << " " << compute_node_boundary_values[node_id] << "\n";
// std::cout << node_id << " " << compute_node_boundary_values[node_id] << "\n";
}
return
compute_node_boundary_values
;
return
compute_node_boundary_values
;
}();
}();
...
@@ -506,13 +530,20 @@ class ScalarNodalSchemeHandler::ScalarNodalScheme : public ScalarNodalSchemeHand
...
@@ -506,13 +530,20 @@ class ScalarNodalSchemeHandler::ScalarNodalScheme : public ScalarNodalSchemeHand
[
&
](
auto
&&
bc
)
{
[
&
](
auto
&&
bc
)
{
using
T
=
std
::
decay_t
<
decltype
(
bc
)
>
;
using
T
=
std
::
decay_t
<
decltype
(
bc
)
>
;
if
constexpr
(
std
::
is_same_v
<
T
,
NeumannBoundaryCondition
>
)
{
if
constexpr
(
std
::
is_same_v
<
T
,
NeumannBoundaryCondition
>
)
{
const
auto
&
nod
e_list
=
bc
.
nod
eList
();
const
auto
&
fac
e_list
=
bc
.
fac
eList
();
const
auto
&
value_list
=
bc
.
valueList
();
const
auto
&
value_list
=
bc
.
valueList
();
for
(
size_t
i_node
=
0
;
i_node
<
node_list
.
size
();
++
i_node
)
{
for
(
size_t
i_face
=
0
;
i_face
<
face_list
.
size
();
++
i_face
)
{
const
NodeId
node_id
=
node_list
[
i_node
];
const
FaceId
face_id
=
face_list
[
i_face
];
const
auto
&
face_nodes
=
face_to_node_matrix
[
face_id
];
compute_node_boundary_values
[
node_id
]
=
value_list
[
i_node
];
for
(
size_t
i_node
=
0
;
i_node
<
face_nodes
.
size
();
++
i_node
)
{
const
NodeId
node_id
=
face_nodes
[
i_node
];
if
(
not
node_is_dirichlet
[
node_id
])
{
compute_node_boundary_values
[
node_id
]
+=
value_list
[
i_face
]
*
mes_l
[
face_id
];
sum_mes_l
[
node_id
]
+=
mes_l
[
face_id
];
}
}
}
}
}
else
if
constexpr
(
std
::
is_same_v
<
T
,
DirichletBoundaryCondition
>
)
{
}
else
if
constexpr
(
std
::
is_same_v
<
T
,
DirichletBoundaryCondition
>
)
{
const
auto
&
node_list
=
bc
.
nodeList
();
const
auto
&
node_list
=
bc
.
nodeList
();
...
@@ -527,6 +558,11 @@ class ScalarNodalSchemeHandler::ScalarNodalScheme : public ScalarNodalSchemeHand
...
@@ -527,6 +558,11 @@ class ScalarNodalSchemeHandler::ScalarNodalScheme : public ScalarNodalSchemeHand
},
},
boundary_condition
);
boundary_condition
);
}
}
for
(
NodeId
node_id
=
0
;
node_id
<
mesh
->
numberOfNodes
();
++
node_id
)
{
if
((
not
node_is_dirichlet
[
node_id
])
&&
(
node_is_neumann
[
node_id
]))
{
compute_node_boundary_values
[
node_id
]
/=
sum_mes_l
[
node_id
];
}
}
return
compute_node_boundary_values
;
return
compute_node_boundary_values
;
}();
}();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment