Added nonequilibrium_stress to ThermoMechanics process #2544
Conversation
|
Hi, I think there should be no conflict, but the check results seem not look so good. |
| @@ -76,6 +78,7 @@ struct ThermoMechanicsProcessData | |||
| ParameterLib::Parameter<double> const& reference_solid_density; | |||
| ParameterLib::Parameter<double> const& linear_thermal_expansion_coefficient; | |||
| ParameterLib::Parameter<double> const& specific_heat_capacity; | |||
| ParameterLib::Parameter<double> const* const nonequilibrium_stress; | |||
There was a problem hiding this comment.
Move this line one lower, after the thermal_conductivity. This causes warnings otherwise: https://jenkins.opengeosys.org/job/ufz/job/ogs/job/PR-2544/3/gcc/
|
@endJunction Last push fix #2412 , please check the codes. |
|
@zhangning737 I've opened another PR (#2549) for the vtk fix. Please don't mix up topics in the PRs. Also it would be better to create so-called topic branches for the PR's instead of working on your master branch. |
|
On this branch I have pushed more changes including docu. Your original code is formatted and squashed into single commit. |
| : material_ids(material_ids_), | ||
| solid_materials{std::move(solid_materials_)}, | ||
| reference_solid_density(reference_solid_density_), | ||
| linear_thermal_expansion_coefficient( | ||
| linear_thermal_expansion_coefficient_), | ||
| specific_heat_capacity(specific_heat_capacity_), | ||
| thermal_conductivity(thermal_conductivity_), | ||
| nonequilibrium_stress(nonequilibrium_stress_), |
There was a problem hiding this comment.
Please move nonequilibrium_stress(nonequilibrium_stress_) after specific_body_force(specific_body_force_). The appearance order of members in the initializer list must be the same as that of members in the class declaration.
There was a problem hiding this comment.
ok, has been changed...
|
ProcessLib/ThermoMechanics/ThermoMechanicsProcessData.h:53: trailing whitespace (blank space after the end of the line). |
|
@zhangning737 Please restore the original branch 2d7e717 https://github.com/endJunction/ogs/tree/ZN_TmNeqStress, then rebase to the current github.com/ufz/ogs/master. I've fixed already the errors Wenqing is pointing out and several more. Don't throw them away. |
|
@endJunction I think I did something not right, I force-pushed 2d7e717 to 2d6d00a. The problem is before my force-push, I didn't fetch 2d7e717. Apologize!!! |
|
@zhangning737 I just sent you an email about how to restore to Dima's branch. |
|
@wenqing thanks for your explanation, updated. |
endJunction
force-pushed
the
master
branch
2 times, most recently
from
ceb4c10 to
1fcbbd5
Compare
| <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient> | ||
| <specific_heat_capacity>cs</specific_heat_capacity> | ||
| <thermal_conductivity>lambda</thermal_conductivity> | ||
| <specific_body_force>0 -9.81</specific_body_force> |
There was a problem hiding this comment.
Merged but these values have to be set as 0.0 0.0
| <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient> | ||
| <specific_heat_capacity>cs</specific_heat_capacity> | ||
| <thermal_conductivity>lambda</thermal_conductivity> | ||
| <specific_body_force>0 -9.81</specific_body_force> |
There was a problem hiding this comment.
Merged but these values have to be set as 0.0 0.0
There was a problem hiding this comment.
I don't think so. It's only in the non-equilibrium restart, where the stresses due to gravity are included in the initial non-equilibrium stress. But in the forward tests the gravity is present.
Compare with the SD tests: https://github.com/ufz/ogs/blob/master/Tests/Data/Mechanics/InitialStates/into_initial_state.prj#L21
|
OpenGeoSys development has been moved to GitLab. |
I did't create a new test prj file, but it has been tested with old salt cavern model.
Please check the quality of code, also only several lines, thinks.