Make local source term definition possible #2261
Conversation
| @@ -34,8 +34,8 @@ namespace ProcessLib | |||
| { | |||
| std::unique_ptr<SourceTerm> createNodalSourceTerm( | |||
| BaseLib::ConfigTree const& config, MeshLib::Mesh const& st_mesh, | |||
| const NumLib::LocalToGlobalIndexMap& dof_table, std::size_t mesh_id, | |||
| const int variable_id, const int component_id, | |||
| std::unique_ptr<NumLib::LocalToGlobalIndexMap>&& dof_table, | |||
There was a problem hiding this comment.
[discussion] I know, we have it in several other places done the same way, but I think that && is not needed for a unique_ptr because it is move only anyway. Passing it by value is sufficient.
There was a problem hiding this comment.
Yes, this works. I changed it in nodal, volumetric and the Python source term implementations and rebased.
There was a problem hiding this comment.
IMHO the rule "Add && to a type if you don't allow copies." is simpler "Add && to a type if you don't allow copies. But if the type is move-only, you can skip the &&."
TomFischer
force-pushed
the
MakeLocalSourceTermDefinitionPossible
branch
from
6ae8617
to
1d17b54
Compare
| *config.component_id); | ||
| } | ||
|
|
||
| if (type == "Python") | ||
| { | ||
| #ifdef OGS_USE_PYTHON | ||
| // Create local DOF table from the source term mesh subset for the | ||
| // given variable and component id. |
There was a problem hiding this comment.
In Python probably for all vars/comps.
Probably, these comments can all be removed. They just describe the already very descriptive line of code that follows them. ✅
| @@ -2,6 +2,7 @@ | |||
| <OpenGeoSysProject> | |||
| <meshes> | |||
| <mesh>square_1x1_quad_1e2.vtu</mesh> | |||
| <mesh>square_1x1_quad_1e2_volumetric_source_term.vtu</mesh> | |||
There was a problem hiding this comment.
This is still the entire mesh, isn't it? Is it special in any way? E.g., does it have an element property like original_element_ids? Btw. I didn't find code changes related to mapping d.o.f.s on the source term mesh to d.o.f.s on the whole domain. Does the current code work if the source term is applied to parts of the mesh only (in particular if the ST subset does not start from element ID 0)?
There was a problem hiding this comment.
Created test for strict subset.
| { | ||
| OGS_FATAL( | ||
| "Variable id or component id too high. Actual values: (%d, " | ||
| "%d), maximum values: (%d, %d).", |
There was a problem hiding this comment.
Btw.: the "maximum" is off by one. What is printed is in C style one past maximum. This is confusing. It's wrong everywhere, and I think I made it wrong for the first time. 😄
There was a problem hiding this comment.
In dof_table_bulk.getNumberOfVariables() the size - 1 is returned, so the message for the number of variables should be consistent. dof_table_bulk.getNumberOfVariableComponents(variable_id) returns a difference where the off by one should be canceled out.
There was a problem hiding this comment.
OK, maybe it's not easy to see from the source code. A short test (HT process, wrong Dirichlet BC):
error: Variable id or component id too high. Actual values: (0, 1), maximum values: (2, 1). at DirichletBoundaryCondition.h, line 46
Confusing, isn't it? As I said, it's not your fault...
TomFischer
force-pushed
the
MakeLocalSourceTermDefinitionPossible
branch
2 times, most recently
from
5861210
to
c8f23c1
Compare
| DIFF_DATA | ||
| line_1_line_1e2_pcs_0_ts_500_t_39062500.000000_reference.vtu line_1_line_1e2_pcs_0_ts_500_t_39062500.000000.vtu temperature temperature 1e-11 0.0 | ||
| REQUIREMENTS NOT OGS_USE_MPI | ||
| ) |
There was a problem hiding this comment.
Could you please add a test for PETSc as
# test the source term on a subdomain with the PETSc embedded executable file
AddTest(
NAME 1D_HeatConduction_dirichlet_SourceTerm_PETSc
PATH Parabolic/T/1D_dirichlet_source-term
EXECUTABLE_ARGS line_1_line_1e2_source_term.prj
WRAPPER mpirun
WRAPPER_ARGS -np 1
TESTER vtkdiff
REQUIREMENTS OGS_USE_MPI
DIFF_DATA
line_1_line_1e2_pcs_0_ts_500_t_39062500.000000_reference.vtu line_1_line_1e2_pcs_0_ts_500_t_39062500.000000_0.vtu temperature temperature 1e-11 0.0
)
There was a problem hiding this comment.
Test for mpi is added.
Use the specified patch mesh instead of the entire bulk mesh to define the source term.
TomFischer
force-pushed
the
MakeLocalSourceTermDefinitionPossible
branch
from
c8f23c1
to
49fd5b8
Compare
|
Created issue https://github.com/ufz/ogs/issues/2266 for 'TODO for (%d, %d)'. |
|
OpenGeoSys development has been moved to GitLab. |
This PR restricts the definition of the source term to a sub-domain of the entire simulation domain.