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

buildbot failure in cgm-occ-serstatrunk: failed shell test install
by cgma-dev＠mcs.anl.gov 09 Feb '13

09 Feb '13

1 0

buildbot failure in cgmtr-occ-par-sta: failed shell test install
by cgma-dev＠mcs.anl.gov 09 Feb '13

09 Feb '13

1 0

buildbot failure in cgm-occ-sertrunk: failed shell test install
by cgma-dev＠mcs.anl.gov 09 Feb '13

09 Feb '13

1 0

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

08 Feb '13

Author: iulian Date: 2013-02-08 18:21:46 -0600 (Fri, 08 Feb 2013) New Revision: 5988 Modified: cgm/trunk/itaps/testgeom.cc Log: in order for the CUBIT_MAJOR_API to be seen defined, config.h has to be included before iGeom.h in the test, too this mechanism is not good for meshkit, because meshkit should not look at the config.h from cgm, that one should not be installed, it is something that should be visible only by cgm build. this fix at least lets testgeom to pass Modified: cgm/trunk/itaps/testgeom.cc =================================================================== --- cgm/trunk/itaps/testgeom.cc 2013-02-08 22:28:04 UTC (rev 5987) +++ cgm/trunk/itaps/testgeom.cc 2013-02-09 00:21:46 UTC (rev 5988) @@ -15,6 +15,11 @@ * \brief testgeom, a unit test for the TSTT geometry interface * */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include "iGeom.h" #include <iostream> #include <set> @@ -26,6 +31,8 @@ #include <assert.h> #include <string.h> #include <math.h> + + #define CHECK( STR ) if (err != iBase_SUCCESS) return print_error( STR, err, geom, __FILE__, __LINE__ ) #define STRINGIFY(S) XSTRINGIFY(S)

1 0

r5984 - in cgm/trunk: . itaps
by janehu＠mcs.anl.gov 08 Feb '13

08 Feb '13

