Merge pull request #534 from SCOREC/cws/simModSuite2026

support simModSuite 2026
apf_simConfig.h is deprecated in favor of pumi_simModSuiteConfig.h

Author: cwsmith

CMakeLists.txt

@@ -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)
@@ -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

apf_cap/pkg_tribits.cmake

@@ -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)

apf_sim/CMakeLists.txt

@@ -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})
@@ -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()

apf_sim/apfSIM.cc

@@ -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>

apf_sim/apf_simConfig.h

@@ -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
+

apf_sim/pkg_tribits.cmake

@@ -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})
 

cmake/FindSimModSuite.cmake

@@ -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")

gmi_sim/gmi_sim.cc

@@ -16,6 +16,7 @@
 #include <set>
 
 #include "gmi_sim_config.h"
+#include <pumi_simModSuiteConfig.h> //simmodsuite version
 
 #ifdef SIM_PARASOLID
 #include "SimParasolidKrnl.h"
@@ -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);

phasta/phAttrib.cc

@@ -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;