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

Replaced the material parameters of ThermoHydroMechanics with MPL #2614

Merged
merged 5 commits into from Aug 17, 2019

Conversation

@wenqing
Copy link
Member

wenqing commented Aug 16, 2019

as titled.

  1. Feature description was added to the changelog
  2. Tests covering your feature were added? With the existing THM bechmarks.
  3. Any new feature or behavior change was documented? Not needed.
@wenqing wenqing force-pushed the wenqing:improveTHM branch from 42373eb to 9e77516 Aug 16, 2019
Copy link
Member

endJunction left a comment

Looks good.


//
// temperature equation, pressure part
//
KTp.noalias() += K_over_mu * rho_f * C_f * N_T.transpose() *
(dNdx_T * T).transpose() * dNdx_T * w;
KTp.noalias() += fluid_density * c_f * N_T.transpose() *

This comment has been minimized.

Copy link
@TomFischer

TomFischer Aug 16, 2019

Member

Just out of curiosity: Why did you reorder the calculation?

This comment has been minimized.

Copy link
@wenqing

wenqing Aug 16, 2019

Author Member

Because K_over_mu is changed to matrix now.

Copy link
Member

TomFischer left a comment

Looks good! Did you use a script for the project file changes?

auto const& b = _process_data.specific_body_force;
auto const& identity2 = MathLib::KelvinVector::Invariants<
MathLib::KelvinVector::KelvinVectorDimensions<
DisplacementDim>::value>::identity2;

//TODO: Change dT to time step wise increment

This comment has been minimized.

Copy link
@endJunction

endJunction Aug 16, 2019

Member
Suggested change
//TODO: Change dT to time step wise increment
// TODO (wenqing): Change dT to time step wise increment

This comment has been minimized.

Copy link
@wenqing

wenqing Aug 16, 2019

Author Member

Added.

@wenqing

This comment has been minimized.

Copy link
Member Author

wenqing commented Aug 16, 2019

@TomFischer I did the changes manually.

@wenqing wenqing force-pushed the wenqing:improveTHM branch from a2f3c88 to 93dd643 Aug 16, 2019
@TomFischer TomFischer merged commit 78071cd into ufz:master Aug 17, 2019
3 checks passed
3 checks passed
continuous-integration/jenkins/pr-merge This commit looks good
Details
deploy/netlify Deploy preview ready!
Details
ufz.ogs #20190816.10 succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.