Author: janehu Date: 2013-02-08 13:07:14 -0600 (Fri, 08 Feb 2013) New Revision: 5984 Modified: cgm/trunk/configure.ac cgm/trunk/itaps/iGeom.h cgm/trunk/itaps/iGeom_CGMA.cc cgm/trunk/itaps/testgeom.cc Log: Made flag for cubit major and minor versions, changed in itaps for its usage, haven't tested if it passes tests. Just check in for Iulian's referance, in case he want to make any changes on top of it. Will do follow-up check on Monday. Modified: cgm/trunk/configure.ac =================================================================== --- cgm/trunk/configure.ac 2013-02-07 23:22:50 UTC (rev 5983) +++ cgm/trunk/configure.ac 2013-02-08 19:07:14 UTC (rev 5984) @@ -164,6 +164,8 @@ [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-07 23:22:50 UTC (rev 5983) +++ cgm/trunk/itaps/iGeom.h 2013-02-08 19:07:14 UTC (rev 5984) @@ -2678,9 +2678,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 +2700,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-07 23:22:50 UTC (rev 5983) +++ cgm/trunk/itaps/iGeom_CGMA.cc 2013-02-08 19:07:14 UTC (rev 5984) @@ -6094,9 +6094,11 @@ ITAPS_API void iGeom_reflectEnt( iGeom_Instance instance, /*inout*/ iBase_EntityHandle geom_entity,

1 0

r5983 - cgm/trunk
by iulian＠mcs.anl.gov 07 Feb '13

07 Feb '13

Author: iulian Date: 2013-02-07 17:22:50 -0600 (Thu, 07 Feb 2013) New Revision: 5983 Modified: cgm/trunk/configure.ac Log: cubit libs variable should contain (in ubuntu 12.04) all the libraries that are needed, with explicit dependency (golden linker rule). It has implications later in moab; so, I added cubit_util and cubit_geom, besides cubitiXX, which is looked for It is needed only for cubit 13 though; Hope it does not break cubit 12.2 builds Modified: cgm/trunk/configure.ac =================================================================== --- cgm/trunk/configure.ac 2013-02-07 19:40:08 UTC (rev 5982) +++ cgm/trunk/configure.ac 2013-02-07 23:22:50 UTC (rev 5983) @@ -144,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)

1 0

r5979 - cgm/branches/merge-cubit12.2/geom/OCC
by jain＠mcs.anl.gov 06 Feb '13

06 Feb '13

Author: jain Date: 2013-02-06 14:54:44 -0600 (Wed, 06 Feb 2013) New Revision: 5979 Added: cgm/branches/merge-cubit12.2/geom/OCC/occ_patches_6.5.3 Log: Adding patch to merge branch also Added: cgm/branches/merge-cubit12.2/geom/OCC/occ_patches_6.5.3 =================================================================== --- cgm/branches/merge-cubit12.2/geom/OCC/occ_patches_6.5.3 (rev 0) +++ cgm/branches/merge-cubit12.2/geom/OCC/occ_patches_6.5.3 2013-02-06 20:54:44 UTC (rev 5979) @@ -0,0 +1,541 @@ +--- a/src/BOP/BOP_FaceBuilder.cxx 2012-04-13 07:38:39.000000000 -0500 ++++ b/src/BOP/BOP_FaceBuilder.cxx 2012-09-25 12:32:16.000000000 -0500 +@@ -23,9 +23,15 @@ + #include <Geom_Surface.hxx> + #include <Geom_Curve.hxx> + ++#include <Geom2dInt_Geom2dCurveTool.hxx> ++ + #include <BRep_Builder.hxx> + #include <BRep_Tool.hxx> ++ ++#include <BRepLib.hxx> ++ + #include <BRepAdaptor_Surface.hxx> ++#include <BRepAdaptor_Curve2d.hxx> + + #include <TopAbs_Orientation.hxx> + +@@ -36,6 +42,9 @@ + #include <TopTools_ListOfShape.hxx> + #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx> + #include <TopTools_ListIteratorOfListOfShape.hxx> ++#include <TopTools_DataMapOfShapeShape.hxx> ++#include <TopTools_DataMapOfShapeListOfShape.hxx> ++#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx> + + #include <TopoDS.hxx> + #include <TopoDS_Face.hxx> +@@ -60,13 +69,8 @@ + #include <BOP_BuilderTools.hxx> + #include <BOP_ListIteratorOfListOfConnexityBlock.hxx> + #include <BOP_ConnexityBlock.hxx> ++#include <BRepBuilderAPI_Copy.hxx> + +-//modified by NIZNHY-PKV Wed Feb 29 10:04:56 2012t +-#include <TopTools_DataMapOfShapeShape.hxx> +-#include <TopTools_DataMapOfShapeListOfShape.hxx> +-#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx> +-#include <BRepAdaptor_Curve2d.hxx> +-#include <Geom2dInt_Geom2dCurveTool.hxx> + + static + Standard_Boolean IsGrowthWire(const TopoDS_Shape& theWire, +@@ -78,7 +82,6 @@ + Standard_Boolean IsInside(const TopoDS_Shape& theHole, + const TopoDS_Shape& theF2,

1 0

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

05 Feb '13

Author: iulian Date: 2013-02-05 22:14:56 -0600 (Tue, 05 Feb 2013) New Revision: 5975 Modified: cgm/trunk/Makefile.am cgm/trunk/itaps/Makefile.am Log: this should fix the cgm trunk / cubit 13.1 build with mpi itaps test partes works fine in parallel Modified: cgm/trunk/Makefile.am =================================================================== --- cgm/trunk/Makefile.am 2013-02-05 16:53:33 UTC (rev 5974) +++ cgm/trunk/Makefile.am 2013-02-06 04:14:56 UTC (rev 5975) @@ -45,7 +45,7 @@ geom/libcubit_geom.la \ util/libcubit_util.la else - CORE_CGM_LIBS = geom/libcubit_geom.la $(CGM_ll_LIB) + CORE_CGM_LIBS = $(CGM_ll_LIB) endif SUBDIRS = compat amendment util geom init . $(igeom_DIR) test cgm_apps Modified: cgm/trunk/itaps/Makefile.am =================================================================== --- cgm/trunk/itaps/Makefile.am 2013-02-05 16:53:33 UTC (rev 5974) +++ cgm/trunk/itaps/Makefile.am 2013-02-06 04:14:56 UTC (rev 5975) @@ -41,6 +41,7 @@ if USE_MPI AM_CPPFLAGS += -I$(top_srcdir)/geom/parallel -DUSE_MPI + libiGeom_la_LIBADD += $(top_builddir)/geom/parallel/libcubit_parallel.la endif libiGeom_la_SOURCES = \

1 0

r5974 - cgm/trunk
by janehu＠mcs.anl.gov 05 Feb '13

05 Feb '13

Author: janehu Date: 2013-02-05 10:53:33 -0600 (Tue, 05 Feb 2013) New Revision: 5974 Modified: cgm/trunk/Makefile.am Log: Synch trunk with merge-cubit12.2 makefile for cubit parallel build and testing. Passed parallel test. Modified: cgm/trunk/Makefile.am =================================================================== --- cgm/trunk/Makefile.am 2013-02-04 21:13:13 UTC (rev 5973) +++ cgm/trunk/Makefile.am 2013-02-05 16:53:33 UTC (rev 5974) @@ -45,7 +45,7 @@ geom/libcubit_geom.la \ util/libcubit_util.la else - CORE_CGM_LIBS = $(CGM_ll_LIB) + CORE_CGM_LIBS = geom/libcubit_geom.la $(CGM_ll_LIB) endif SUBDIRS = compat amendment util geom init . $(igeom_DIR) test cgm_apps

1 0

r5967 - cgm/trunk/geom/parallel
by janehu＠mcs.anl.gov 01 Feb '13

01 Feb '13

Author: janehu Date: 2013-02-01 12:19:53 -0600 (Fri, 01 Feb 2013) New Revision: 5967 Modified: cgm/trunk/geom/parallel/CABodies.cpp cgm/trunk/geom/parallel/CABodies.hpp cgm/trunk/geom/parallel/CGMParallelComm.cpp cgm/trunk/geom/parallel/CGMReadParallel.cpp cgm/trunk/geom/parallel/CGMReadParallel.hpp cgm/trunk/geom/parallel/Makefile.am cgm/trunk/geom/parallel/ProcData.hpp cgm/trunk/geom/parallel/TDParallel.cpp cgm/trunk/geom/parallel/TDParallel.hpp cgm/trunk/geom/parallel/test_sab.cpp Log: Update for parallel check with merge-cubit12.2 version codes. Modified: cgm/trunk/geom/parallel/CABodies.cpp =================================================================== --- cgm/trunk/geom/parallel/CABodies.cpp 2013-02-01 18:07:49 UTC (rev 5966) +++ cgm/trunk/geom/parallel/CABodies.cpp 2013-02-01 18:19:53 UTC (rev 5967) @@ -1,7 +1,6 @@ //- Class: CABodies //- Description: Cubit Attribute for a list of bodies the entity is part of. //- Author: Hong-Jun Kim -//- Checked By: Tim Tautges //- Version: #include "CABodies.hpp" @@ -28,8 +27,8 @@ CABodies::CABodies(RefEntity* new_attrib_owner, - CubitSimpleAttrib *csa_ptr) - : CubitAttrib(new_attrib_owner) + CubitSimpleAttrib *csa_ptr) + : CubitAttrib(new_attrib_owner) { assert ( csa_ptr != NULL ); if (DEBUG_FLAG(138)) @@ -39,19 +38,32 @@ (attribOwnerEntity ? attribOwnerEntity->id() : 0)); } - //initialize(); - DLIList<int*> *i_list = csa_ptr->int_data_list(); // first, the ints i_list->reset(); - int num_bodies = *(i_list->get_and_step()); - - // bodyID - int i; - for (i = num_bodies; i > 0; i--) - bodyUniqueId.append(*(i_list->get_and_step())); + m_interface = *(i_list->get_and_step()); // is interface + + m_uniqueID = *(i_list->get_and_step()); // unique ID + + // shared bodies + int num_list = *(i_list->get_and_step()); + for (int i = num_list; i > 0; i--) { + m_sharedBodies.append(*(i_list->get_and_step())); + } + + // shared procs

1 0