April 2012 - cgma-dev - mailman3.cels.anl.gov

r5503 - cgm/trunk/itaps
by jvporter＠wisc.edu 27 Apr '12

27 Apr '12

Author: jvporter Date: 2012-04-27 12:02:58 -0500 (Fri, 27 Apr 2012) New Revision: 5503 Added: cgm/trunk/itaps/CGM_iGeom.h Modified: cgm/trunk/itaps/Makefile.am cgm/trunk/itaps/iGeom_CGMA.cc Log: Add CGM_iGeom.h for shim-mode and fix up some shim issues Added: cgm/trunk/itaps/CGM_iGeom.h =================================================================== --- cgm/trunk/itaps/CGM_iGeom.h (rev 0) +++ cgm/trunk/itaps/CGM_iGeom.h 2012-04-27 17:02:58 UTC (rev 5503) @@ -0,0 +1,15 @@ +#ifndef CGM_IGEOM_H +#define CGM_IGEOM_H + +#ifdef __cplusplus +extern "C" { +#endif + + void CGM_iGeom_register(); + +#ifdef __cplusplus +} +#endif + + +#endif Modified: cgm/trunk/itaps/Makefile.am =================================================================== --- cgm/trunk/itaps/Makefile.am 2012-04-27 16:41:10 UTC (rev 5502) +++ cgm/trunk/itaps/Makefile.am 2012-04-27 17:02:58 UTC (rev 5503) @@ -56,6 +56,8 @@ AM_CPPFLAGS += -DITAPS_SHIM libiGeom_la_SOURCES += \ iGeom_private.h + libiGeom_la_include_HEADERS += \ + CGM_iGeom.h else libiGeom_la_include_HEADERS += \ iGeom.h \ Modified: cgm/trunk/itaps/iGeom_CGMA.cc =================================================================== --- cgm/trunk/itaps/iGeom_CGMA.cc 2012-04-27 16:41:10 UTC (rev 5502) +++ cgm/trunk/itaps/iGeom_CGMA.cc 2012-04-27 17:02:58 UTC (rev 5503) @@ -33,6 +33,8 @@ #ifdef ITAPS_SHIM # include "iGeom_binding.h" +# include "iGeom_private.h" +# include "CGM_iGeom.h" # define ITAPS_API static #else # include "iGeom.h"

1 0

r5487 - cgm/branches/merge-cubit13.1/geom/OCC
by jiangtao_ma＠yahoo.com 19 Apr '12

19 Apr '12

Author: janehu Date: 2012-04-19 11:14:17 -0500 (Thu, 19 Apr 2012) New Revision: 5487 Modified: cgm/branches/merge-cubit13.1/geom/OCC/OCCModifyEngine.cpp Log: Change to previous version since this case has been considered in codes above. Modified: cgm/branches/merge-cubit13.1/geom/OCC/OCCModifyEngine.cpp =================================================================== --- cgm/branches/merge-cubit13.1/geom/OCC/OCCModifyEngine.cpp 2012-04-19 16:12:14 UTC (rev 5486) +++ cgm/branches/merge-cubit13.1/geom/OCC/OCCModifyEngine.cpp 2012-04-19 16:14:17 UTC (rev 5487) @@ -1992,8 +1992,7 @@ OCCShell* orig_shell = (OCCShell*) (OCCQueryEngine::instance()->OccToCGM->find(k))->second; body = orig_shell->my_body(); } - else - body = (OCCBody*) (OCCQueryEngine::instance()->OccToCGM->find(k))->second; + //Solid and Compound case has been considered in the above cases. if(body) { body->get_simple_attribute(list);

1 0

r5486 - cgm/trunk/geom/OCC
by jiangtao_ma＠yahoo.com 19 Apr '12

19 Apr '12

Author: janehu Date: 2012-04-19 11:12:14 -0500 (Thu, 19 Apr 2012) New Revision: 5486 Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp Log: Polished from r5483 Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2012-04-18 20:49:28 UTC (rev 5485) +++ cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2012-04-19 16:12:14 UTC (rev 5486) @@ -1983,13 +1983,13 @@ OCCShell* orig_shell = (OCCShell*) (OCCQueryEngine::instance()->OccToCGM->find(k))->second; body = orig_shell->my_body(); } - else - body = (OCCBody*) (OCCQueryEngine::instance()->OccToCGM->find(k))->second; + //Solid and Compound case has been considered in the above cases. if(body) { + OCCBody* new_body = surf->my_body(); body->get_simple_attribute(list); for (int kk = 0; kk < list.size(); kk++) - surf->my_body()->append_simple_attribute_virt(list.get_and_step()); + new_body->append_simple_attribute_virt(list.get_and_step()); } } }

