Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 14 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ endif()
# This is the top level CMake file for the SCOREC build
cmake_minimum_required(VERSION 3.12)

project(SCOREC VERSION 4.1.0 LANGUAGES CXX C)
project(SCOREC VERSION 4.2.0 LANGUAGES CXX C)

include(cmake/bob.cmake)
include(cmake/xsdk.cmake)
Expand Down Expand Up @@ -174,6 +174,19 @@ endif()

configure_file(SCOREC_config.h.in SCOREC_config.h)
install(FILES "${CMAKE_BINARY_DIR}/SCOREC_config.h" DESTINATION include)

if(ENABLE_SIMMETRIX)
option(ENABLE_FIELDSIM "Enable use of FieldSim from Simmetrix SimModSuite" FALSE)
message(STATUS "ENABLE_FIELDSIM: ${ENABLE_FIELDSIM}")
set(USE_FIELDSIM FALSE)
if(SIMMODSUITE_SimField_FOUND AND ENABLE_FIELDSIM)
set(USE_FIELDSIM TRUE)
endif()
set(USE_SIM_ADVMESHING ${SIMMODSUITE_SimAdvMeshing_FOUND})
configure_file(pumi_simModSuiteConfig.h.in pumi_simModSuiteConfig.h)
install(FILES "${CMAKE_BINARY_DIR}/pumi_simModSuiteConfig.h" DESTINATION include)
endif()

include_directories(PUBLIC "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>")

# Include the SCOREC project packages
Expand Down
4 changes: 2 additions & 2 deletions apf_cap/pkg_tribits.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ tribits_package(SCORECapf_cap)

include_directories(${CMAKE_CURRENT_SOURCE_DIR})

#directory containing apf_simConfig.h
include_directories("${CMAKE_CURRENT_BINARY_DIR}")
#directory containing pumi_simModSuiteConfig.h
include_directories("${PROJECT_BINARY_DIR}")

#Sources & Headers
set(SOURCES apfCAP.cc)
Expand Down
20 changes: 1 addition & 19 deletions apf_sim/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ endif()

#Sources & Headers
set(SOURCES apfSIM.cc)
set(HEADERS apfSIM.h)
set(HEADERS apfSIM.h apf_simConfig.h)

#Library
add_library(apf_sim ${SOURCES})
Expand All @@ -21,24 +21,6 @@ target_include_directories(apf_sim PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
)

option(ENABLE_FIELDSIM "Enable use of FieldSim from Simmetrix SimModSuite" FALSE)
message(STATUS "ENABLE_FIELDSIM: ${ENABLE_FIELDSIM}")
set(USE_FIELDSIM FALSE)
if( ${SIMMODSUITE_SimField_FOUND} AND ENABLE_FIELDSIM )
set(USE_FIELDSIM TRUE)
endif()
set(USE_SIM_ADVMESHING ${HAVE_SIMADVMESHING})

configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/apf_simConfig.h.in"
"${CMAKE_CURRENT_BINARY_DIR}/apf_simConfig.h")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/apf_simConfig.h
DESTINATION include)
#directory containing apf_simConfig.h
target_include_directories(apf_sim PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)


scorec_export_library(apf_sim)

bob_end_subdir()
2 changes: 1 addition & 1 deletion apf_sim/apfSIM.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <SimPartitionedMesh.h>
#include <gmi.h>
#include <gmi_sim.h>
#include <apf_simConfig.h>
#include <pumi_simModSuiteConfig.h>
#include <cstdlib>
#include <pcu_util.h>
#include <algorithm>
Expand Down
8 changes: 8 additions & 0 deletions apf_sim/apf_simConfig.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#include <pumi_simModSuiteConfig.h>

#if defined(__GNUC__) || defined(__clang__) || defined(__INTEL_COMPILER) || defined(__INTEL_LLVM_COMPILER)
#warning "apf_simConfig.h is deprecated. Please use pumi_simModSuiteConfig.h instead."
#elif defined(_MSC_VER)
#pragma message("warning: apf_simConfig.h is deprecated. Please use pumi_simModSuiteConfig.h instead.")
#endif

12 changes: 1 addition & 11 deletions apf_sim/pkg_tribits.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,13 @@ tribits_package(SCORECapf_sim)

include_directories(${CMAKE_CURRENT_SOURCE_DIR})

if(SCORECapf_sim_ENABLE_SimField)
add_definitions(-DUSE_FIELDSIM)
endif()

configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/apf_simConfig.h.in"
"${PROJECT_BINARY_DIR}/apf_simConfig.h")
#directory containing apf_simConfig.h
include_directories("${CMAKE_CURRENT_BINARY_DIR}")

#Sources & Headers
set(SOURCES apfSIM.cc)
set(HEADERS apfSIM.h)

#Library
tribits_add_library(
apf_sim
apf_sim
HEADERS ${HEADERS}
SOURCES ${SOURCES})

Expand Down
2 changes: 1 addition & 1 deletion cmake/FindSimModSuite.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ string(REGEX REPLACE
"${SIM_VERSION}")

set(MIN_VALID_SIM_VERSION 15.0.191017)
set(MAX_VALID_SIM_VERSION 2025.0.250108)
set(MAX_VALID_SIM_VERSION 2026.0.260411)
if( ${SKIP_SIMMETRIX_VERSION_CHECK} )
message(STATUS "Skipping Simmetrix SimModSuite version check."
" This may result in undefined behavior")
Expand Down
7 changes: 7 additions & 0 deletions gmi_sim/gmi_sim.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include <set>

#include "gmi_sim_config.h"
#include <pumi_simModSuiteConfig.h> //simmodsuite version

#ifdef SIM_PARASOLID
#include "SimParasolidKrnl.h"
Expand Down Expand Up @@ -493,8 +494,14 @@ struct gmi_model* gmi_sim_load(const char* nativefile, const char* smdfile)
if (NM_isAssemblyModel(nm)) {
pGModel am = GAM_createFromNativeModel(nm, NULL);
NM_release(nm);
#if SIMMODSUITE_MAJOR_VERSION < 2026
sm = GM_createFromAssemblyModel(am, NULL, NULL);
GM_release(am);
#else
pModelBuilder mb = ModelBuilder_new(am);
ModelBuilder_setOperation(mb, ModelBuilder_unite);
sm = ModelBuilder_execute(mb, NULL);
#endif
nm = GM_nativeModel(sm);
} else
sm = GM_createFromNativeModel(nm, NULL);
Expand Down
2 changes: 1 addition & 1 deletion phasta/phAttrib.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <SimModel.h>
#include <cstdlib>
#include <iostream>
#include "apf_simConfig.h"
#include <pumi_simModSuiteConfig.h>

typedef ph::BC* (*BCFactory)(pAttribute a, pGEntity ge);
typedef std::map<std::string, BCFactory> BCFactories;
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion test/generate.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <SimUtil.h>
#include <apfSIM.h>
#include <apfMDS.h>
#include <apf_simConfig.h>
#include <pumi_simModSuiteConfig.h>
#include "gmi_sim_config.h"
#include <gmi_sim.h>
#include <apf.h>
Expand Down
2 changes: 1 addition & 1 deletion test/rm_extrusion.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <SimPartitionedMesh.h>
#include <SimUtil.h>
#include <apfSIM.h>
#include <apf_simConfig.h>
#include <pumi_simModSuiteConfig.h>
#include <apfMDS.h>
#include <gmi.h>
#include <gmi_sim.h>
Expand Down
7 changes: 7 additions & 0 deletions test/simSpjToSmd.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include "SimAttribute.h"
#include "AttributeTypes.h"
#include "SimParasolidKrnl.h"
#include "pumi_simModSuiteConfig.h"
#include "string.h"
#include <iostream>
#include <cstdlib>
Expand Down Expand Up @@ -37,8 +38,14 @@ int main(int argc, char* argv[])
if(NM_isAssemblyModel(pnModel)) {
pGModel amodel = GAM_createFromNativeModel(pnModel, prog);
NM_release(pnModel);
#if SIMMODSUITE_MAJOR_VERSION < 2026
model = GM_createFromAssemblyModel(amodel, NULL, prog);
GM_release(amodel);
#else
pModelBuilder mb = ModelBuilder_new(amodel);
ModelBuilder_setOperation(mb, ModelBuilder_unite);
model = ModelBuilder_execute(mb, NULL);
#endif
pnModel = GM_nativeModel(model);
}
else
Expand Down
2 changes: 1 addition & 1 deletion test/simTranslate.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <stdlib.h>
#include <string>

#include <apf_simConfig.h>
#include <pumi_simModSuiteConfig.h>
/* cheap hackish way to get SIM_PARASOLID and SIM_ACIS */
#include "gmi_sim_config.h"
#include <gmi_sim.h>
Expand Down
Loading