September 2010 - cgma-dev - mailman3.cels.anl.gov

r4131 - in cgm/trunk: geom geom/OCC geom/parallel itaps
by hongjun＠mcs.anl.gov 20 Sep '10

20 Sep '10

Author: hongjun Date: 2010-09-20 16:30:31 -0500 (Mon, 20 Sep 2010) New Revision: 4131 Added: cgm/trunk/geom/parallel/CGMReadParallel.cpp cgm/trunk/geom/parallel/CGMReadParallel.hpp Removed: cgm/trunk/geom/parallel/ParallelGeomTool.cpp cgm/trunk/geom/parallel/ParallelGeomTool.hpp Modified: cgm/trunk/geom/GeometryQueryTool.cpp cgm/trunk/geom/OCC/OCCQueryEngine.cpp cgm/trunk/geom/OCC/OCCQueryEngine.hpp cgm/trunk/geom/parallel/CABodies.cpp cgm/trunk/geom/parallel/CABodies.hpp cgm/trunk/geom/parallel/CGMParallelComm.cpp cgm/trunk/geom/parallel/CGMParallelComm.hpp cgm/trunk/geom/parallel/CGMProcConfig.hpp cgm/trunk/geom/parallel/Makefile.am cgm/trunk/geom/parallel/TDParallel.cpp cgm/trunk/geom/parallel/TDParallel.hpp cgm/trunk/itaps/iGeom_CGMA.cc cgm/trunk/itaps/partest.cpp Log: o Parallel CGM is updated o itaps/partest.cpp is a parallel CGM test file through iGeom. It is built with "make check" command, but it is not in the list of TEST o OCC solid model import and export functions with buffer can now attach geomtry attributes o Parallel tool data, "TDParallel.*pp" is updated o Application specific atttribute "CABodies" having parallel "Body" distribution information is updated o geom/parallel/ParallelGeomTool.*pp is removed o geom/parallel/CGMReadParallel.*pp is added. It parses parallel command and calls functions for parallel distribution. It balances geometry too. o geom/parallel/CGMParallelComm.*pp distributes(broadcast, scatter) and communicate geometry in parallel Modified: cgm/trunk/geom/GeometryQueryTool.cpp =================================================================== --- cgm/trunk/geom/GeometryQueryTool.cpp 2010-09-20 19:32:31 UTC (rev 4130) +++ cgm/trunk/geom/GeometryQueryTool.cpp 2010-09-20 21:30:31 UTC (rev 4131) @@ -507,16 +507,34 @@ return result; } +// export entities to buffer CubitStatus GeometryQueryTool::export_solid_model(DLIList<RefEntity*>& ref_entity_list, char*& p_buffer, int& n_buffer_size, bool b_export_buffer) { + if (0 == gqeList.size()) + { + PRINT_WARNING("No active geometry engine.\n"); + return CUBIT_FAILURE; + } + + int i; + + if (ref_entity_list.size() == 0) { + // All bodies are to be exported + RefEntityFactory::instance()->ref_entity_list("Body", + ref_entity_list); + + // add free ref entities + get_free_ref_entities(ref_entity_list); + } + // Get TopologyBridges from RefEntities. - DLIList<TopologyBridge*> bridge_list(ref_entity_list.size()), ref_ent_bridges; + DLIList<TopologyBridge*> bridge_list(ref_entity_list.size()), + parent_bridges, ref_ent_bridges; ref_entity_list.reset(); - for( int i = ref_entity_list.size(); i--; ) - { + for( i = ref_entity_list.size(); i--; ) { ref_ent_bridges.clean_out(); TopologyEntity* topo_ptr = dynamic_cast<TopologyEntity*>(ref_entity_list.get_and_step()); if( topo_ptr ) @@ -524,12 +542,117 @@ bridge_list += ref_ent_bridges; } - bridge_list.reset(); - GeometryQueryEngine *gqe = bridge_list.get()->get_geometry_query_engine(); + // Get all child RefEntities + DLIList<RefEntity*> child_list; + RefEntity::get_all_child_ref_entities( ref_entity_list, child_list );

1 0

r4128 - cgm/trunk/geom/parallel
by hongjun＠mcs.anl.gov 20 Sep '10

20 Sep '10

Author: hongjun Date: 2010-09-20 13:20:47 -0500 (Mon, 20 Sep 2010) New Revision: 4128 Modified: cgm/trunk/geom/parallel/Makefile.am Log: o USE_MPI is defined to make paralle CGM built Modified: cgm/trunk/geom/parallel/Makefile.am =================================================================== --- cgm/trunk/geom/parallel/Makefile.am 2010-09-20 16:55:48 UTC (rev 4127) +++ cgm/trunk/geom/parallel/Makefile.am 2010-09-20 18:20:47 UTC (rev 4128) @@ -4,6 +4,10 @@ -I$(ACIS_DIR)/include \ $(MPI_INCLUDE) +if USE_MPI + AM_CPPFLAGS += -DUSE_MPI +endif + # The name of the library to build noinst_LTLIBRARIES = if BUILD_CGM

1 0

[PATCH] Make it possible to build with MPI
by Jed Brown 18 Sep '10

18 Sep '10

--- geom/parallel/Makefile.am | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/geom/parallel/Makefile.am b/geom/parallel/Makefile.am index 5124591..c275c3e 100644 --- a/geom/parallel/Makefile.am +++ b/geom/parallel/Makefile.am @@ -4,6 +4,10 @@ AM_CPPFLAGS += -I$(top_srcdir)/util \ -I$(ACIS_DIR)/include \ $(MPI_INCLUDE) +if USE_MPI + AM_CPPFLAGS += -DUSE_MPI +endif + # The name of the library to build noinst_LTLIBRARIES = if BUILD_CGM -- 1.7.2.3

1 0

r4124 - cgm/trunk
by kraftche＠cae.wisc.edu 03 Sep '10

03 Sep '10

Author: kraftche Date: 2010-09-03 13:41:34 -0500 (Fri, 03 Sep 2010) New Revision: 4124 Modified: cgm/trunk/cgm.make.in cgm/trunk/configure.ac Log: fix old, no longer substitued autoconf vars in cgm.make Modified: cgm/trunk/cgm.make.in =================================================================== --- cgm/trunk/cgm.make.in 2010-09-03 18:03:35 UTC (rev 4123) +++ cgm/trunk/cgm.make.in 2010-09-03 18:41:34 UTC (rev 4124) @@ -29,7 +29,7 @@ -I@abs_top_srcdir@/geom/Cholla # Pre-processor flags -CGM_DEFINES = @CANT_USE_STD@ @CANT_USE_STD_IO@ @TEMPLATE_DEFS_INCLUDED@ @HAVE_ACIS_DEF@ @HAVE_OCC_DEF@ +CGM_DEFINES = @CGM_DEFINES@ @HAVE_ACIS_DEF@ @HAVE_OCC_DEF@ CGM_INCLUDES = @CGM_EXT_INCLUDE@ $(CGM_INT_INCLUDE) CGM_CPPFLAGS = $(CGM_DEFINES) $(CGM_INCLUDES) Modified: cgm/trunk/configure.ac =================================================================== --- cgm/trunk/configure.ac 2010-09-03 18:03:35 UTC (rev 4123) +++ cgm/trunk/configure.ac 2010-09-03 18:41:34 UTC (rev 4124) @@ -68,8 +68,10 @@ FATHOM_CANT_USE_STD FATHOM_TEMPLATE_DEFS_INCLUDED -AM_CPPFLAGS="$AM_CPPFLAGS $CANT_USE_STD $CANT_USE_STD_IO $TEMPLATE_DEFS_INCLUDED" +CGM_DEFINES="$CANT_USE_STD $CANT_USE_STD_IO $TEMPLATE_DEFS_INCLUDED" +AM_CPPFLAGS="$AM_CPPFLAGS $CGM_DEFINES" AM_CONDITIONAL(INCLUDE_TEMPLATE_DEFS, test x$TEMPLATE_DEFS_INCLUDED != x) +AC_SUBST(CGM_DEFINES) ################################################################################ # Use Cubit shared libraries

1 0

r4119 - cgm/trunk/itaps
by kraftche＠cae.wisc.edu 02 Sep '10

02 Sep '10

Author: kraftche Date: 2010-09-02 12:41:39 -0500 (Thu, 02 Sep 2010) New Revision: 4119 Modified: cgm/trunk/itaps/Makefile.am Log: fix broken parallel build Modified: cgm/trunk/itaps/Makefile.am =================================================================== --- cgm/trunk/itaps/Makefile.am 2010-09-02 13:27:46 UTC (rev 4118) +++ cgm/trunk/itaps/Makefile.am 2010-09-02 17:41:39 UTC (rev 4119) @@ -34,6 +34,10 @@ -I$(top_srcdir)/geom \ -I$(top_srcdir)/init +if USE_MPI + AM_CPPFLAGS += -I$(top_srcdir)/geom/parallel -DUSE_MPI +endif + libiGeom_la_SOURCES = \ CGMAIterator.hpp \ CATag.hpp \ @@ -61,10 +65,9 @@ chaman_SOURCES = chaman.cc if USE_MPI -check_PROGRAMS += partest -partest_SOURCES = partest.cpp -partest_CPPFLAGS = $(testgeom_occ_CPPFLAGS) -AM_CPPFLAGS += -I$(top_srcdir)/geom/parallel + check_PROGRAMS += partest + partest_SOURCES = partest.cpp + partest_CPPFLAGS = $(testgeom_occ_CPPFLAGS) endif

1 0