-
Notifications
You must be signed in to change notification settings - Fork 239
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
TES process #1181
TES process #1181
Conversation
👍 :) |
Jenkins, test this please. |
Jenkins: OGS-6/Linux-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs/1897/ |
Jenkins: OGS-6/Linux-PRs-dynamic failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs-dynamic/121/ |
5b140d6
to
1bf2013
Compare
Jenkins: OGS-6/Linux-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs/1901/ |
Jenkins: OGS-6/Linux-PRs-dynamic failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs-dynamic/125/ |
Jenkins, test this please. |
Jenkins: OGS-6/Win-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Win-PRs/1788/ |
Jenkins: OGS-6/Linux-PRs-dynamic failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs-dynamic/139/ |
Jenkins: OGS-6/Linux-PRs-dynamic failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs-dynamic/140/ |
Jenkins: OGS-6/Linux-PRs-dynamic failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs-dynamic/142/ |
I had to manually abort the Jenkins jobs as they were hanging.. |
@@ -0,0 +1,87 @@ | |||
/** | |||
* \copyright | |||
* Copyright (c) 2012-2015, OpenGeoSys Community (http://www.opengeosys.org) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please update: 2012-2016 ✅
LocalAssemblerTraits<ShapeMatrixPolicyType<void, 0>, 0, 0, 0>>; | ||
|
||
static_assert(OGS_EIGEN_DYNAMIC_SHAPE_MATRICES_FLAG == 1, | ||
"inconsistent use of macros"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Todo code already present in header
EDIT: Just noticed that the code is slightly different from the header (extern template vs. template).
So the compilation works and there is some sort of test now. |
Clang-format already done. I'll squash upon "rebase and merge" label. |
@@ -0,0 +1,11 @@ | |||
if(OGS_EIGEN_DYNAMIC_SHAPE_MATRICES) | |||
configure_file( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure about the config files, but I also formatted them to be w/o tabs in the other PR. ✅
Jenkins: OGS-6/Mac-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Mac-PRs/1835/ |
|
||
double rho_SR_dry = std::numeric_limits<double>::quiet_NaN(); | ||
|
||
const double M_inert = M_N2; // N2 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is the purpose of declaring M_N2 and M_H2O outside this struct, and then assigning them to these new variables?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In the future one could extend this process to other adsorption working pairs, e.g. zeolite/ammonia. I think, we soon should introduce a physical constants namespace like we did in OGS5. In the meantime I'd like to keep these assignments as is.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
Jenkins: OGS-6/Linux-PRs-dynamic failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs-dynamic/179/ |
@chleh I've aborted the linux-prs-dynamic job. It compiled and run, but the |
(Traits::blockDimDim(laplaceCoeffMat, 0, 0, D, D) * | ||
(smDNdx * Eigen::Map<const typename Traits::Vector1Comp>(localX.data(), | ||
N) // grad_p | ||
/ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lines 306--308 can be one line.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's automatically formatted by clang-format and difficult to get it consistently formatted into an 80 char bound simply because the Eigen::Map...(..,N)
subexpression is very long.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for explanation.
Now it runs around 99% of speed of light (when cooled sufficiently) ;) |
* less privacy * multiple process variables
Jenkins: OGS-6/Linux-PRs-dynamic failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs-dynamic/184/ |
Jenkins: OGS-6/Linux-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs/1960/ |
Jenkins: OGS-6/Win-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Win-PRs/1833/ |
Jenkins, test this please. |
@chleh Could you please have a look onto clang-sanitizer build https://svn.ufz.de:8443/view/OGS-6%20Monitor/job/OGS-6/job/Docker/job/clang-sanitizer/218/ . It seems the TES ctest could not write output file... |
OpenGeoSys development has been moved to GitLab. |
Finally, this is the TES process PR.
Follow-up of
* [ ] #1193