February 2013 - cgma-dev - mailman3.cels.anl.gov

r6006 - cgm/branches/merge-cubit14.0/itaps/SIDL
by janehu＠mcs.anl.gov 15 Feb '13

15 Feb '13

Author: janehu Date: 2013-02-15 13:46:42 -0600 (Fri, 15 Feb 2013) New Revision: 6006 Removed: cgm/branches/merge-cubit14.0/itaps/SIDL/common.make cgm/branches/merge-cubit14.0/itaps/SIDL/iGeom-SIDL-Defs.inc Log: Remove unnecessary files. Deleted: cgm/branches/merge-cubit14.0/itaps/SIDL/common.make =================================================================== --- cgm/branches/merge-cubit14.0/itaps/SIDL/common.make 2013-02-15 19:43:11 UTC (rev 6005) +++ cgm/branches/merge-cubit14.0/itaps/SIDL/common.make 2013-02-15 19:46:42 UTC (rev 6006) @@ -1,229 +0,0 @@ - - -LIBS = $(LTLIBS) -L$(BABEL_DIR)/lib -lsidl - -INCLUDES = -I$(BABEL_DIR)/include \ - -I$(builddir) -I$(srcdir) \ - -I$(igeom_srcdir) \ - -I$(igeom_builddir) \ - -I$(sidl_srcdir) \ - -I$(top_srcdir) \ - -I$(top_builddir) - -igeom_srcdir = $(sidl_srcdir)/.. -igeom_builddir = ../.. -sidl_srcdir = ../. -sidl_builddir = .. -srcdir = .././$(bdir) -top_srcdir = ../../.. - -pkgdatadir = $(datadir)/cgma -pkglibdir = $(libdir)/cgma -pkgincludedir = $(includedir)/cgma -top_builddir = ../../.. -builddir = . -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/bin/install -c -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = x86_64-unknown-linux-gnu -host_triplet = x86_64-unknown-linux-gnu -target_triplet = x86_64-unknown-linux-gnu -subdir = itaps/SIDL/$(bdir) -libLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(lib_LTLIBRARIES) - -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)

1 0

r6005 - in cgm/branches/merge-cubit14.0/itaps: . SIDL
by janehu＠mcs.anl.gov 15 Feb '13

15 Feb '13

Author: janehu Date: 2013-02-15 13:43:11 -0600 (Fri, 15 Feb 2013) New Revision: 6005 Removed: cgm/branches/merge-cubit14.0/itaps/SIDL/Makefile Modified: cgm/branches/merge-cubit14.0/itaps/iGeom.h Log: Change iGeom.h back, doesn't need the cubit flag. Deleted: cgm/branches/merge-cubit14.0/itaps/SIDL/Makefile =================================================================== --- cgm/branches/merge-cubit14.0/itaps/SIDL/Makefile 2013-02-15 19:38:50 UTC (rev 6004) +++ cgm/branches/merge-cubit14.0/itaps/SIDL/Makefile 2013-02-15 19:43:11 UTC (rev 6005) @@ -1,281 +0,0 @@ - - -MAKE_INC = iGeom-SIDL-Defs.inc -SIDL_FILES = iBase.sidl iGeom.sidl iGeom_SIDL.sidl -SIDL_FILES_PATH = $(srcdir)/iBase.sidl $(srcdir)/iGeom.sidl $(srcdir)/iGeom_SIDL.sidl -# SERVER_FILES = gserver/iBase_Error_Impl.cc \ -# gserver/iBase_Error_Impl.hh \ -# gserver/iGeom_SIDL_GeomSidl_Impl.cc \ -# gserver/iGeom_SIDL_GeomSidl_Impl.hh \ -# gserver/iGeom_Factory_Impl.cc -# SERVER_FILES_PATH = $(srcdir)/gserver/iBase_Error_Impl.cc \ -# $(srcdir)/gserver/iBase_Error_Impl.hh \ -# $(srcdir)/gserver/iGeom_SIDL_GeomSidl_Impl.cc \ -# $(srcdir)/gserver/iGeom_SIDL_GeomSidl_Impl.hh -SERVER_FILES = gserver/iGeom_SIDL_GeomSidl_Impl.cc \ - gserver/iGeom_SIDL_GeomSidl_Impl.hh \ - gserver/iGeom_Factory_Impl.cc -SERVER_FILES_PATH = $(srcdir)/gserver/iGeom_SIDL_GeomSidl_Impl.cc \ - $(srcdir)/gserver/iGeom_SIDL_GeomSidl_Impl.hh -SOURCE_FILES = $(SIDL_FILES) $(SERVER_FILES) -DIST_FILES = $(SOURCE_FILES) testgeom.cpp \ - gserver.make Cclient.make Fclient.make -INCLUDES = -I$(BABEL_DIR)/include -Igserver - -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ - -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL = /usr/bin/install -c -BABEL_DIR = -USE_BABEL = no -BABEL = $(BABEL_DIR)/bin/babel

