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 surface with scalar arrays #2492

Merged
merged 12 commits into from May 20, 2019

Conversation

@rinkk
Copy link
Member

commented May 14, 2019

Extended mesh surface extraction for both DataExplorer + CL-tool to also copy scalar arrays (both point- and cell-based). Currently only int and double arrays are transferred and tuple sizes > 1 are ignored.

  1. [ x] Feature description was added to the changelog
  2. [ x] Tests covering your feature were added?

@rinkk rinkk force-pushed the rinkk:ExtractSurfaceWithArrays branch from f40e562 to c4e48f4 May 14, 2019

}
else
{
assert(sfc_element->getGeomType() == MeshElemType::QUAD);

This comment has been minimized.

Copy link
@endJunction

endJunction May 14, 2019

Member

make it a strict check with OGS_FATAL...

This comment has been minimized.

Copy link
@rinkk

rinkk May 16, 2019

Author Member

✔️

MeshLib::addPropertyToMesh<double>(sfc_mesh, name, type[i], 1, sfc_prop);
vectors_copied++;
}
else if (properties.existsPropertyVector<int>(name, type[i], 1))

This comment has been minimized.

Copy link
@endJunction

endJunction May 14, 2019

Member

Handling of int-properties looks identical to the handling of the double-properties.
Reducing the code duplication by extracting the code in a function would be great.

This comment has been minimized.

Copy link
@rinkk

rinkk May 16, 2019

Author Member

✔️

@codecov

This comment has been minimized.

Copy link

commented May 15, 2019

Codecov Report

Merging #2492 into master will increase coverage by 0.69%.
The diff coverage is 34.73%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2492      +/-   ##
==========================================
+ Coverage   32.12%   32.82%   +0.69%     
==========================================
  Files         568      555      -13     
  Lines       21427    20752     -675     
  Branches    10172     9772     -400     
==========================================
- Hits         6883     6811      -72     
+ Misses      11003    10430     -573     
+ Partials     3541     3511      -30
Impacted Files Coverage Δ
MeshLib/MeshSurfaceExtraction.cpp 30.2% <29.41%> (-7.73%) ⬇️
MeshLib/MeshSurfaceExtraction.h 80% <80%> (ø)
MathLib/Vector3.cpp 33.33% <0%> (-33.34%) ⬇️
GeoLib/SimplePolygonTree.cpp 61.9% <0%> (-4.77%) ⬇️
GeoLib/AnalyticalGeometry-impl.h 72.95% <0%> (-3.28%) ⬇️
...ng/Algorithms/IterationNumberBasedTimeStepping.cpp 69.04% <0%> (-2.39%) ⬇️
GeoLib/Surface.cpp 56.81% <0%> (-2.28%) ⬇️
GeoLib/MinimalBoundingSphere.cpp 43.92% <0%> (-1.87%) ⬇️
GeoLib/Polyline.cpp 36.13% <0%> (-1.87%) ⬇️
... and 24 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 151d756...f073133. Read the comment docs.

@endJunction endJunction force-pushed the rinkk:ExtractSurfaceWithArrays branch from 051ad4a to e248344 May 17, 2019

@rinkk rinkk force-pushed the rinkk:ExtractSurfaceWithArrays branch from e248344 to 4426d5b May 20, 2019

@endJunction endJunction force-pushed the rinkk:ExtractSurfaceWithArrays branch from 4426d5b to f073133 May 20, 2019

@endJunction endJunction merged commit b0ed522 into ufz:master May 20, 2019

6 checks passed

Codacy/PR Quality Review Up to standards. A positive pull request.
Details
codecov/patch 34.73% of diff hit (target 32.12%)
Details
codecov/project 32.82% (+0.69%) compared to 151d756
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
deploy/netlify Deploy preview ready!
Details
ufz.ogs #20190520.3 succeeded
Details

@rinkk rinkk deleted the rinkk:ExtractSurfaceWithArrays branch Aug 12, 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.