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

4766 different surface counts #4777

Merged
merged 28 commits into from
Mar 6, 2023
Merged

Conversation

ggartside
Copy link
Collaborator

@ggartside ggartside commented Dec 21, 2022

Pull request overview

To resolve an issue caused by removing inline vertices that altered the direction vector of the combined edges enough to make surface matching fail

This call was originally added to resolve the issue with Space 2 - 1 in the floorplan_school model where the vertices are not ordered correctly and the resulting surfaces are overlapping. Removing this call meant that the way wall sub-surfaces are made and associated with the walls had to be modified to allow for the situation that we are no longer able to match edge ids

This fix has also resulted in creating issue #4776 and #4783

Pull Request Author

  • Model API Changes / Additions
  • Any new or modified fields have been implemented in the EnergyPlus ForwardTranslator (and ReverseTranslator as appropriate)
  • Model API methods are tested (in src/model/test)
  • EnergyPlus ForwardTranslator Tests (in src/energyplus/Test)
  • If a new object or method, added a test in NREL/OpenStudio-resources: Add Link
  • If needed, added VersionTranslation rules for the objects (src/osversion/VersionTranslator.cpp)
  • Verified that C# bindings built fine on Windows, partial classes used as needed, etc.
  • All new and existing tests passes
  • If methods have been deprecated, update rest of code to use the new methods

Labels:

  • If change to an IDD file, add the label IDDChange
  • If breaking existing API, add the label APIChange
  • If deemed ready, add label Pull Request - Ready for CI so that CI builds your PR

Review Checklist

This will not be exhaustively relevant to every PR.

  • Perform a Code Review on GitHub
  • Code Style, strip trailing whitespace, etc.
  • All related changes have been implemented: model changes, model tests, FT changes, FT tests, VersionTranslation, OS App
  • Labeling is ok
  • If defect, verify by running develop branch and reproducing defect, then running PR and reproducing fix
  • If feature, test running new feature, try creative ways to break it
  • CI status: all green or justified

@tijcolem tijcolem added Pull Request - Ready for CI This pull request if finalized and is ready for continuous integration verification prior to merge. component - Geometry Translator severity - Minor Bug labels Jan 13, 2023
@ggartside ggartside linked an issue Feb 7, 2023 that may be closed by this pull request
src/utilities/geometry/Intersection.cpp Outdated Show resolved Hide resolved
src/utilities/geometry/Intersection.cpp Outdated Show resolved Hide resolved
src/utilities/geometry/Intersection.cpp Outdated Show resolved Hide resolved
src/utilities/geometry/Intersection.cpp Outdated Show resolved Hide resolved
src/utilities/geometry/Intersection.cpp Outdated Show resolved Hide resolved
src/utilities/geometry/Intersection.cpp Outdated Show resolved Hide resolved
src/utilities/geometry/Point3d.cpp Outdated Show resolved Hide resolved
src/utilities/geometry/Test/Intersection_GTest.cpp Outdated Show resolved Hide resolved
src/utilities/geometry/Test/Intersection_GTest.cpp Outdated Show resolved Hide resolved
src/model/Space.cpp Outdated Show resolved Hide resolved
src/model/FloorspaceReverseTranslator.cpp Outdated Show resolved Hide resolved
src/model/FloorspaceReverseTranslator.cpp Outdated Show resolved Hide resolved
src/model/Space.cpp Outdated Show resolved Hide resolved
src/model/Space.cpp Outdated Show resolved Hide resolved
src/model/Space.cpp Outdated Show resolved Hide resolved
src/model/Surface.cpp Outdated Show resolved Hide resolved
src/model/Surface.cpp Outdated Show resolved Hide resolved
src/utilities/floorspace/FSModel.hpp Show resolved Hide resolved
@jmarrec
Copy link
Collaborator

jmarrec commented Feb 15, 2023

at 5e06a4 you have failing tests. There are also conflicts.

The following tests FAILED:

2524 - ModelFixture.FloorspaceReverseTranslator_Issue_4312 (Failed)
2526 - ModelFixture.FloorspaceReverseTranslator_Issue_4488 (Failed)
2530 - ModelFixture.FloorspaceReverseTranslator_Issue_4237 (Failed)

Errors while running CTest

resources/CMakeLists.txt Outdated Show resolved Hide resolved
src/model/test/FloorspaceReverseTranslator_GTest.cpp Outdated Show resolved Hide resolved
src/utilities/geometry/Intersection.cpp Outdated Show resolved Hide resolved
@jmarrec
Copy link
Collaborator

jmarrec commented Feb 15, 2023

@ggartside I've merged develop and resolved conflicts, and cleaned up a bunch of things. There are still some remaining comments that are left open.

@ggartside ggartside linked an issue Feb 15, 2023 that may be closed by this pull request
@jmarrec
Copy link
Collaborator

jmarrec commented Feb 16, 2023

Thanks for the changes @ggartside . I have fixed up the cppcheck and merged latest develop in. There are only 2 open comments that needs addressing at this point.

jmarrec and others added 5 commits February 16, 2023 15:33
…d by the shringk/inflate to remove spikes. Usually an issue at vertices with a very small internal angle (pointy)
… boost and openstudio formats all boost valculations are effectively performed in mm and not m as the scale factor is 1000
@ggartside ggartside linked an issue Mar 1, 2023 that may be closed by this pull request
@ggartside
Copy link
Collaborator Author

Added a new commit that applies a scale factor when converting between openstudio and boost data formats to improve the numerical accuracy of the boolean operations.

Idea came from this comment in the boostorg/geometry repo boostorg/geometry#1034 (comment) where the author indicates that scaling the values by 10 improved the result and talks about rounding to an integer grid, so by increasing the range of values we pass to boost we should be improving the resolution of the integer rounding

@jmarrec jmarrec force-pushed the 4766-Different-surface-counts branch from bacbb94 to cc46ff5 Compare March 3, 2023 14:43
@jmarrec
Copy link
Collaborator

jmarrec commented Mar 3, 2023

Ubuntu test failures are unrelated:

The following tests FAILED:
	639 - BCLFixture.RemoteBCLTest (Failed)
	640 - BCLFixture.RemoteBCLTest2 (Failed)
	642 - BCLFixture.RemoteBCLMetaSearchTest (Failed)
	643 - BCLFixture.RemoteBCL_EncodingURI (Failed)

@jmarrec jmarrec merged commit 5a1550e into develop Mar 6, 2023
@jmarrec jmarrec deleted the 4766-Different-surface-counts branch March 6, 2023 08:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment