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

Extract Parameter and co in own library. #2413

Merged
merged 11 commits into from Mar 11, 2019

Conversation

Projects
None yet
4 participants
@endJunction
Copy link
Member

endJunction commented Mar 9, 2019

This resolves circular dependency between MaterialLib and ProcessLib via the Parameter classes/functions.

Fixes part of #2327 (The other remaining parts are the HTBHE <-> ProcessLib/BC and some DataExplorer code.)

Most changes are done using 'sed'. I suggest commit-wise review.
The first two commits were part of #2370 and lead to the materialization of the circular dependency.

@endJunction endJunction force-pushed the endJunction:ParameterLib branch 2 times, most recently from 6e84b51 to f3df422 Mar 9, 2019

@codecov

This comment has been minimized.

Copy link

codecov bot commented Mar 9, 2019

Codecov Report

Merging #2413 into master will increase coverage by 0.07%.
The diff coverage is 26.02%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2413      +/-   ##
==========================================
+ Coverage   32.59%   32.67%   +0.07%     
==========================================
  Files         530      549      +19     
  Lines       20037    20286     +249     
  Branches     9503     9569      +66     
==========================================
+ Hits         6532     6629      +97     
- Misses      10167    10186      +19     
- Partials     3338     3471     +133
Impacted Files Coverage Δ
MaterialLib/FractureModels/MohrCoulomb.h 88.88% <ø> (ø) ⬆️
...ousMedium/Permeability/createPermeabilityModel.cpp 0% <ø> (ø) ⬆️
MaterialLib/SolidModels/LinearElasticIsotropic.h 0% <ø> (ø) ⬆️
MaterialLib/SolidModels/Lubby2.cpp 0% <ø> (ø) ⬆️
MaterialLib/PorousMedium/PorousMediaProperties.cpp 0% <ø> (ø) ⬆️
...aseModels/CreateTwoPhaseFlowMaterialProperties.cpp 0% <ø> (ø) ⬆️
MaterialLib/SolidModels/MFront/CreateMFront.cpp 0% <ø> (ø) ⬆️
ParameterLib/Parameter.h 27.65% <ø> (ø)
MaterialLib/SolidModels/CreepBGRa.cpp 0% <ø> (ø) ⬆️
...rialLib/SolidModels/CreateLinearElasticIsotropic.h 0% <ø> (ø) ⬆️
... and 80 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 64de79a...6454b97. Read the comment docs.

@endJunction endJunction force-pushed the endJunction:ParameterLib branch from 9370f5c to a198916 Mar 10, 2019

@TomFischer
Copy link
Member

TomFischer left a comment

I like the refactorization!

@bilke

bilke approved these changes Mar 11, 2019

Copy link
Member

bilke left a comment

Just checked the CMake part.

@endJunction endJunction force-pushed the endJunction:ParameterLib branch from a198916 to 6454b97 Mar 11, 2019

@wenqing
Copy link
Member

wenqing left a comment

👍

@endJunction endJunction merged commit 8ee4a95 into ufz:master Mar 11, 2019

5 of 6 checks passed

codecov/patch 26.02% of diff hit (target 32.59%)
Details
Codacy/PR Quality Review Up to standards. A positive pull request.
Details
codecov/project 32.67% (+0.07%) compared to 64de79a
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
deploy/netlify Deploy preview ready!
Details
ufz.ogs #20190311.6 succeeded
Details

@endJunction endJunction deleted the endJunction:ParameterLib branch Mar 11, 2019

@endJunction endJunction referenced this pull request Mar 13, 2019

Open

THM process #2269

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.