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

MFront 3.2.1 #2631

Merged
merged 29 commits into from Aug 29, 2019
Merged

MFront 3.2.1 #2631

merged 29 commits into from Aug 29, 2019

Conversation

@endJunction
Copy link
Member

endJunction commented Aug 26, 2019

Update MFront/MGIS infrastructure to tfel-3.2.1.

Mainly

  • including the MGIS as a submodule,
  • provide tfel conan package (by Lars),
  • collect all .mfront files in single place (instead of Tests/Data)
  • ifdefed MFront related parts with OGS_USE_MFRONT guard.
  1. Feature description was added to the changelog
  2. Tests covering your feature were added?
  3. Any new feature or behavior change was documented?
@bilke

This comment has been minimized.

Copy link
Member

bilke commented Aug 27, 2019

@endJunction I tested all kinds of RPATH stuff without success. I added the lib-path to the LD_LIBRARY_PATH and this fixes it for tests. Feel free to drop e1799ea and 9761717.

@endJunction endJunction force-pushed the endJunction:MFront-3.2.1 branch from e1799ea to 32b3382 Aug 27, 2019
@endJunction endJunction force-pushed the endJunction:MFront-3.2.1 branch from bf3cd49 to 1169a34 Aug 28, 2019
@bilke

This comment has been minimized.

Copy link
Member

bilke commented Aug 28, 2019

@endJunction Wait a second. I will force push and change the last commit...

@bilke bilke force-pushed the endJunction:MFront-3.2.1 branch from 1169a34 to c2cf396 Aug 28, 2019
@bilke

This comment has been minimized.

Copy link
Member

bilke commented Aug 28, 2019

@endJunction Done. Merge when green!

@endJunction endJunction force-pushed the endJunction:MFront-3.2.1 branch 2 times, most recently from 3bef1a7 to 07759d9 Aug 28, 2019
@bilke bilke force-pushed the endJunction:MFront-3.2.1 branch from 9e7afcd to 4be5a1a Aug 28, 2019
@bilke

This comment has been minimized.

Copy link
Member

bilke commented Aug 28, 2019

@endJunction Should be all green now.

endJunction and others added 9 commits Jul 9, 2019
The parameters seem to be strings only separated by
different types.
Dropped old libBehaviour.so.
Fixes testrunner error when OgsMFrontBehaviour.so could not be
loaded at runtime.
The convergence is not being achieved nowhere close
to the original setting of 1e-14, not sure whether it
is related to the MFront model or not.
The ctest result *probably* suffers from extrapolation
errors, but hits the overall values.
mgis tests are now run along with our benchmarks.
@endJunction endJunction force-pushed the endJunction:MFront-3.2.1 branch from 4be5a1a to 4ecc64b Aug 28, 2019
@endJunction endJunction force-pushed the endJunction:MFront-3.2.1 branch from 4ecc64b to c409acf Aug 28, 2019
@endJunction endJunction mentioned this pull request Aug 28, 2019
2 of 2 tasks complete
@bilke bilke merged commit 6512e7d into ufz:master Aug 29, 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 #20190828.18 succeeded
Details
@bilke bilke deleted the endJunction:MFront-3.2.1 branch Aug 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.