Add the shape function order to ProcessVariable class #1503
8000
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 10 commits
November 1, 2016 07:01
…ry variables use the same order
…aceFlux and TestExtrapolation
0f5551b to
c1d1d43
Compare
endJunction
approved these changes
Nov 1, 2016
|
I'll add the order=1 in the project files. |
endJunction
reviewed
Nov 1, 2016
| @@ -34,6 +34,9 @@ ProcessVariable::ProcessVariable( | |||
| _bc_builder(new BoundaryConditionBuilder()) | |||
| { | |||
| DBUG("Constructing process variable %s", _name.c_str()); | |||
| //! \ogs_file_param{prj__process_variables__process_variable__order} | |||
| auto opt_shapefunction_order = config.getConfigParameterOptional<int>("order"); | |||
| _shapefunction_order = (opt_shapefunction_order ? opt_shapefunction_order.get() : 1); | |||
There was a problem hiding this comment.
When the order is given in the prj files, then this default choice can be removed and the tag becomes non-optional. ✅
wenqing
approved these changes
Nov 1, 2016
| @@ -34,6 +34,9 @@ ProcessVariable::ProcessVariable( | |||
| _bc_builder(new BoundaryConditionBuilder()) | |||
| { | |||
| DBUG("Constructing process variable %s", _name.c_str()); | |||
| //! \ogs_file_param{prj__process_variables__process_variable__order} | |||
| auto opt_shapefunction_order = config.getConfigParameterOptional<int>("order"); | |||
| _shapefunction_order = (opt_shapefunction_order ? opt_shapefunction_order.get() : 1); | |||
There was a problem hiding this comment.
Need an assert somewhere such that this input order is not larger than the order of element of the mesh.
There was a problem hiding this comment.
it's not possible because Mesh/Element class doesn't know which order it is. In current implementation, LocalDataInitializer is checking if a proper element is found for the given shape function order.
e6bf53a to
a6312df
Compare
Merged
|
OpenGeoSys development has been moved to GitLab. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Until now, the shape function order is decided by the order of the given mesh. This PR enables users to specify the shape function order in a config file, which can be different from the order of the given mesh, though appropriate mesh (e.g. 2nd order mesh for use of linear or quadratic order shape functions) should be provided.
This PR is extracted & modified after Dima's HM branch and is needed for implementing HM and "HM with LIE" processes, which use linear order for pressure and quadratic order for displacements. Major changes are
Remarks
<order>1</order>