On 06/24/2011 05:36 PM, [email protected] wrote:
Author: hongjun Date: 2011-06-24 17:36:43 -0500 (Fri, 24 Jun 2011) New Revision: 5037
Modified: cgm/trunk/Makefile.am cgm/trunk/configure.ac cgm/trunk/geom/parallel/CGMParallelComm.cpp cgm/trunk/geom/parallel/CGMReadParallel.cpp cgm/trunk/geom/parallel/Makefile.am cgm/trunk/itaps/iGeom_CGMA.cc Log: o Parallel CGM is also supported for ACIS geometry kernel only with "READ_PARALLEL" option
Shouldn't this be read_delete, not read_parallel? Also, these options should be the same as what we use for MOAB... - tim
o Parallel codes are built when "parallel_build" is defined (also cubit library is used) o GeometryQueryTool::import(export)_solid_model" functions are changed to CubitCompat functions o Passes make check
Modified: cgm/trunk/Makefile.am =================================================================== --- cgm/trunk/Makefile.am 2011-06-24 19:11:43 UTC (rev 5036) +++ cgm/trunk/Makefile.am 2011-06-24 22:36:43 UTC (rev 5037) @@ -45,7 +45,7 @@ geom/libcubit_geom.la \ util/libcubit_util.la else - CORE_CGM_LIBS = geom/libcubit_geom.la + CORE_CGM_LIBS = geom/libcubit_geom.la $(CGM_ll_LIB) endif
SUBDIRS = compat util geom init . $(igeom_DIR) test cgm_apps geom/testing
Modified: cgm/trunk/configure.ac =================================================================== --- cgm/trunk/configure.ac 2011-06-24 19:11:43 UTC (rev 5036) +++ cgm/trunk/configure.ac 2011-06-24 22:36:43 UTC (rev 5037) @@ -104,12 +104,6 @@ [CUBIT_DIR="$withval" DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-cubit=\"${withval}\""])
-if test "x$CUBIT_DIR" != "xno"; then - if test "x$WITH_MPI" != "xno"; then - AC_MSG_ERROR("CGM from CUBIT shared library dosn't support parallel build. Use serial build.") - fi -fi - if test "x$CUBIT_DIR" == "xyes"; then AC_MSG_ERROR([Option --with-CUBIT without specifying Cubit directory.]) elif test "x$CUBIT_DIR" != "xno"; then
Modified: cgm/trunk/geom/parallel/CGMParallelComm.cpp =================================================================== --- cgm/trunk/geom/parallel/CGMParallelComm.cpp 2011-06-24 19:11:43 UTC (rev 5036) +++ cgm/trunk/geom/parallel/CGMParallelComm.cpp 2011-06-24 22:36:43 UTC (rev 5037) @@ -267,9 +267,11 @@ return CUBIT_SUCCESS; }
+#ifdef HAVE_OCC CubitStatus result = GeometryQueryTool::instance()->export_solid_model(ref_entity_list, pBuffer, n_buffer_size, b_write_buffer); RRA("Failed to write ref entities to buffer."); +#endif
if (b_write_buffer) m_currentPosition += n_buffer_size; return CUBIT_SUCCESS; @@ -285,9 +287,11 @@ #else if (n_buffer_size == 0) return CUBIT_SUCCESS;
-- ================================================================ "You will keep in perfect peace him whose mind is steadfast, because he trusts in you." Isaiah 26:3 Tim Tautges Argonne National Laboratory ([email protected]) (telecommuting from UW-Madison) phone: (608) 263-8485 1500 Engineering Dr. fax: (608) 263-4499 Madison, WI 53706