June 2011 - cgma-dev - mailman3.cels.anl.gov

r4965 - cgm/trunk
by hongjun＠mcs.anl.gov 08 Jun '11

08 Jun '11

Author: hongjun Date: 2011-06-08 09:24:27 -0500 (Wed, 08 Jun 2011) New Revision: 4965 Modified: cgm/trunk/configure.ac Log: o Parallel CGM is not supported for cubit-based geometry Modified: cgm/trunk/configure.ac =================================================================== --- cgm/trunk/configure.ac 2011-06-08 12:35:11 UTC (rev 4964) +++ cgm/trunk/configure.ac 2011-06-08 14:24:27 UTC (rev 4965) @@ -103,6 +103,13 @@ AC_HELP_STRING([--with-CUBIT=<dir>],[DEPRECATED. Use --with-cubit (small case)]), [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

1 0

Re: [cgma-dev] r4884 - in cgm/trunk: geom/OCC test
by Jane Hu 07 Jun '11

07 Jun '11

Thanks, James. I've just checked the two files in. Jane On Mon, Jun 6, 2011 at 2:08 PM, James Porter <jvporter(a)wisc.edu> wrote: > So I finally figured out (part of?) what's going on with the distcheck > errors. There are some missing files that never got added to this > commit: Line_1.brep and Line_2.brep. > > There may be other errors of course, so adding those might not fix > everything... > > On Thu, 2011-05-26 at 13:29 -0500, jiangtao_ma(a)yahoo.com wrote: > > Author: janehu > > Date: 2011-05-26 13:29:34 -0500 (Thu, 26 May 2011) > > New Revision: 4884 > > > > Modified: > > cgm/trunk/geom/OCC/OCCModifyEngine.cpp > > cgm/trunk/geom/OCC/OCCSurface.cpp > > cgm/trunk/test/Makefile.am > > cgm/trunk/test/modify.cpp > > Log: > > Made changes regarding webcut using sweep curve method that is a possible > bug that Yu Wenhui asked. Passed make distcheck. Testcase is in modify.cpp > > > > Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp > > =================================================================== > > --- cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2011-05-26 13:49:07 UTC > (rev 4883) > > +++ cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2011-05-26 18:29:34 UTC > (rev 4884) > > @@ -4442,19 +4442,17 @@ > > } > > } > > } > > - else //sheet body > > - { > > - TopoDS_Face* topoface = occ_surface->get_TopoDS_Face(); > > - TopAbs_Orientation ori = topoface->Orientation(); > > - topoface->Orientation(ori == TopAbs_FORWARD ? TopAbs_REVERSED : > > + } > > + if(!occ_shell || occ_shell->is_sheet()) //sheet body > > + { > > + TopoDS_Face* topoface = occ_surface->get_TopoDS_Face(); > > + TopAbs_Orientation ori = topoface->Orientation(); > > + topoface->Orientation(ori == TopAbs_FORWARD ? TopAbs_REVERSED : > > TopAbs_FORWARD); > > - occ_surface->set_TopoDS_Face(*topoface); > > - surface_list.append(occ_surface); > > - } > > + occ_surface->set_TopoDS_Face(*topoface); > > + surface_list.append(occ_surface); > > PRINT_INFO( "Modified volume\n" ); > > } > > - else > > - PRINT_WARNING( "Volume was not modified\n" ); > > } > > face_list = surface_list; > > return CUBIT_SUCCESS; > > @@ -4639,22 +4637,12 @@ > > CubitStatus OCCModifyEngine::get_sweepable_toposhape(OCCCurve*& curve, > > TopoDS_Shape& > toposhape)const > > { > > - DLIList<OCCLoop*> loops; > > - loops = curve->loops(); > > - if( loops.size()) //not a free curve > > - { > > - //copy the curve > > - Curve* c_curve = make_Curve(curve); > > - if(c_curve) > > - curve = CAST_TO(c_curve, OCCCurve); > > - else > > - { > > - PRINT_ERROR("Can't copy the curve for sweep.\n"); > > - return CUBIT_FAILURE; > > - } > > - } > > TopoDS_Edge *edge = curve->get_TopoDS_Edge( ); > > >

1 0

r4959 - cgm/trunk/test
by jiangtao_ma＠yahoo.com 07 Jun '11

07 Jun '11

Author: janehu Date: 2011-06-07 09:13:17 -0500 (Tue, 07 Jun 2011) New Revision: 4959 Added: cgm/trunk/test/Line_1.brep cgm/trunk/test/Line_2.brep Log: Added testcase for modify.cpp. Added: cgm/trunk/test/Line_1.brep =================================================================== --- cgm/trunk/test/Line_1.brep (rev 0) +++ cgm/trunk/test/Line_1.brep 2011-06-07 14:13:17 UTC (rev 4959) @@ -0,0 +1,36 @@ +DBRep_DrawableShape + +CASCADE Topology V1, (c) Matra-Datavision +Locations 0 +Curve2ds 0 +Curves 1 +1 0 0 0 0.91914503001805792 0 0.39391929857916769 +Polygon3D 0 +PolygonOnTriangulations 0 +Surfaces 0 +Triangulations 0 + +TShapes 3 +Ve +1e-07 +0 0 0 +0 0 + +0101101 +* +Ve +1e-07 +0.7 0 0.3 +0 0 + +0101101 +* +Ed + 1e-07 1 1 0 +1 1 0 0 0.761577310586391 +0 + +1101010 ++3 0 -2 0 * + ++1 0 \ No newline at end of file Added: cgm/trunk/test/Line_2.brep =================================================================== --- cgm/trunk/test/Line_2.brep (rev 0) +++ cgm/trunk/test/Line_2.brep 2011-06-07 14:13:17 UTC (rev 4959) @@ -0,0 +1,36 @@ +DBRep_DrawableShape + +CASCADE Topology V1, (c) Matra-Datavision

1 0

buildbot failure in cgm-distcheck: failed compile
by cgma-dev＠mcs.anl.gov 07 Jun '11

07 Jun '11

1 0

r4955 - in cgm/trunk: . cgm_apps cgm_apps/examples cgm_apps/examples/driverc++ cgm_apps/examples/facetdriver compat geom geom/ACIS geom/Cholla geom/OCC geom/facet geom/facetbool geom/parallel geom/testing geom/virtual init itaps itaps/SIDL m4 test util
by jvporter＠wisc.edu 06 Jun '11

06 Jun '11

Author: jvporter Date: 2011-06-06 14:31:09 -0500 (Mon, 06 Jun 2011) New Revision: 4955 Modified: cgm/trunk/ cgm/trunk/cgm_apps/ cgm/trunk/cgm_apps/examples/ cgm/trunk/cgm_apps/examples/driverc++/ cgm/trunk/cgm_apps/examples/facetdriver/ cgm/trunk/compat/ cgm/trunk/geom/ cgm/trunk/geom/ACIS/ cgm/trunk/geom/Cholla/ cgm/trunk/geom/OCC/ cgm/trunk/geom/facet/ cgm/trunk/geom/facetbool/ cgm/trunk/geom/parallel/ cgm/trunk/geom/testing/ cgm/trunk/geom/virtual/ cgm/trunk/init/ cgm/trunk/itaps/ cgm/trunk/itaps/SIDL/ cgm/trunk/m4/ cgm/trunk/test/ cgm/trunk/util/ Log: Add svn:ignore to various folders Property changes on: cgm/trunk ___________________________________________________________________ Modified: svn:ignore - configure Makefile.in depcomp config.guess config.sub ltmain.sh config.h.in autom4te.cache missing install-sh aclocal.m4 + configure Makefile.in Makefile depcomp libtool config.guess config.sub config.log config.status config.lt ltmain.sh config.h.in config.h autom4te.cache missing install-sh aclocal.m4 stamp-* cgm.make Property changes on: cgm/trunk/cgm_apps ___________________________________________________________________ Modified: svn:ignore - Makefile.in + Makefile.in Makefile Property changes on: cgm/trunk/cgm_apps/examples ___________________________________________________________________

1 0

Re: [cgma-dev] r4884 - in cgm/trunk: geom/OCC test
by James Porter 06 Jun '11

06 Jun '11

So I finally figured out (part of?) what's going on with the distcheck errors. There are some missing files that never got added to this commit: Line_1.brep and Line_2.brep. There may be other errors of course, so adding those might not fix everything... On Thu, 2011-05-26 at 13:29 -0500, jiangtao_ma(a)yahoo.com wrote: > Author: janehu > Date: 2011-05-26 13:29:34 -0500 (Thu, 26 May 2011) > New Revision: 4884 > > Modified: > cgm/trunk/geom/OCC/OCCModifyEngine.cpp > cgm/trunk/geom/OCC/OCCSurface.cpp > cgm/trunk/test/Makefile.am > cgm/trunk/test/modify.cpp > Log: > Made changes regarding webcut using sweep curve method that is a possible bug that Yu Wenhui asked. Passed make distcheck. Testcase is in modify.cpp > > Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp > =================================================================== > --- cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2011-05-26 13:49:07 UTC (rev 4883) > +++ cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2011-05-26 18:29:34 UTC (rev 4884) > @@ -4442,19 +4442,17 @@ > } > } > } > - else //sheet body > - { > - TopoDS_Face* topoface = occ_surface->get_TopoDS_Face(); > - TopAbs_Orientation ori = topoface->Orientation(); > - topoface->Orientation(ori == TopAbs_FORWARD ? TopAbs_REVERSED : > + } > + if(!occ_shell || occ_shell->is_sheet()) //sheet body > + { > + TopoDS_Face* topoface = occ_surface->get_TopoDS_Face(); > + TopAbs_Orientation ori = topoface->Orientation(); > + topoface->Orientation(ori == TopAbs_FORWARD ? TopAbs_REVERSED : > TopAbs_FORWARD); > - occ_surface->set_TopoDS_Face(*topoface); > - surface_list.append(occ_surface); > - } > + occ_surface->set_TopoDS_Face(*topoface); > + surface_list.append(occ_surface); > PRINT_INFO( "Modified volume\n" ); > } > - else > - PRINT_WARNING( "Volume was not modified\n" ); > } > face_list = surface_list; > return CUBIT_SUCCESS; > @@ -4639,22 +4637,12 @@ > CubitStatus OCCModifyEngine::get_sweepable_toposhape(OCCCurve*& curve, > TopoDS_Shape& toposhape)const > { > - DLIList<OCCLoop*> loops; > - loops = curve->loops(); > - if( loops.size()) //not a free curve > - { > - //copy the curve > - Curve* c_curve = make_Curve(curve); > - if(c_curve) > - curve = CAST_TO(c_curve, OCCCurve); > - else > - { > - PRINT_ERROR("Can't copy the curve for sweep.\n"); > - return CUBIT_FAILURE; > - } > - } > TopoDS_Edge *edge = curve->get_TopoDS_Edge( );

1 0

r4953 - cgm/trunk/itaps
by jvporter＠wisc.edu 06 Jun '11

06 Jun '11