1 0

r5484 - cgm/branches/merge-cubit13.1/geom/OCC
by jiangtao_ma＠yahoo.com 18 Apr '12

18 Apr '12

Author: janehu Date: 2012-04-18 13:13:07 -0500 (Wed, 18 Apr 2012) New Revision: 5484 Modified: cgm/branches/merge-cubit13.1/geom/OCC/OCCModifyEngine.cpp Log: Added a fix for mcnp2cad/cone. Modified: cgm/branches/merge-cubit13.1/geom/OCC/OCCModifyEngine.cpp =================================================================== --- cgm/branches/merge-cubit13.1/geom/OCC/OCCModifyEngine.cpp 2012-04-18 18:07:10 UTC (rev 5483) +++ cgm/branches/merge-cubit13.1/geom/OCC/OCCModifyEngine.cpp 2012-04-18 18:13:07 UTC (rev 5484) @@ -1992,6 +1992,8 @@ OCCShell* orig_shell = (OCCShell*) (OCCQueryEngine::instance()->OccToCGM->find(k))->second; body = orig_shell->my_body(); } + else + body = (OCCBody*) (OCCQueryEngine::instance()->OccToCGM->find(k))->second; if(body) { body->get_simple_attribute(list);

1 0

r5483 - in cgm/trunk/geom: . OCC
by jiangtao_ma＠yahoo.com 18 Apr '12

18 Apr '12

Author: janehu Date: 2012-04-18 13:07:10 -0500 (Wed, 18 Apr 2012) New Revision: 5483 Modified: cgm/trunk/geom/GeometryModifyEngine.hpp cgm/trunk/geom/OCC/OCCModifyEngine.cpp Log: Added a fix for mcnp2cad/cone test. Modified: cgm/trunk/geom/GeometryModifyEngine.hpp =================================================================== --- cgm/trunk/geom/GeometryModifyEngine.hpp 2012-04-16 20:14:10 UTC (rev 5482) +++ cgm/trunk/geom/GeometryModifyEngine.hpp 2012-04-18 18:07:10 UTC (rev 5483) @@ -495,6 +495,7 @@ //- for some reason, the hollow operation did not go well, the output //- argument is assigned a NULL value and the function returns //- CUBIT_FAILURE. + virtual CubitStatus flip_normals( DLIList<Surface*>& face_list ) const = 0; //R CubitStatus //R-the result of the flip_normal operation: Success or Failure Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2012-04-16 20:14:10 UTC (rev 5482) +++ cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2012-04-18 18:07:10 UTC (rev 5483) @@ -1972,8 +1972,19 @@ if(list.size() == 0) { k = OCCQueryEngine::instance()->OCCMap->Find(orig_shape); - OCCSurface *orig_surf = (OCCSurface*) (OCCQueryEngine::instance()->OccToCGM->find(k))->second; - OCCBody* body = orig_surf->my_body(); + OCCBody* body = NULL; + if(orig_shape.ShapeType() == TopAbs_FACE) + { + OCCSurface *orig_surf = (OCCSurface*) (OCCQueryEngine::instance()->OccToCGM->find(k))->second; + body = orig_surf->my_body(); + } + else if(orig_shape.ShapeType() == TopAbs_SHELL) + { + OCCShell* orig_shell = (OCCShell*) (OCCQueryEngine::instance()->OccToCGM->find(k))->second; + body = orig_shell->my_body(); + } + else + body = (OCCBody*) (OCCQueryEngine::instance()->OccToCGM->find(k))->second; if(body) { body->get_simple_attribute(list);

1 0

r5481 - in cgm/branches/merge-cubit13.1: . itaps
by jiangtao_ma＠yahoo.com 13 Apr '12

13 Apr '12

Author: janehu Date: 2012-04-13 12:55:55 -0500 (Fri, 13 Apr 2012) New Revision: 5481 Modified: cgm/branches/merge-cubit13.1/configure.ac cgm/branches/merge-cubit13.1/itaps/CATag.cpp cgm/branches/merge-cubit13.1/itaps/CATag.hpp cgm/branches/merge-cubit13.1/itaps/Makefile.am cgm/branches/merge-cubit13.1/itaps/iBase.h cgm/branches/merge-cubit13.1/itaps/iGeom-Defs.inc.in cgm/branches/merge-cubit13.1/itaps/iGeom.h cgm/branches/merge-cubit13.1/itaps/iGeomError.cc cgm/branches/merge-cubit13.1/itaps/iGeomError.h cgm/branches/merge-cubit13.1/itaps/iGeom_CGMA.cc cgm/branches/merge-cubit13.1/itaps/iGeom_protos.h cgm/branches/merge-cubit13.1/itaps/testgeom.cc Log: Updates from trunk cgm for itaps. Modified: cgm/branches/merge-cubit13.1/configure.ac =================================================================== --- cgm/branches/merge-cubit13.1/configure.ac 2012-04-12 21:17:13 UTC (rev 5480) +++ cgm/branches/merge-cubit13.1/configure.ac 2012-04-13 17:55:55 UTC (rev 5481) @@ -10,8 +10,12 @@ [AM_INIT_AUTOMAKE([foreign -Wall])]) AC_DISABLE_SHARED +AC_ARG_ENABLE([fortran],[AC_HELP_STRING([--disable-fortran], + [No Fortran name mangling in ITAPS C headers])], + [ENABLE_FORTRAN=$enableval],[ENABLE_FORTRAN=yes]) + EXTRA_GNU_FLAGS="-Wall -pipe -pedantic" -FATHOM_CHECK_COMPILERS +FATHOM_CHECK_COMPILERS([yes],[yes],[$ENABLE_FORTRAN]) AC_PROG_LIBTOOL LIBS="-lm" AC_PROG_SED @@ -21,7 +25,7 @@ ################################################################################ # Fortran Stuff for ITAPS C bindings ################################################################################ -if test "x" != "x$FC"; then +if test "xyes" = "x$ENABLE_FORTRAN" && test "x" != "x$FC"; then AC_FC_WRAPPERS fi @@ -308,11 +312,11 @@ # Newer C++ compilers may not provide this backwards-compatibility # file. Check if it is present, and if not, use our own. ACIS_NEW_COMPAT_INC='-I${top_srcdir}/compat/new' -#if test "x$ACIS_DIR" != "xno"; then +if test "x$ACIS_DIR" != "xno"; then AC_LANG_PUSH(C++) -# AC_CHECK_HEADER([new.h],[],[ACIS_INCLUDES="$ACIS_INCLUDES $ACIS_NEW_COMPAT_INC"]) + AC_CHECK_HEADER([new.h],[],[ACIS_INCLUDES="$ACIS_INCLUDES $ACIS_NEW_COMPAT_INC"]) AC_LANG_POP(C++) -#fi +fi AC_SUBST(ACIS_DEFS) AC_SUBST(ACIS_DIR) @@ -387,6 +391,13 @@ AC_SUBST(USE_BABEL) AM_CONDITIONAL(USE_BABEL, [test "xno" != "x$USE_BABEL"]) +################################################################################ +# ITAPS shim +################################################################################ +AC_ARG_ENABLE([shim],[AC_HELP_STRING([--enable-shim], + [Enable ITAPS shim])],

1 0

r5474 - cgm/branches/merge-cubit13.1/geom/ACIS_SRC
by jiangtao_ma＠yahoo.com 10 Apr '12

10 Apr '12

Author: janehu Date: 2012-04-10 12:33:21 -0500 (Tue, 10 Apr 2012) New Revision: 5474 Modified: cgm/branches/merge-cubit13.1/geom/ACIS_SRC/AcisModifyEngine.cpp Log: Removed unnecessary functions in file. Modified: cgm/branches/merge-cubit13.1/geom/ACIS_SRC/AcisModifyEngine.cpp =================================================================== --- cgm/branches/merge-cubit13.1/geom/ACIS_SRC/AcisModifyEngine.cpp 2012-04-10 16:14:55 UTC (rev 5473) +++ cgm/branches/merge-cubit13.1/geom/ACIS_SRC/AcisModifyEngine.cpp 2012-04-10 17:33:21 UTC (rev 5474) @@ -7586,7 +7586,7 @@ } } BodySM* stitched_body = NULL; - CubitStatus stat = stitch_surfs(bodysm_list, stitched_body); + CubitStatus stat = stitch(bodysm_list, stitched_body, CUBIT_FALSE, 1e-6); if(stat && stitched_body != NULL) shell_bodies.append(stitched_body); } @@ -21104,59 +21104,6 @@ return CUBIT_SUCCESS; } -/* -CubitStatus AcisModifyEngine::stitch_surfs( - DLIList<BodySM*>& surf_bodies, - BodySM*& stitched_body)const -{ - stitched_body = NULL; - if (surf_bodies.size()==0) - return CUBIT_SUCCESS; - - if (surf_bodies.size()==1) - { - stitched_body = surf_bodies.get(); - return CUBIT_SUCCESS; - } - - BODY* tool_BODY = NULL; - BodySM * tool_body; - DLIList<FACE*> stitch_FACES; - for(int i=0; i < surf_bodies.size();i++) - { - tool_body = surf_bodies.get_and_step(); - tool_BODY = AcisQueryEngine::get_BODY( const_cast<BodySM*>(tool_body) ); - FACE *FACE_ptr = tool_BODY->lump()->shell()->first_face(); - stitch_FACES.append( FACE_ptr ); - } - - CubitStatus status; - //stitch FACEs together into one BODY - //they may not stitch into one single FACE... - - tool_BODY = NULL; - - FACE *dummy_FACE = NULL; -

1 0

r5473 - in cgm/branches/merge-cubit13.1/geom: OCC testing
by jiangtao_ma＠yahoo.com 10 Apr '12

10 Apr '12

Author: janehu Date: 2012-04-10 11:14:55 -0500 (Tue, 10 Apr 2012) New Revision: 5473 Modified: cgm/branches/merge-cubit13.1/geom/OCC/OCCQueryEngine.cpp cgm/branches/merge-cubit13.1/geom/testing/CreateGeometry.cpp cgm/branches/merge-cubit13.1/geom/testing/Makefile.am cgm/branches/merge-cubit13.1/geom/testing/cgm_test.cpp Log: Fixed the build issue for geom/testing directory, made testcases work. Modified: cgm/branches/merge-cubit13.1/geom/OCC/OCCQueryEngine.cpp =================================================================== --- cgm/branches/merge-cubit13.1/geom/OCC/OCCQueryEngine.cpp 2012-04-09 20:23:53 UTC (rev 5472) +++ cgm/branches/merge-cubit13.1/geom/OCC/OCCQueryEngine.cpp 2012-04-10 16:14:55 UTC (rev 5473) @@ -384,7 +384,9 @@ //do tessellation if(distance_tolerance == 0.0) - distance_tolerance = 0.01; + distance_tolerance = 0.01; + if(angle_tolerance == 0.0) + angle_tolerance = 5; double angle = CUBIT_PI * angle_tolerance/180; BRepAdaptor_Curve acurve(*Topo_Edge); GCPnts_TangentialDeflection *myMesh = Modified: cgm/branches/merge-cubit13.1/geom/testing/CreateGeometry.cpp =================================================================== --- cgm/branches/merge-cubit13.1/geom/testing/CreateGeometry.cpp 2012-04-09 20:23:53 UTC (rev 5472) +++ cgm/branches/merge-cubit13.1/geom/testing/CreateGeometry.cpp 2012-04-10 16:14:55 UTC (rev 5473) @@ -36,9 +36,9 @@ { CubitVector center(1, 2, 4); CubitVector axes[3] = { - CubitVector(1, 0, .2), - CubitVector(0, 1, .4), - CubitVector(0.1, 0, 1) + CubitVector(0.707, 0.707, 0), + CubitVector(-0.707, 0.707, 0), + CubitVector(0, 0, 1) }; CubitVector extension(3, 5, 7); @@ -48,10 +48,15 @@ printf("failed to make brick\n"); return 1; } - if(!cubit_box_identical(brick->bounding_box(), - CubitBox(CubitVector(-3.577819, -5.210785, -4.768732), - CubitVector(5.577819, 9.210785, 12.768732)), - GEOMETRY_RESABS*2.0, true)) + CubitBox comp_box(CubitVector(-4.656854, -3.656854, -3.), + CubitVector(6.656854, 7.656854, 11.)); + CubitBox bnd_box = brick->bounding_box(); + + bool identical = cubit_box_identical(bnd_box, comp_box, GEOMETRY_RESABS*2.0, true); + if (identical) + return 0; + + if( bnd_box < comp_box || bnd_box > comp_box*1.09) {

1 0

r5472 - cgm/branches/merge-cubit13.1
by jiangtao_ma＠yahoo.com 09 Apr '12

09 Apr '12

Author: janehu Date: 2012-04-09 15:23:53 -0500 (Mon, 09 Apr 2012) New Revision: 5472 Added: cgm/branches/merge-cubit13.1/README Modified: cgm/branches/merge-cubit13.1/configure.ac Log: Added a note for this branch. Added: cgm/branches/merge-cubit13.1/README =================================================================== --- cgm/branches/merge-cubit13.1/README (rev 0) +++ cgm/branches/merge-cubit13.1/README 2012-04-09 20:23:53 UTC (rev 5472) @@ -0,0 +1 @@ +This is code from merging the cubit13.1 code and Version12.2 code. Modified: cgm/branches/merge-cubit13.1/configure.ac =================================================================== --- cgm/branches/merge-cubit13.1/configure.ac 2012-04-09 19:53:35 UTC (rev 5471) +++ cgm/branches/merge-cubit13.1/configure.ac 2012-04-09 20:23:53 UTC (rev 5472) @@ -1,7 +1,7 @@ ############################################################################### # Standard Stuff ################################################################################ -AC_INIT(CGMA, 10.2.3) +AC_INIT(CGMA, 13.1) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([.]) AC_CANONICAL_SYSTEM @@ -131,78 +131,78 @@ export SHLIB_PATH export PATH pattern=["${CUBIT_BIN_DIR}/*cubiti[0-9][0-9].*"] -# for file in $pattern; do -# AC_MSG_CHECKING([for AcisQueryEngine::instance_ in $file]) -# num=[`expr X"$file" : X".*cubiti$[0-9][0-9]$\..*"`] -# LIBS="$old_LIBS -lcubiti$num" -# AC_LINK_IFELSE([AC_LANG_PROGRAM( -# [class AcisQueryEngine { public: static AcisQueryEngine* instance_; };], -# [AcisQueryEngine::instance_ = 0;])], -# [CUBIT_LIBS="-L${CUBIT_BIN_DIR} -lcubiti$num" -# CUBIT_FILE=`expr x"$file" : x"$CUBIT_BIN_DIR/$.*$"` -# CUBIT_FILE="${CUBIT_BIN_DIR}/$CUBIT_FILE" -# AC_MSG_RESULT(yes) -# break], -# [AC_MSG_RESULT(no)]) -# done + for file in $pattern; do + AC_MSG_CHECKING([for AcisQueryEngine::instance_ in $file]) + num=[`expr X"$file" : X".*cubiti$[0-9][0-9]$\..*"`] + LIBS="$old_LIBS -lcubiti$num" + AC_LINK_IFELSE([AC_LANG_PROGRAM( + [class AcisQueryEngine { public: static AcisQueryEngine* instance_; };], + [AcisQueryEngine::instance_ = 0;])], + [CUBIT_LIBS="-L${CUBIT_BIN_DIR} -lcubiti$num" + CUBIT_FILE=`expr x"$file" : x"$CUBIT_BIN_DIR/$.*$"` + CUBIT_FILE="${CUBIT_BIN_DIR}/$CUBIT_FILE" + AC_MSG_RESULT(yes) + break], + [AC_MSG_RESULT(no)])

1 0

r5471 - cgm/branches/merge-cubit13.1
by jiangtao_ma＠yahoo.com 09 Apr '12

09 Apr '12

Author: janehu Date: 2012-04-09 14:53:35 -0500 (Mon, 09 Apr 2012) New Revision: 5471 Removed: cgm/branches/merge-cubit13.1/aclocal.m4 cgm/branches/merge-cubit13.1/acsite.m4 cgm/branches/merge-cubit13.1/autom4te.cache/ cgm/branches/merge-cubit13.1/cgma-10.2.3/ cgm/branches/merge-cubit13.1/config.guess cgm/branches/merge-cubit13.1/config.h.in cgm/branches/merge-cubit13.1/config.sub cgm/branches/merge-cubit13.1/config_aux/ cgm/branches/merge-cubit13.1/configure cgm/branches/merge-cubit13.1/depcomp cgm/branches/merge-cubit13.1/install-sh cgm/branches/merge-cubit13.1/ltmain.sh cgm/branches/merge-cubit13.1/missing cgm/branches/merge-cubit13.1/temp Log: Deleted unnecessary files. Deleted: cgm/branches/merge-cubit13.1/aclocal.m4 =================================================================== --- cgm/branches/merge-cubit13.1/aclocal.m4 2012-04-09 19:47:32 UTC (rev 5470) +++ cgm/branches/merge-cubit13.1/aclocal.m4 2012-04-09 19:53:35 UTC (rev 5471) @@ -1,988 +0,0 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, -[m4_warning([this file was generated for autoconf 2.65. -You have another version of autoconf. It may work, but is not guaranteed to. -If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) - -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -# (This private macro should not be called outside this file.) -AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -]) - -# _AM_AUTOCONF_VERSION(VERSION) -# ----------------------------- -# aclocal traces this macro to find the Autoconf version. -# This is a private macro too. Using m4_define simplifies -# the logic in aclocal, which can simply ignore this definition. -m4_define([_AM_AUTOCONF_VERSION], [])

1 0