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.

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

Seacas script syntax fix #10411

Merged
merged 4 commits into from
Apr 21, 2022
Merged

Seacas script syntax fix #10411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a9895cc
IOSS: cgns - skip BC if name is Unspecified and id = 0
gdsjaar Apr 1, 2022
a057210
SEACAS: Check for possibly undefined symbol
gsjaardema Apr 6, 2022
e7ae0a6
Disable exodus3.py test for Trilinos
gsjaardema Apr 6, 2022
a2a4353
Avoid creating assemblies from a VC node named Unspecified
gsjaardema Apr 20, 2022
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: 2 additions & 2 deletions packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1625,7 +1625,7 @@ void Iocgns::Utils::add_sidesets(int cgns_file_ptr, Ioss::DatabaseIO *db)
}
if (id == 0) {
id = Ioss::Utils::extract_id(ss_name);
if (id == 0) {
if (id == 0 && ss_name != "Unspecified") {
// Assign a fake_id to this sideset. No checking to make
// sure there are no duplicates...
id = fake_id--;
Expand Down Expand Up @@ -1685,7 +1685,7 @@ void Iocgns::Utils::add_assemblies(int cgns_file_ptr, Ioss::DatabaseIO *db)
}
cg_free(dtext);
}
if (!assem_name.empty()) {
if (!assem_name.empty() && assem_name != "Unspecified") {
// Create an assembly with this name...
auto *assem = new Ioss::Assembly(db, assem_name);
db->get_region()->add(assem);
Expand Down
163 changes: 81 additions & 82 deletions packages/seacas/scripts/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ ASSERT_DEFINED(${PROJECT_NAME}_ENABLE_SEACASNemspread)
ASSERT_DEFINED(${PROJECT_NAME}_ENABLE_SEACASNemslice)
IF (${PROJECT_NAME}_ENABLE_SEACASNemspread AND ${PROJECT_NAME}_ENABLE_SEACASNemslice)
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/decomp.in
${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/decomp
@ONLY
)
${CMAKE_CURRENT_SOURCE_DIR}/decomp.in
${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/decomp
@ONLY
)
FILE(COPY ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/decomp
DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
FILE_PERMISSIONS OWNER_READ OWNER_WRITE
Expand All @@ -23,40 +23,40 @@ ENDIF()
ASSERT_DEFINED(${PROJECT_NAME}_ENABLE_SEACASBlot)
IF (${PROJECT_NAME}_ENABLE_SEACASBlot)
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/blot.in
${CMAKE_CURRENT_BINARY_DIR}/blot
@ONLY
)
${CMAKE_CURRENT_SOURCE_DIR}/blot.in
${CMAKE_CURRENT_BINARY_DIR}/blot
@ONLY
)
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/blot DESTINATION bin)
ENDIF()

ASSERT_DEFINED(${PROJECT_NAME}_ENABLE_SEACASFastq)
IF (${PROJECT_NAME}_ENABLE_SEACASFastq)
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/fastq.in
${CMAKE_CURRENT_BINARY_DIR}/fastq
@ONLY
)
${CMAKE_CURRENT_SOURCE_DIR}/fastq.in
${CMAKE_CURRENT_BINARY_DIR}/fastq
@ONLY
)
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fastq DESTINATION bin)
ENDIF()

ASSERT_DEFINED(${PROJECT_NAME}_ENABLE_SEACASEpu)
IF (${PROJECT_NAME}_ENABLE_SEACASEpu)
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/epup.in
${CMAKE_CURRENT_BINARY_DIR}/epup
@ONLY
)
${CMAKE_CURRENT_SOURCE_DIR}/epup.in
${CMAKE_CURRENT_BINARY_DIR}/epup
@ONLY
)
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/epup DESTINATION bin)
ENDIF()

ASSERT_DEFINED(${PROJECT_NAME}_ENABLE_SEACASConjoin)
IF (${PROJECT_NAME}_ENABLE_SEACASConjoin)
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/pconjoin.in
${CMAKE_CURRENT_BINARY_DIR}/pconjoin
@ONLY
)
${CMAKE_CURRENT_SOURCE_DIR}/pconjoin.in
${CMAKE_CURRENT_BINARY_DIR}/pconjoin
@ONLY
)
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pconjoin DESTINATION bin)
ENDIF()

Expand Down Expand Up @@ -86,78 +86,77 @@ IF (${PROJECT_NAME}_ENABLE_SEACASExodus)
IF (${Python_FOUND})
message(STATUS "Found python version ${Python_VERSION}")
IF (${Python_VERSION} VERSION_LESS "3.0")
SET( EXODUSPY "exodus2.py" )
SET( EXOMERGE "exomerge2.py")
MESSAGE(STATUS "A Python-2 version of exodus.py and exomerge.py will be installed.")
SET( EXODUSPY "exodus2.py" )
SET( EXOMERGE "exomerge2.py")
MESSAGE(STATUS "A Python-2 version of exodus.py and exomerge.py will be installed.")
ELSE()
SET( EXODUSPY "exodus3.py" )
# IF (NOT ${PROJECT_NAME}_HOSTNAME STREQUAL "APPVEYOR-VM")
SET( EXODUSPY "exodus3.py" )
# IF (NOT ${PROJECT_NAME}_HOSTNAME STREQUAL "APPVEYOR-VM")
# ADD_TEST(NAME test_exodus3.py COMMAND ${CMAKE_INSTALL_PREFIX}/lib/tests/test_exodus3.py)
# ENDIF()
SET( EXOMERGE "exomerge3.py")
MESSAGE(STATUS "A Python-3 version of exodus.py and exomerge.py will be installed.")
# ENDIF()
SET( EXOMERGE "exomerge3.py")
MESSAGE(STATUS "A Python-3 version of exodus.py and exomerge.py will be installed.")
ENDIF()

