Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

H2 mpl #2644

Merged
merged 13 commits into from Sep 30, 2019
Merged

H2 mpl #2644

merged 13 commits into from Sep 30, 2019

Conversation

@Scinopode
Copy link
Contributor

Scinopode commented Sep 3, 2019

This replaces all former methods for assigning material properties with the more general MPL methods. Tests are updated accordingly.

  1. Feature description was added to the changelog
  2. Tests covering your feature were added?
  3. Any new feature or behavior change was documented?
@Scinopode Scinopode force-pushed the Scinopode:h2_mpl branch 12 times, most recently from 8f1e85e to bb33fc6 Sep 3, 2019
@Scinopode Scinopode force-pushed the Scinopode:h2_mpl branch 2 times, most recently from f0a3224 to e4e6bd2 Sep 18, 2019
@Scinopode Scinopode force-pushed the Scinopode:h2_mpl branch 4 times, most recently from 5c2d772 to dd0332e Sep 19, 2019
@endJunction endJunction force-pushed the Scinopode:h2_mpl branch from dd0332e to bf82cd3 Sep 24, 2019
@endJunction endJunction marked this pull request as ready for review Sep 24, 2019
Copy link
Member

renchao-lu left a comment

Looks good. Please consider my comments.

GlobalDimMatrixType permeability = GlobalDimMatrixType::Zero(
_element.getDimension(), _element.getDimension());

permeability.diagonal().setConstant(perm);

This comment has been minimized.

Copy link
@renchao-lu

renchao-lu Sep 25, 2019

Member

i think we could call the function MaterialPropertyLib::formEigenTensor here
auto const& K = MaterialPropertyLib::formEigenTensor<GlobalDim>( medium.property(MaterialPropertyLib::PropertyType::permeability).value(vars, pos, t));

ds_L_dp_cap =
auto s_L =
medium->property(MaterialPropertyLib::PropertyType::saturation)
.template value<double>(variable_array, pos, time);

This comment has been minimized.

Copy link
@renchao-lu

renchao-lu Sep 25, 2019

Member

It would be better to change time with t for code consistency.

@endJunction endJunction force-pushed the Scinopode:h2_mpl branch from bf82cd3 to 052e4b4 Sep 27, 2019
Scinopode added 3 commits Aug 15, 2019
An object of the generalized material property library is passed to the
create-methods of the TwoPhaseFlowWithPP-process.
The local assembler now uses the generalized MPL-versions of material
property methods, rather than those designed specifically for this
process.
Scinopode and others added 10 commits Aug 27, 2019
There have been two seperate runs of the same test setup where
different results have been compared. The redundant test run is removed.
The specialized material property methods for the TwoPhaseFlowWithPP-
process are removed and replaced entirely by the generalized MPL.
Use short name for permeability, i.e. K.
Fix wrong comment.
Move media and phases out of integration loop.
Add aliases for integration weight, dNdx, mass operator.
Set position to current integration point.
Remove Sw and temperature local variables.
@endJunction endJunction force-pushed the Scinopode:h2_mpl branch from 052e4b4 to bc3cc0f Sep 30, 2019
Copy link
Member

TomFischer left a comment

Looks good.

@endJunction endJunction merged commit da978f3 into ufz:master Sep 30, 2019
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/jenkins/pr-merge This commit cannot be built
Details
deploy/netlify Deploy preview ready!
Details
ufz.ogs #20190930.2 succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.