Author: jvporter Date: 2011-06-06 13:57:55 -0500 (Mon, 06 Jun 2011) New Revision: 4953 Modified: cgm/trunk/itaps/iBase.h Log: Update iBase.h to latest version Modified: cgm/trunk/itaps/iBase.h =================================================================== --- cgm/trunk/itaps/iBase.h 2011-06-06 18:13:39 UTC (rev 4952) +++ cgm/trunk/itaps/iBase.h 2011-06-06 18:57:55 UTC (rev 4953) @@ -1,91 +1,173 @@ #ifndef _ITAPS_iBase #define _ITAPS_iBase -#ifdef __cplusplus +/***************************************************************************//** + * \ingroup VersionNumbers + * \brief Compile time version number digits + * + * iBase maintains a major, minor and patch digit in its version number. + * Technically speaking, there is not much practical value in patch digit + * for an interface specification. A patch release is typically only used + * for bug fix releases. Although it is rare, sometimes a bug fix + * necessitates an API change. So, we define a patch digit for iMesh. + * + * Although each interface in ITAPS has been designed to support its own + * uniqe version numbers, apart from other ITAPS interfaces, as currently + * used, we require all ITAPS interfaces to use the same ITAPS-wide version + * number derived from the version number defined by these three digits. + ******************************************************************************/ +#define IBASE_VERSION_MAJOR 1 +#define IBASE_VERSION_MINOR 4 +#define IBASE_VERSION_PATCH 0 -extern "C" -{ -#endif +/***************************************************************************//** + * \ingroup VersionNumbers + * \brief Version Comparison + * + * Evaluates to true at CPP time if the version of iBase currently being + * compiled is greater than or equal to the version specified. + ******************************************************************************/ +#define IBASE_VERSION_GE(Maj,Min,Pat) \ + (((IBASE_VERSION_MAJOR==(Maj)) && (IBASE_VERSION_MINOR==(Min)) && (IBASE_VERSION_PATCH>=(Pat))) || \ + ((IBASE_VERSION_MAJOR==(Maj)) && (IBASE_VERSION_MINOR>(Min))) || \ + (IBASE_VERSION_MAJOR>(Maj))) +/***************************************************************************//** + * \ingroup VersionNumbers + * \brief Compose compile-time string represention of the version number + ******************************************************************************/ +#define IBASE_VERSION_STRING___(I,X,Y,Z) #I "_Version_" #X "." #Y "." #Z +#define IBASE_VERSION_STRING__(I,X,Y,Z) IBASE_VERSION_STRING___(I,X,Y,Z) +#define IBASE_VERSION_STRING_(I) IBASE_VERSION_STRING__(I,IBASE_VERSION_MAJOR,IBASE_VERSION_MINOR,IBASE_VERSION_PATCH) +#define IBASE_VERSION_STRING IBASE_VERSION_STRING_(iBase)

1 0

r4952 - cgm/trunk/geom/OCC
by jiangtao_ma＠yahoo.com 06 Jun '11

06 Jun '11

Author: janehu Date: 2011-06-06 13:13:39 -0500 (Mon, 06 Jun 2011) New Revision: 4952 Modified: cgm/trunk/geom/OCC/OCCBody.cpp cgm/trunk/geom/OCC/OCCModifyEngine.cpp Log: Fixed problem for mcnp2cad/hexlat2 problem and modify test. passed make check. Modified: cgm/trunk/geom/OCC/OCCBody.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCBody.cpp 2011-06-06 18:04:13 UTC (rev 4951) +++ cgm/trunk/geom/OCC/OCCBody.cpp 2011-06-06 18:13:39 UTC (rev 4952) @@ -210,27 +210,54 @@ void OCCBody::remove_simple_attribute_virt(CubitSimpleAttrib *csa) { + DLIList<Lump*> my_lumps; + my_lumps = lumps(); + DLIList<OCCShell*> shells = this->shells(); + DLIList<OCCSurface*> surfaces = this->my_sheet_surfaces(); + if (myTopoDSShape != NULL) { OCCAttribSet::remove_attribute(csa, *myTopoDSShape); + if(csa) + csa_list.remove(csa); + else + csa_list.clean_out(); return; } - if (csa == NULL) + else if (my_lumps.size() == 1) { - csa_list.clean_out(); + OCCLump* lump = CAST_TO(my_lumps.get(), OCCLump); + TopoDS_Solid* solid = lump->get_TopoDS_Solid(); + OCCAttribSet::remove_attribute(csa, *solid); + if(csa) + csa_list.remove(csa); + else + csa_list.clean_out(); return; } - for(int i = 0; i < csa_list.size(); i++) + else if(shells.size() == 1) { - CubitBoolean IsEqual = CubitSimpleAttrib::equivalent(csa_list.get(), csa); - if (IsEqual) - csa_list.remove(); - + TopoDS_Shell * shell = shells.get()->get_TopoDS_Shell(); + OCCAttribSet::remove_attribute(csa, *shell); + if(csa) + csa_list.remove(csa); else - csa_list.step(); + csa_list.clean_out();

1 0

buildbot failure in cgm-distcheck: failed compile
by cgma-dev＠mcs.anl.gov 06 Jun '11

06 Jun '11

1 0

buildbot failure in cgm-distcheck: failed compile
by cgma-dev＠mcs.anl.gov 05 Jun '11

05 Jun '11

1 0