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

TES process #1181

Merged
merged 6 commits into from
May 31, 2016
Merged

TES process #1181

merged 6 commits into from
May 31, 2016

Conversation

chleh
Copy link
Collaborator

@chleh chleh commented May 1, 2016

@hydromarc
Copy link

👍 :)

@chleh
Copy link
Collaborator Author

chleh commented May 24, 2016

Jenkins, test this please.

@ogsbot
Copy link
Member

ogsbot commented May 24, 2016

Jenkins: OGS-6/Linux-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs/1897/

@ogsbot
Copy link
Member

ogsbot commented May 24, 2016

Jenkins: OGS-6/Linux-PRs-dynamic failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs-dynamic/121/

@chleh chleh force-pushed the tes-for-pr branch 2 times, most recently from 5b140d6 to 1bf2013 Compare May 24, 2016 15:56
@ogsbot
Copy link
Member

ogsbot commented May 24, 2016

Jenkins: OGS-6/Linux-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs/1901/

@ogsbot
Copy link
Member

ogsbot commented May 24, 2016

Jenkins: OGS-6/Linux-PRs-dynamic failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs-dynamic/125/

@chleh
Copy link
Collaborator Author

chleh commented May 25, 2016

Jenkins, test this please.

@ogsbot
Copy link
Member

ogsbot commented May 25, 2016

Jenkins: OGS-6/Win-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Win-PRs/1788/

@ogsbot
Copy link
Member

ogsbot commented May 25, 2016

Jenkins: OGS-6/Linux-PRs-dynamic failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs-dynamic/139/

@ogsbot
Copy link
Member

ogsbot commented May 25, 2016

Jenkins: OGS-6/Linux-PRs-dynamic failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs-dynamic/140/

@ogsbot
Copy link
Member

ogsbot commented May 25, 2016

Jenkins: OGS-6/Linux-PRs-dynamic failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs-dynamic/142/

@bilke
Copy link
Member

bilke commented May 25, 2016

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)
Copy link
Member

@TomFischer TomFischer May 26, 2016

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");
Copy link
Collaborator Author

@chleh chleh May 27, 2016

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).

@endJunction
Copy link
Member

So the compilation works and there is some sort of test now.
Would you please squash the commits for newly added files and clang-format them to achieve some sort of alignment/formatting consistency? Then I would say it can be merged.

@chleh
Copy link
Collaborator Author

chleh commented May 30, 2016

Clang-format already done. I'll squash upon "rebase and merge" label.

@@ -0,0 +1,11 @@
if(OGS_EIGEN_DYNAMIC_SHAPE_MATRICES)
configure_file(
Copy link
Member

@endJunction endJunction May 30, 2016

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. ✅

@ogsbot
Copy link
Member

ogsbot commented May 30, 2016

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
Copy link
Member

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?

Copy link
Collaborator Author

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.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@ogsbot
Copy link
Member

ogsbot commented May 30, 2016

Jenkins: OGS-6/Linux-PRs-dynamic failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs-dynamic/179/

@endJunction
Copy link
Member

@chleh I've aborted the linux-prs-dynamic job. It compiled and run, but the 1D tes-1D-1000elem-zeolite-discharge.prj took now around 150min runtime, which is too long for the not-LARGE ctests...

(Traits::blockDimDim(laplaceCoeffMat, 0, 0, D, D) *
(smDNdx * Eigen::Map<const typename Traits::Vector1Comp>(localX.data(),
N) // grad_p
/
Copy link
Member

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.

Copy link
Member

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.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for explanation.

@endJunction
Copy link
Member

Now it runs around 99% of speed of light (when cooled sufficiently) ;)

@ogsbot
Copy link
Member

ogsbot commented May 30, 2016

Jenkins: OGS-6/Linux-PRs-dynamic failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs-dynamic/184/

@ogsbot
Copy link
Member

ogsbot commented May 30, 2016

Jenkins: OGS-6/Linux-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs/1960/

@ogsbot
Copy link
Member

ogsbot commented May 30, 2016

Jenkins: OGS-6/Win-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Win-PRs/1833/

@chleh
Copy link
Collaborator Author

chleh commented May 31, 2016

Jenkins, test this please.

@chleh chleh merged commit 87307b8 into ufz:master May 31, 2016
@chleh chleh deleted the tes-for-pr branch May 31, 2016 07:54
@endJunction
Copy link
Member

@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...

@ogsbot
Copy link
Member

ogsbot commented Jun 19, 2020

OpenGeoSys development has been moved to GitLab.

See this pull request on GitLab.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants