Skip to content

Handle API change between Cubit/Trelis 16 and 17 #61

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.

Sign up for GitHub

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

Closed
wants to merge 3 commits into from
Closed

Handle API change between Cubit/Trelis 16 and 17 #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f93765
Simple enough way to handle the change between Cubit/Trelis 16 and 17.
pshriwise Aug 20, 2020
e70f748
Quick format cleanup.
pshriwise Aug 20, 2020
bdd6e6b
Re-adding CUBIT_17 option after rebase.
pshriwise Oct 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ option(BUILD_DAGMC_EXPORTER "Include DagMC export capability" ON)
option(BUILD_MCNP_IMPORTER "Include MCNP import capability" ON)
option(BUILD_IGEOM "Build iGeom library" ON)
option(BUILD_IGEOM_TESTS "Include tests for iGeom" ON)
option(CUBIT_17 "Using a version of Trelis or Cubit >= 17.0" OFF)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sadly, Cubit and Trelis numbering is a little messy. Is it true that Cubit > 17, or is it just Trelis that is? According to cubit.sandia.gov, the newest version of Cubit is 15.6. I don't know what to do about that since CoreForm refuses to give me a clear answer on how these are related.

Maybe there is an API number that we can refer to? It doesn't really matter except for clear communication to those who will try to build this.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm honestly not sure what version of Cubit this might apply to.

Maybe there is an API number that we can refer to? It doesn't really matter except for clear communication to those who will try to build this.

I wish!! I looked in the * .cmake files of the 17.1 SDK for a version or API number but I didn't see one.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, neither of those replies are particularly helpful. The only thing I can think of is to update the docstring on that option to indicate that this should be based on the SDK version being used as someone building the plugin is sure to know what version that is.

Copy link
Member Author

@pshriwise pshriwise Oct 9, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤦 They definitely do have a version header we can use. @ljacobson64 found it and is using it in #64.

Still doesn't quite answer the question about Cubit vs. Trelis Version numbering though...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think my PR has any relation to this specific conversation. The only difference between my PR and this one is that instead of telling users to specify whether their version of Trelis is >= 17, it tells users to specify their version of Trelis, and CMake internally determines whether that version is >= 17.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My assumption about Cubit vs. Trelis version numbering is that they're the same. If you look in /opt/Trelis-XX.X/include/util/CubitVersion.h, it defines both CUBIT_VERSION and TRELIS_VERSION to the same thing

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps we could use CubitVersion.h to get the version?

Copy link
Member Author

@pshriwise pshriwise Oct 9, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, yeah I should've looked at #64 more closely. I assumed that was what you were doing, and, ideally, I think we probably should do just that -- detect the version from CubitVersion.h. That header is provided by the SDK, so we'd then be assuming that the SDK was matched with an appropriate version of Cubit/Trelis, but given that the headers defining the API are also provided with the SDK I think this is the best we can do. We'll just have to trust that someone applying the SDK to their version of Cubit/Trelis is using the right one and has installed it correctly.


# MCNP importer and iGeom tests require iGeom
if (BUILD_MCNP_IMPORTER OR BUILD_IGEOM_TESTS)
Expand Down Expand Up @@ -76,6 +77,9 @@ if (BUILD_IGEOM)
set(IGEOM_SRC_FILES iGeom/iGeom.cpp iGeom/iGeomError.cc)
include_directories(iGeom)
add_library(iGeom SHARED ${IGEOM_SRC_FILES})
if(CUBIT_17)
target_compile_definitions(iGeom PUBLIC -DCUBIT_17_PLUS)
endif()
target_link_libraries(iGeom ${CUBIT_LIBS})
install(TARGETS iGeom LIBRARY DESTINATION lib)
list(APPEND PLUGIN_LINK_LIBS iGeom)
Expand Down
9 changes: 8 additions & 1 deletion iGeom/iGeom.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1454,8 +1454,15 @@ CGMTagManager::CGMTagManager()
// get the tag number for CATag
DLIList<int> tag_types;
int max_type = 0;
CubitAttribManager *cam = CGMApp::instance()->attrib_manager();

#ifdef CUBIT_17_PLUS
CubitAttribManager cam = CGMApp::instance()->attrib_manager();
cam.get_registered_types(tag_types);
#else
CubitAttribManager* cam = CGMApp::instance()->attrib_manager();
cam->get_registered_types(tag_types);
#endif

for (int i = 0; i < tag_types.size(); i++) {
int this_type = tag_types.get_and_step();
max_type = (max_type < this_type ? this_type : max_type);
Expand Down