ufz / ogs5

OpenGeoSys THM/C simulator version 5
https://www.opengeosys.org/ogs-5
Other
39 stars 97 forks source link

New plastic behavior: shear slip on joint/plane of weakness #155

Closed lurpi closed 4 years ago

lurpi commented 4 years ago

Documentation will follow soon, including analytical validation. Modification to allows calculation of shear failure along a predefined direction Input file .msp looks like this:

$PLASTICITY
MOHR-COULOMB 15.e6 //cohesion 40 //friction angle 0.0 //dilation angle
3.5e16 //tensile strength 0 //curve number for strain hardening of cohesion 0 //curve number for strain hardening of friction angle
$WEAKNESS_PLANE MICRO_STRUCTURE_TENSOR 1 1 1 //no microstruct WEAKPLANE_NORM 0 -0.984807753 0.17364818 // plane of weakness normal 1.45e6 //joint cohesion 28 //joint friction angle 0.0 //joint dilation angle
0.3.e6 //joint tensile strength 0 //curve number for strain hardening of joint cohesion 0 //curve number for strain hardening of joint friction angle

lurpi commented 4 years ago

rf_msp.cpp modification are not correctly noted. My modifications are

wenqing commented 4 years ago

There are compilation errors. See: https://travis-ci.org/ufz/ogs5/jobs/608123326?utm_medium=notification&utm_source=github_status

lurpi commented 4 years ago

clang-format has to be applied to the source code. If you use visual studio 2017/2019, you can download clang-format extension: https://marketplace.visualstudio.com/items?itemName=LLVMExtensions.ClangFormat

I used a standalone build, available at the following url http://llvm.org/builds/ and the .clang-format provided in the ogs5 ufz master branch, but there are still some differences (the header file is completely not recognized?)

wenqing commented 4 years ago

if you can run command line of clang-format, you can try

clang-format -i -sort-includes=false -style=file [path]/rf_msp_new.h clang-format -i -sort-includes=false -style=file [path]/rf_msp_new.cpp

lurpi commented 4 years ago

thanks Wenqing, that solved most of the issues with the header.

wenqing commented 4 years ago

@norihiro-w Do you have any comment? If not, I will merge it.

norihiro-w commented 4 years ago

@wenqing i have no further comments.