1 0

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
by janehu＠mcs.anl.gov 15 Feb '13

15 Feb '13

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

1 0

r6001 - cgm/trunk/itaps
by iulian＠mcs.anl.gov 13 Feb '13

13 Feb '13

Author: iulian Date: 2013-02-13 11:19:42 -0600 (Wed, 13 Feb 2013) New Revision: 6001 Modified: cgm/trunk/itaps/iGeom.h Log: remove unused flags Modified: cgm/trunk/itaps/iGeom.h =================================================================== --- cgm/trunk/itaps/iGeom.h 2013-02-13 17:08:53 UTC (rev 6000) +++ cgm/trunk/itaps/iGeom.h 2013-02-13 17:19:42 UTC (rev 6001) @@ -63,9 +63,6 @@ extern "C" { #endif -#define CUBIT_MAJOR_API 13 -#define CUBIT_MINOR_API 1 - /**\brief Type used to store iGeom interface handle * * Type used to store iGeom interface handle

1 0

r5998 - cgm/trunk/geom
by janehu＠mcs.anl.gov 13 Feb '13

13 Feb '13

Author: janehu Date: 2013-02-13 11:00:27 -0600 (Wed, 13 Feb 2013) New Revision: 5998 Modified: cgm/trunk/geom/GeometryQueryTool.hpp Log: When doing cubit14.0, came across this and thought to remove it since it's not used and inaccurate. Modified: cgm/trunk/geom/GeometryQueryTool.hpp =================================================================== --- cgm/trunk/geom/GeometryQueryTool.hpp 2013-02-12 16:11:26 UTC (rev 5997) +++ cgm/trunk/geom/GeometryQueryTool.hpp 2013-02-13 17:00:27 UTC (rev 5998) @@ -16,8 +16,6 @@ #ifndef GEOMETRYQUERYTOOL_HPP #define GEOMETRYQUERYTOOL_HPP -#define CUBIT_12 3 - #include <stdio.h> #include <typeinfo> #include <list>

1 0

r5997 - cgm/trunk/itaps
by janehu＠mcs.anl.gov 12 Feb '13

12 Feb '13

Author: janehu Date: 2013-02-12 10:11:26 -0600 (Tue, 12 Feb 2013) New Revision: 5997 Modified: cgm/trunk/itaps/Makefile.am Log: Changed Makefile.am to let make check do partest when it's in the mpi mode. Passed make checks for both occ and cubit build. Modified: cgm/trunk/itaps/Makefile.am =================================================================== --- cgm/trunk/itaps/Makefile.am 2013-02-12 15:54:42 UTC (rev 5996) +++ cgm/trunk/itaps/Makefile.am 2013-02-12 16:11:26 UTC (rev 5997) @@ -42,6 +42,9 @@ if USE_MPI AM_CPPFLAGS += -I$(top_srcdir)/geom/parallel -DUSE_MPI libiGeom_la_LIBADD += $(top_builddir)/geom/parallel/libcubit_parallel.la + TESTS += partest + partest_SOURCES = partest.cpp + partest_CPPFLAGS = $(testgeom_occ_CPPFLAGS) endif libiGeom_la_SOURCES = \ @@ -89,13 +92,7 @@ copy_attrib_SOURCES = copy_attrib.cpp -if USE_MPI - check_PROGRAMS += partest - partest_SOURCES = partest.cpp - partest_CPPFLAGS = $(testgeom_occ_CPPFLAGS) -endif - # Automake doesn't seem to have a directory defined for # platform-dependent data (or include) files. So put # in $(libdir). Define a $(cfgdir) to get around automake's

1 0

r5996 - cgm/trunk/itaps
by janehu＠mcs.anl.gov 12 Feb '13

12 Feb '13

Author: janehu Date: 2013-02-12 09:54:42 -0600 (Tue, 12 Feb 2013) New Revision: 5996 Modified: cgm/trunk/itaps/iGeom.h cgm/trunk/itaps/iGeom_CGMA.cc cgm/trunk/itaps/testgeom.cc Log: Realized that this version is only cubit13.1 on cgm, the release flag itself will be enough for meshkit, and code doesn't need use cubit 12.2 and under. Modified: cgm/trunk/itaps/iGeom.h =================================================================== --- cgm/trunk/itaps/iGeom.h 2013-02-11 18:49:04 UTC (rev 5995) +++ cgm/trunk/itaps/iGeom.h 2013-02-12 15:54:42 UTC (rev 5996) @@ -2681,11 +2681,9 @@ */ void iGeom_reflectEnt( iGeom_Instance instance, iBase_EntityHandle geom_entity, -#if CUBIT_MAJOR_API == 13 double point_x, double point_y, double point_z, -#endif double plane_normal_x, double plane_normal_y, double plane_normal_z, @@ -2703,11 +2701,9 @@ */ void iGeom_scaleEnt( iGeom_Instance instance, iBase_EntityHandle geom_entity, -#if CUBIT_MAJOR_API == 13 double point_x, double point_y, double point_z, -#endif double scale_x, double scale_y, double scale_z, Modified: cgm/trunk/itaps/iGeom_CGMA.cc =================================================================== --- cgm/trunk/itaps/iGeom_CGMA.cc 2013-02-11 18:49:04 UTC (rev 5995) +++ cgm/trunk/itaps/iGeom_CGMA.cc 2013-02-12 15:54:42 UTC (rev 5996) @@ -6094,30 +6094,22 @@ ITAPS_API void iGeom_reflectEnt( iGeom_Instance instance, /*inout*/ iBase_EntityHandle geom_entity, -#if CUBIT_MAJOR_API == 13 /*in*/ double point_x, /*in*/ double point_y, /*in*/ double point_z, -#endif /*in*/ double plane_normal_x, /*in*/ double plane_normal_y, /*in*/ double plane_normal_z, int* err ) { CubitVector this_plane(plane_normal_x, plane_normal_y, plane_normal_z); -#if CUBIT_MAJOR_API == 13 CubitVector point(point_x, point_y, point_z); -#endif

1 0

MOAB 4.6.0 Released !
by Rajeev Jain 11 Feb '13

11 Feb '13

MOAB version 4.6.0 has been released. Available here: http://ftp.mcs.anl.gov/pub/fathom/moab-4.6.0.tar.gz Notable changes to this version are as follows: * Added new iMeshP extension function iMeshP_getCommunicator, converting fortran integer to MPI C communicator. * Various bug fixes and improvements of mbcoupler (parallel mesh to mesh transfer): handling of spectral elements, works in serial now, better tolerancing for point searches. * Major enhancements, efficiency improvements for NC data reader, including going mostly to a 2.5D representation, addition of a HOMME data reader, bug fixes in representing periodic meshes in parallel. * Added Interface::adjacencies_iterate, whose behavior is much like tag_iterate. * Removed deprecated functions from the Interface: (some overloaded variants of) query_interface, release_interface, tag_get_data, tag_set_data, tag_get_size. * Initial implementation of Damsel reader/writer. * Initial implementation of a GCRM data reader, and a better ReadTemplate class (skeleton for writing new readers). * Add new metadata and properties handling to DAGMC. * Support for 1D in structured mesh interface. * Alternative vtkMOABReaderNew & paraview plugin (in tools directory).

1 0

r5994 - cgm/trunk/itaps
by janehu＠mcs.anl.gov 11 Feb '13

11 Feb '13

Author: janehu Date: 2013-02-11 12:39:29 -0600 (Mon, 11 Feb 2013) New Revision: 5994 Modified: cgm/trunk/itaps/iGeom.h cgm/trunk/itaps/iGeom_CGMA.cc cgm/trunk/itaps/testgeom.cc Log: Added flag in itaps to enable compatibility with cubit12.2 and before. Passed parallel/serial occ/cubit builds and tests. Modified: cgm/trunk/itaps/iGeom.h =================================================================== --- cgm/trunk/itaps/iGeom.h 2013-02-11 18:39:25 UTC (rev 5993) +++ cgm/trunk/itaps/iGeom.h 2013-02-11 18:39:29 UTC (rev 5994) @@ -63,6 +63,9 @@ extern "C" { #endif +#define CUBIT_MAJOR_API 13 +#define CUBIT_MINOR_API 1 + /**\brief Type used to store iGeom interface handle * * Type used to store iGeom interface handle @@ -2678,9 +2681,11 @@ */ void iGeom_reflectEnt( iGeom_Instance instance, iBase_EntityHandle geom_entity, +#if CUBIT_MAJOR_API == 13 double point_x, double point_y, double point_z, +#endif double plane_normal_x, double plane_normal_y, double plane_normal_z, @@ -2698,9 +2703,11 @@ */ void iGeom_scaleEnt( iGeom_Instance instance, iBase_EntityHandle geom_entity, +#if CUBIT_MAJOR_API == 13 double point_x, double point_y, double point_z, +#endif double scale_x, double scale_y, double scale_z, Modified: cgm/trunk/itaps/iGeom_CGMA.cc =================================================================== --- cgm/trunk/itaps/iGeom_CGMA.cc 2013-02-11 18:39:25 UTC (rev 5993) +++ cgm/trunk/itaps/iGeom_CGMA.cc 2013-02-11 18:39:29 UTC (rev 5994) @@ -6094,22 +6094,30 @@ ITAPS_API void iGeom_reflectEnt( iGeom_Instance instance, /*inout*/ iBase_EntityHandle geom_entity, +#if CUBIT_MAJOR_API == 13 /*in*/ double point_x, /*in*/ double point_y, /*in*/ double point_z,

1 0

r5989 - in cgm/trunk: . itaps
by iulian＠mcs.anl.gov 09 Feb '13

09 Feb '13

Author: iulian Date: 2013-02-09 08:50:42 -0600 (Sat, 09 Feb 2013) New Revision: 5989 Modified: cgm/trunk/configure.ac cgm/trunk/itaps/iGeom.h cgm/trunk/itaps/iGeom_CGMA.cc cgm/trunk/itaps/testgeom.cc Log: revert to version 5983 to silence the buildbot, over the weekend. occ based builds need to work on cgm trunk, too. Modified: cgm/trunk/configure.ac =================================================================== --- cgm/trunk/configure.ac 2013-02-09 00:21:46 UTC (rev 5988) +++ cgm/trunk/configure.ac 2013-02-09 14:50:42 UTC (rev 5989) @@ -164,8 +164,6 @@ [CUBIT_CAT_DEFINES=-DACIS_TWEAK_TOOL_CAT; AC_MSG_RESULT([yes])], [CUBIT_CAT_DEFINES=; AC_MSG_RESULT([no])]) - AC_DEFINE_UNQUOTED([CUBIT_MAJOR_API], [13], [Cubit Version]) - AC_DEFINE_UNQUOTED([CUBIT_MINOR_API], [1], [Cubit Minor Version]) LIBS="$old_LIBS" LDFLAGS="$old_LDFLAGS" LD_LIBRARY_PATH="$old_LD_LIBRARY_PATH" Modified: cgm/trunk/itaps/iGeom.h =================================================================== --- cgm/trunk/itaps/iGeom.h 2013-02-09 00:21:46 UTC (rev 5988) +++ cgm/trunk/itaps/iGeom.h 2013-02-09 14:50:42 UTC (rev 5989) @@ -2678,11 +2678,9 @@ */ void iGeom_reflectEnt( iGeom_Instance instance, iBase_EntityHandle geom_entity, -#if CUBIT_MAJOR_API == 13 double point_x, double point_y, double point_z, -#endif double plane_normal_x, double plane_normal_y, double plane_normal_z, @@ -2700,11 +2698,9 @@ */ void iGeom_scaleEnt( iGeom_Instance instance, iBase_EntityHandle geom_entity, -#if CUBIT_MAJOR_API == 13 double point_x, double point_y, double point_z, -#endif double scale_x, double scale_y, double scale_z, Modified: cgm/trunk/itaps/iGeom_CGMA.cc =================================================================== --- cgm/trunk/itaps/iGeom_CGMA.cc 2013-02-09 00:21:46 UTC (rev 5988) +++ cgm/trunk/itaps/iGeom_CGMA.cc 2013-02-09 14:50:42 UTC (rev 5989) @@ -6094,11 +6094,9 @@ ITAPS_API void iGeom_reflectEnt( iGeom_Instance instance, /*inout*/ iBase_EntityHandle geom_entity,

1 0