Skip to content

Add MDS adapt option to capVol test #454

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

Draft
wants to merge 7 commits into
base: develop
Choose a base branch
from
Draft

Conversation

bobpaw
Copy link
Collaborator

@bobpaw bobpaw commented Sep 13, 2024

Add MDS adapt option to capVol test

  • Add -m flag to convert mesh to MDS during adapt and back to CRE afterward.
  • Use ma::adapt instead of ma::adaptVerbose.
  • Use default ma::Input.
  • Add new cap.* tests that run with MDS.

TODO

  • Tests are taking longer because I'm using ma::adapt instead of ma::adaptVerbose.

Comparison:

test case adapt adaptVerbose adapt+pre-fix
capVolCube 1884.35 sec 149.71 sec 333.62 sec
capVolCubeMds 191.51 sec 27.05 sec 87.63 sec
capVolWing 5963.82 sec 203.11 sec 454.72 sec
capVolWingMds 821.70 sec 56.86 sec 40.10 sec

@bobpaw bobpaw force-pushed the apw/capVol_mds_adapt branch from 5792912 to 537b4e3 Compare November 4, 2024 16:40
bobpaw added 3 commits June 12, 2025 13:53
- Add -m option to convert mesh database to MDS during adaptation. This
  option speeds up adaptation.
- This tests the conversion capability.

Signed-off-by: Aiden Woodruff <woodra@rpi.edu>
- Replace writeCre with cs.save_file.
- Replace ma::adaptVerbose with ma::adapt (the production version).
- Remove ma::Input arguments which are just reinforcing the defaults.
  - If the defaults chagne we shouldn't force using the old ones.
- Don't delete old mesh model before adapting.
- Change CapstoneModule name.
- Reorder mds mesh after conversion.

Signed-off-by: Aiden Woodruff <woodra@rpi.edu>
- Disable verify() for non-volume meshes.

Signed-off-by: Aiden Woodruff <woodra@rpi.edu>
@bobpaw bobpaw force-pushed the apw/capVol_mds_adapt branch from 537b4e3 to bfb892c Compare June 12, 2025 17:54
bobpaw added 2 commits June 12, 2025 18:51
Signed-off-by: Aiden Woodruff <woodra@rpi.edu>
- gmi_cap.h: add gmi_cap_probe and gmi_cap_load_some functions.
- wrap headers and functions requiring C++ into #ifdef __cplusplus.
- remove using namespace declarations.
- add import with gmodel.
- gmi_cap.cc: add using namespace CreateMG.
- add Geometry namespace to enums (i.e. VERTEX, EDGE, FACE, REGION).
- add gmodel to struct cap_model.
- use reinterpret_cast instead of C-style casts.
- (gmi_cap_start): handle initialization of static
  capstonemodule.
- (gmi_cap_stop): destruct static capstone module.
- (create_cre): uncomment function.
- (gmi_cap_probe): add short overload to just get mesh names.
- add long overload to get model and mesh contents.
- (gmi_register_cap): register create_cre for gmi_load.
- (owned_import): uncomment function.
- (gmi_cap_load): call gmi_cap_load_some with all mesh names.
- (gmi_cap_load_some): add new function to only load specific mesh
  names.
- (gmi_import_cap): add overload to use current geometry.
- replace PCU_ALWAYS_ASSERT with if statement and gmi_fail.
- test/capLoadSome.cc: add utility to test gmi_cap_load_some.
- test/capProbe.cc: add utility to test gmi_cap_probe.
- test/CMakeLists.txt: add capLoadSome and capProbe.

Signed-off-by: Aiden Woodruff <woodra@rpi.edu>
@bobpaw bobpaw force-pushed the apw/capVol_mds_adapt branch from 3d9c856 to d377593 Compare June 17, 2025 05:10
bobpaw added 2 commits June 18, 2025 01:50
- gmi_cap/CMakeLists.txt: update link libraries.
- gmi_cap/gmi_cap.h: add function documentation.
- add doxygen group

Signed-off-by: Aiden Woodruff <woodra@rpi.edu>
- apf_cap/CMakeLists.txt:
- apf_cap/apfCAP.h: move MeshCAP definition to apfCAP.cc.
- add function documentation.
- (hasCAP): new function.
- add copyright notice.
- fix #include guard name.
- remove namespace using declarations.
- forward declare arguments.
- remove unnecessary #includes.
- (createMesh): rename to createCapMesh.
    - similar to loadMdsMesh, etc
- (createCapMesh): add overload using existing gmi_model.
- (getCapNative): add function to replace MeshCAP::getMesh
  functionality.
- test/cap*: replace createMesh with createCapMesh.
- update #includes now that apf_cap doesn't have anything.
- remove using namespace CreateMG::*.
- prefer MDBI/GDBI to long names.
- apf_cap/apfCAP.cc: reorganize #includes.
- add using namespace CreateMG and alias commonly used CreateMG::Mesh
  (which would also conflict with apf::Mesh).
- (hasCAP): add definition.
- (MeshCAP): add class definition from apfCAP.h
- add ownership of mesh database interface in case we use the gmi_model
  createCapMesh.
- (MeshCAP::MeshCAP): use Capstone get_dimension.
- add MeshMG:: namespace where needed.
- light reformatting.
- (createMesh): remove unused function (with non-existent capMesh* type).
- (castEntity): remove unused function.

Signed-off-by: Aiden Woodruff <woodra@rpi.edu>
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.

1 participant