Merge branch 'develop' into extensible_vtk

JaredCrean2 · JaredCrean2 · commit efcb637cf7b8 · 2018-12-13T09:07:29.000-05:00
diff --git a/cmake/FindSimModSuite.cmake b/cmake/FindSimModSuite.cmake
@@ -74,13 +74,14 @@ string(REGEX REPLACE
   "${SIM_VERSION}")
 
 set(MIN_VALID_SIM_VERSION 11.0.170826)
-set(MAX_VALID_SIM_VERSION 12.0.180811)
+set(MAX_VALID_SIM_VERSION 12.0.181124)
 if( (SIM_DOT_VERSION VERSION_LESS MIN_VALID_SIM_VERSION) OR
     (SIM_DOT_VERSION VERSION_GREATER MAX_VALID_SIM_VERSION) )
   MESSAGE(FATAL_ERROR 
     "invalid Simmetrix version: ${SIM_DOT_VERSION}, \
     valid versions are ${MIN_VALID_SIM_VERSION} to ${MAX_VALID_SIM_VERSION}")
 endif()
+message(STATUS "Building with SimModSuite ${SIM_DOT_VERSION}")
 
 set(SIMMODSUITE_LIBS "")
 
@@ -138,11 +139,9 @@ set(SIM_CORE_LIB_NAMES
 
 simLibCheck("${SIM_CORE_LIB_NAMES}" TRUE)
 
-if (SIM_PARASOLID OR SIM_ACIS)
-  if (UNIX AND NOT APPLE)
-    find_package(Threads REQUIRED)
-    set(SIMMODSUITE_LIBS ${SIMMODSUITE_LIBS} ${CMAKE_THREAD_LIBS_INIT})
-  endif()
+if (UNIX AND NOT APPLE)
+  find_package(Threads REQUIRED)
+  set(SIMMODSUITE_LIBS ${SIMMODSUITE_LIBS} ${CMAKE_THREAD_LIBS_INIT})
 endif()
 
 include(FindPackageHandleStandardArgs)
diff --git a/phasta/CMakeLists.txt b/phasta/CMakeLists.txt
@@ -23,7 +23,7 @@ set(SOURCES
   phiotimer.cc
 )
 
-if(ENABLE_SIMMETRIX AND SIMMODSUITE_SimAdvMeshing_FOUND)
+if(ENABLE_SIMMETRIX)
   if(SIM_DOT_VERSION VERSION_GREATER 12.0.180605)
     set(SOURCES ${SOURCES} splitMeshOnGFace_2arg.cpp)
   else()
@@ -70,6 +70,11 @@ set(HEADERS
 # Add the ph library
 add_library(ph ${SOURCES})
 
+# Add the SimAdvMeshing flag
+if(SIMMODSUITE_SimAdvMeshing_FOUND) # simmetrix enabled
+  target_compile_definitions(ph PRIVATE -DHAVE_SIMADVMESHING)
+endif()
+
 #determine which timer to use based on the target system and compiler
 if(CMAKE_SYSTEM_NAME MATCHES BlueGeneQ*)
   add_definitions(-DUSE_PCU_TIME)
diff --git a/phasta/phMeshQuality.cc b/phasta/phMeshQuality.cc
@@ -15,9 +15,9 @@
 #include <SimModel.h>
 #include <SimPartitionedMesh.h>
 #include <SimMeshTools.h>
-//#ifdef HAVE_SIMADVMESHING
-#include <SimAdvMeshing.h>
-//#endif
+#ifdef HAVE_SIMADVMESHING
+  #include <SimAdvMeshing.h>
+#endif
 #endif
 
 #include <PCU.h>
@@ -143,7 +143,7 @@ void core_measure_mesh (double x1[], double x2[], double x3[], int numnp,
     /* not support other mesh region type */
     if (m->getType(e) != apf::Mesh::TET)
       continue;
-#ifdef HAVE_SIMMETRIX
+#ifdef HAVE_SIMADVMESHING
     if (EN_isBLEntity(reinterpret_cast<pEntity>(e)))
       continue;
 #endif
@@ -156,7 +156,7 @@ void core_measure_mesh (double x1[], double x2[], double x3[], int numnp,
 
 // measure mesh face in layered mesh
   minfq = 1.0;
-#ifdef HAVE_SIMMETRIX
+#ifdef HAVE_SIMADVMESHING
   if (in.simmetrixMesh == 1) {
 // get simmetrix mesh
     apf::MeshSIM* apf_msim = dynamic_cast<apf::MeshSIM*>(m);
diff --git a/phasta/phOutput.cc b/phasta/phOutput.cc
@@ -32,20 +32,21 @@ static void getCounts(Output& o)
 
 static void checkLoadBalance(Output& o)
 {
-  int sumOwnedNodes = PCU_Add_Int(o.nOwnedNodes);
-  double vlbratio = o.nOverlapNodes * PCU_Comm_Peers() / (double) sumOwnedNodes;
+  long sumOwnedNodes = PCU_Add_Long(o.nOwnedNodes);
+  long sumAllNodes = PCU_Add_Long(o.nOverlapNodes);
+  double avgNodes = static_cast<double>(sumAllNodes) / PCU_Comm_Peers();
+  double vlbratio = o.nOverlapNodes / avgNodes;
   double vlbratio_max = PCU_Max_Double(vlbratio);
   if (!PCU_Comm_Self())
     lion_oprint(1,"max vertex load imbalance of partitioned mesh = %f\n", vlbratio_max);
-
-  int sumAllNodes = PCU_Add_Int(o.nOverlapNodes);
   if (!PCU_Comm_Self())
     lion_oprint(1,"ratio of sum of all vertices to sum of owned vertices = %f\n", sumAllNodes / (double) sumOwnedNodes);
 
   int dim = o.mesh->getDimension();
   int numElms = o.mesh->count(dim);
-  int sumElms = PCU_Add_Int(numElms);
-  double elbratio = numElms * PCU_Comm_Peers() / (double) sumElms;
+  long sumElms = PCU_Add_Long(numElms);
+  double avgElms = static_cast<double>(sumElms) / PCU_Comm_Peers();
+  double elbratio = numElms / avgElms;
   double elbratio_max = PCU_Max_Double(elbratio);
   if (!PCU_Comm_Self())
     lion_oprint(1,"max region (3D) or face (2D) load imbalance of partitioned mesh = %f\n", elbratio_max);
diff --git a/test/measureAnisoStats.cc b/test/measureAnisoStats.cc
@@ -14,7 +14,9 @@
 #include <gmi_sim.h>
 #include <phastaChef.h>
 #include <SimPartitionedMesh.h>
-#include <SimAdvMeshing.h>
+#ifdef HAVE_SIMADVMESHING
+  #include <SimAdvMeshing.h>
+#endif
 #endif
 
 #include <stdlib.h>
@@ -58,7 +60,9 @@ int main(int argc, char** argv)
   SimModel_start();
   Sim_readLicenseFile(0);
   SimPartitionedMesh_start(0, 0);
+#ifdef HAVE_SIMADVMESHING
   SimAdvMeshing_start();
+#endif
   gmi_sim_start();
   gmi_register_sim();
 #endif
@@ -77,7 +81,9 @@ int main(int argc, char** argv)
 
 #ifdef HAVE_SIMMETRIX
   gmi_sim_stop();
+#ifdef HAVE_SIMADVMESHING
   SimAdvMeshing_stop();
+#endif
   SimPartitionedMesh_stop();
   SimModel_stop();
   Sim_unregisterAllKeys();
@@ -239,7 +245,7 @@ void getStats(
   apf::writeVtkFiles(ssm.str().c_str(), m);
 
 // measure the triangular mesh face in the BL mesh
-#ifdef HAVE_SIMMETRIX
+#ifdef HAVE_SIMADVMESHING
   if (ph::mesh_has_ext(meshFile, "sms")) {
 // get simmetrix mesh
     apf::MeshSIM* apf_msim = dynamic_cast<apf::MeshSIM*>(m);
diff --git a/test/testing.cmake b/test/testing.cmake
@@ -69,7 +69,7 @@ if(ENABLE_SIMMETRIX AND SIM_PARASOLID AND SIMMODSUITE_SimAdvMeshing_FOUND)
     WORKING_DIRECTORY ${MDIR})
 endif()
 
-if(ENABLE_SIMMETRIX AND SIM_PARASOLID)
+if(ENABLE_SIMMETRIX AND SIM_PARASOLID AND SIMMODSUITE_SimAdvMeshing_FOUND)
   if(SIM_DOT_VERSION VERSION_GREATER 12.0.171000)
     set(MDIR ${MESHES}/faceExtrusion)
     mpi_test(rm_extrusion 1
@@ -113,7 +113,7 @@ if(ENABLE_SIMMETRIX AND SIM_PARASOLID)
        WORKING_DIRECTORY ${MDIR})
     endif()
   endif()
-endif(ENABLE_SIMMETRIX AND SIM_PARASOLID)
+endif(ENABLE_SIMMETRIX AND SIM_PARASOLID AND SIMMODSUITE_SimAdvMeshing_FOUND)
 
 set(MDIR ${MESHES}/phasta/loopDriver)
 if(ENABLE_SIMMETRIX AND PCU_COMPRESS AND SIM_PARASOLID