IF (BUILD_SHARED_LIBS)
IF( ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR} MATCHES "^${CMAKE_INSTALL_PREFIX}.*" )
STRING( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" ""
SEACAS_INCLUDEDIR "${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}" )
STRING( REGEX REPLACE "^/" "" SEACAS_INCLUDEDIR "${SEACAS_INCLUDEDIR}" )
ELSEIF( NOT ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR} MATCHES "^/" )
SET( SEACAS_INCLUDEDIR "${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}" )
ELSE()
SET( SEACAS_INCLUDEDIR "include" )
ENDIF()
IF( ${${PROJECT_NAME}_INSTALL_LIB_DIR} MATCHES "^${CMAKE_INSTALL_PREFIX}.*" )
STRING( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" ""
SEACAS_LIBDIR "${${PROJECT_NAME}_INSTALL_LIB_DIR}" )
STRING( REGEX REPLACE "^/" "" SEACAS_LIBDIR "${SEACAS_LIBDIR}")
ELSEIF( NOT ${CMAKE_INSTALL_LIBDIR} MATCHES "^/" )
SET( SEACAS_LIBDIR "${${PROJECT_NAME}_INSTALL_LIB_DIR}" )
ELSE()
SET( SEACAS_LIBDIR "lib" )
ENDIF()
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/exodus2.in.py
${CMAKE_CURRENT_BINARY_DIR}/exodus2.py
@ONLY
)
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/exodus3.in.py
${CMAKE_CURRENT_BINARY_DIR}/exodus3.py
@ONLY
)
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/tests/test_exodus3.py
${CMAKE_CURRENT_BINARY_DIR}/tests/test_exodus3.py
@ONLY
)
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/tests/test-assembly.exo
${CMAKE_CURRENT_BINARY_DIR}/tests/test-assembly.exo
COPYONLY
)

INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/exodus2.py DESTINATION lib)
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/exodus3.py DESTINATION lib)
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/tests/test_exodus3.py DESTINATION lib/tests/)
INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/tests/test-assembly.exo DESTINATION lib/tests/)
INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/exomerge2.py DESTINATION lib)
INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/exomerge3.py DESTINATION lib)

if (${CMAKE_PROJECT_NAME} STREQUAL "SEACASProj")
InstallSymLink(${EXODUSPY} ${CMAKE_INSTALL_PREFIX}/lib/exodus.py)
InstallSymLink(${EXOMERGE} ${CMAKE_INSTALL_PREFIX}/lib/exomerge.py)
endif()
IF (NOT "${CMAKE_INSTALL_PREFIX}" STREQUAL "")
IF( ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR} MATCHES "^${CMAKE_INSTALL_PREFIX}.*" )
STRING( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" ""
SEACAS_INCLUDEDIR "${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}" )
STRING( REGEX REPLACE "^/" "" SEACAS_INCLUDEDIR "${SEACAS_INCLUDEDIR}" )
ELSEIF( NOT ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR} MATCHES "^/" )
SET( SEACAS_INCLUDEDIR "${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}" )
ELSE()
SET( SEACAS_INCLUDEDIR "include" )
ENDIF()
IF( ${${PROJECT_NAME}_INSTALL_LIB_DIR} MATCHES "^${CMAKE_INSTALL_PREFIX}.*" )
STRING( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" ""
SEACAS_LIBDIR "${${PROJECT_NAME}_INSTALL_LIB_DIR}" )
STRING( REGEX REPLACE "^/" "" SEACAS_LIBDIR "${SEACAS_LIBDIR}")
ELSEIF( NOT ${CMAKE_INSTALL_LIBDIR} MATCHES "^/" )
SET( SEACAS_LIBDIR "${${PROJECT_NAME}_INSTALL_LIB_DIR}" )
ELSE()
SET( SEACAS_LIBDIR "lib" )
ENDIF()
ENDIF()
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/exodus2.in.py
${CMAKE_CURRENT_BINARY_DIR}/exodus2.py
@ONLY
)
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/exodus3.in.py
${CMAKE_CURRENT_BINARY_DIR}/exodus3.py
@ONLY
)
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/tests/test_exodus3.py
${CMAKE_CURRENT_BINARY_DIR}/tests/test_exodus3.py
@ONLY
)
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/tests/test-assembly.exo
${CMAKE_CURRENT_BINARY_DIR}/tests/test-assembly.exo
COPYONLY
)

INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/exodus2.py DESTINATION lib)
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/exodus3.py DESTINATION lib)
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/tests/test_exodus3.py DESTINATION lib/tests/)
INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/tests/test-assembly.exo DESTINATION lib/tests/)
INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/exomerge2.py DESTINATION lib)
INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/exomerge3.py DESTINATION lib)

if (${CMAKE_PROJECT_NAME} STREQUAL "SEACASProj")
InstallSymLink(${EXODUSPY} ${CMAKE_INSTALL_PREFIX}/lib/exodus.py)
InstallSymLink(${EXOMERGE} ${CMAKE_INSTALL_PREFIX}/lib/exomerge.py)
endif()
ELSE()
MESSAGE(STATUS "Exodus.py and exomerge.py NOT installed since shared exodus library is not available.")
MESSAGE(STATUS "Exodus.py and exomerge.py NOT installed since shared exodus library is not available.")
ENDIF()
else()
MESSAGE(STATUS "Exodus.py and exomerge.py NOT installed since Python could not be found.")
endif()
ELSE()
MESSAGE(STATUS "Exodus.py and exomerge.py NOT installed since Exodus is not enabled.")
endif()