support simmodsuite 12.0-180713

the M_splitMeshOnGFace function changed from having four arguments to two arguments in version 12.0-180606

Author: cwsmith

cmake/FindSimModSuite.cmake

@@ -74,7 +74,7 @@ string(REGEX REPLACE
   "${SIM_VERSION}")
 
 set(MIN_VALID_SIM_VERSION 11.0.170826)
-set(MAX_VALID_SIM_VERSION 12.0.171207)
+set(MAX_VALID_SIM_VERSION 12.0.180713)
 if( (SIM_DOT_VERSION VERSION_LESS MIN_VALID_SIM_VERSION) OR
     (SIM_DOT_VERSION VERSION_GREATER MAX_VALID_SIM_VERSION) )
   MESSAGE(FATAL_ERROR 

phasta/CMakeLists.txt

@@ -23,6 +23,14 @@ set(SOURCES
   phiotimer.cc
 )
 
+if(ENABLE_SIMMETRIX AND SIMMODSUITE_SimAdvMeshing_FOUND)
+  if(SIM_DOT_VERSION VERSION_GREATER 12.0.180605)
+    set(SOURCES ${SOURCES} splitMeshOnGFace_2arg.cpp)
+  else()
+    set(SOURCES ${SOURCES} splitMeshOnGFace_4arg.cpp)
+  endif()
+endif()
+
 if(PUMI_FORTRAN_INTERFACE)
   enable_language(Fortran)
   set(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/mod_files)

phasta/phInterfaceCutter.cc

@@ -12,12 +12,7 @@
 #include "SimPartitionedMesh.h"
 #include "SimModel.h"
 #include "SimUtil.h"
-#endif
-
-/* forward declare simmetrix API M_splitMeshOnGFace;
-   once it is ready in published code, remove this */
-#ifdef HAVE_SIMMETRIX
-extern void M_splitMeshOnGFace(pUnstructuredMesh, pGFace, int keepOrig, pPList nosplit);
+#include "splitMeshOnGFace.h"
 #endif
 
 namespace apf {
@@ -223,7 +218,7 @@ void cutInterfaceSIM(apf::Mesh2* m, BCs& bcs)
       printf("cutting face %d:\n",GEN_tag(modelFace));
       counter = M_numVerticesInClosure(mesh, modelFace);
       printf("  num. of mesh vertices on interface before cut: %d\n",counter);
-      M_splitMeshOnGFace(pmesh, modelFace, 0, 0);
+      splitMeshOnGFace(pmesh, modelFace);
       counter = M_numVerticesInClosure(mesh, modelFace);
       printf("  num. of mesh vertices on interface after cut: %d\n",counter);
     }

phasta/splitMeshOnGFace.h

@@ -0,0 +1,8 @@
+#ifndef SPLITMESHONGFACE_H_
+#define SPLITMESHONGFACE_H_
+#include "SimMeshTools.h" /*declares M_splitMeshOnGFace*/
+
+namespace ph {
+  void splitMeshOnGFace(pUnstructuredMesh pmesh, pGFace gf);
+}
+#endif

phasta/splitMeshOnGFace_2arg.cpp

@@ -0,0 +1,5 @@
+#include "splitMeshOnGFace.h"
+
+void ph::splitMeshOnGFace(pUnstructuredMesh pmesh, pGFace gf) {
+  M_splitMeshOnGFace(pmesh, gf);
+}

phasta/splitMeshOnGFace_4arg.cpp

@@ -0,0 +1,7 @@
+#include "splitMeshOnGFace.h"
+
+extern void M_splitMeshOnGFace(pUnstructuredMesh, pGFace, int keepOrig, pPList nosplit);
+
+void ph::splitMeshOnGFace(pUnstructuredMesh pmesh, pGFace gf) {
+  M_splitMeshOnGFace(pmesh, gf, 0, 0);
+}