[cgma-dev] r6004 - in cgm: branches/merge-cubit14.0 branches/merge-cubit14.0/geom branches/merge-cubit14.0/geom/OCC branches/merge-cubit14.0/geom/facet branches/merge-cubit14.0/geom/virtual branches/merge-cubit14.0/itaps branches/merge-cubit14.0/itaps/SIDL trunk/geom/parallel

[janehu at mcs.anl.gov]

Author: janehu
Date: 2013-02-15 13:38:50 -0600 (Fri, 15 Feb 2013)
New Revision: 6004

Modified:
   cgm/branches/merge-cubit14.0/configure.ac
   cgm/branches/merge-cubit14.0/geom/GeometryQueryEngine.hpp
   cgm/branches/merge-cubit14.0/geom/GeometryQueryTool.cpp
   cgm/branches/merge-cubit14.0/geom/GeometryQueryTool.hpp
   cgm/branches/merge-cubit14.0/geom/OCC/OCCBody.cpp
   cgm/branches/merge-cubit14.0/geom/OCC/OCCQueryEngine.cpp
   cgm/branches/merge-cubit14.0/geom/OCC/OCCQueryEngine.hpp
   cgm/branches/merge-cubit14.0/geom/facet/FacetQueryEngine.hpp
   cgm/branches/merge-cubit14.0/geom/virtual/VirtualQueryEngine.hpp
   cgm/branches/merge-cubit14.0/itaps/Makefile.am
   cgm/branches/merge-cubit14.0/itaps/SIDL/Makefile
   cgm/branches/merge-cubit14.0/itaps/SIDL/common.make
   cgm/branches/merge-cubit14.0/itaps/SIDL/iGeom-SIDL-Defs.inc
   cgm/branches/merge-cubit14.0/itaps/iGeom.h
   cgm/trunk/geom/parallel/CABodies.cpp
   cgm/trunk/geom/parallel/CABodies.hpp
   cgm/trunk/geom/parallel/CGMReadParallel.cpp
Log:
Made changes to make mpi mode working, removed some warnings, passed make check with parallel build.

Modified: cgm/branches/merge-cubit14.0/configure.ac
===================================================================
--- cgm/branches/merge-cubit14.0/configure.ac	2013-02-14 17:20:57 UTC (rev 6003)
+++ cgm/branches/merge-cubit14.0/configure.ac	2013-02-15 19:38:50 UTC (rev 6004)
@@ -22,6 +22,8 @@
 AC_C_BIGENDIAN( [], [AM_CPPFLAGS="$AM_CPPFLAGS -DLITTLE_ENDIAN=BYTE_ORDER"] )
 FATHOM_COMPILER_FLAGS
 
+FATHOM_CHECK_CXX_WORKS([], [AC_MSG_ERROR([Cannot build without C++ compiler])])
+
 ################################################################################
 #                Fortran Stuff for ITAPS C bindings
 ################################################################################
@@ -142,7 +144,7 @@
     AC_LINK_IFELSE([AC_LANG_PROGRAM(
       [class AcisQueryEngine { public: static AcisQueryEngine* instance_; };],
       [AcisQueryEngine::instance_ = 0;])],
-      [CUBIT_LIBS="-L${CUBIT_BIN_DIR} -lcubiti$num"
+      [CUBIT_LIBS="-L${CUBIT_BIN_DIR} -lcubiti$num -lcubit_geom -lcubit_util"
        CUBIT_FILE=`expr x"$file" : x"$CUBIT_BIN_DIR/\(.*\)"`
        CUBIT_FILE="${CUBIT_BIN_DIR}/$CUBIT_FILE"
        AC_MSG_RESULT(yes)

Modified: cgm/branches/merge-cubit14.0/geom/GeometryQueryEngine.hpp
===================================================================
--- cgm/branches/merge-cubit14.0/geom/GeometryQueryEngine.hpp	2013-02-14 17:20:57 UTC (rev 6003)
+++ cgm/branches/merge-cubit14.0/geom/GeometryQueryEngine.hpp	2013-02-15 19:38:50 UTC (rev 6004)
@@ -180,6 +180,12 @@
                                    const CubitString &cubit_version,
                                    ModelExportOptions &export_options ) = 0;
     
+      virtual CubitStatus export_solid_model(
+                                   DLIList<TopologyBridge*>& bridge_list,
+                                   char*& p_buffer,
+                                   int& n_buffer_size,
+                                   bool b_export_buffer) = 0;
+
      //! Saves out a temporary geometry file.  Entities in list must all be 
      //! of same modeling engine.
      virtual CubitStatus save_temp_geom_file(
@@ -229,6 +235,15 @@
                                 DLIList<TopologyBridge*>& imported_entities,
                                 ModelImportOptions &import_options ) = 0;
 
+     virtual CubitStatus import_solid_model(DLIList<TopologyBridge*> &imported_entities,
+                                            const char* pBuffer,
+                                            const int n_buffer_size) = 0;
+
+     //O imported_entities
+     //O- List of top-level entities read from file
+     //I print_results