Author: kraftche Date: 2007-07-17 16:22:01 -0500 (Tue, 17 Jul 2007) New Revision: 1210 Modified: MOAB/trunk/tools/dagmc/DagMC.cpp MOAB/trunk/tools/dagmc/Makefile.am MOAB/trunk/tools/dagmc/cgm2moab.cc MOAB/trunk/tools/dagmc/main.cc Log: o Change DagMC and other tools to use new method for initializing ACIS in CGM - now works when using libicubitNN.so w/out CGM ACIS source or headers. o Fix build of test_geom w/ CGM support enabled Modified: MOAB/trunk/tools/dagmc/DagMC.cpp =================================================================== --- MOAB/trunk/tools/dagmc/DagMC.cpp 2007-07-17 21:20:35 UTC (rev 1209) +++ MOAB/trunk/tools/dagmc/DagMC.cpp 2007-07-17 21:22:01 UTC (rev 1210) @@ -6,9 +6,8 @@ #include "MBGeomUtil.hpp" #ifdef CGM +#include "InitCGMA.hpp" #include "CGMApp.hpp" -#include "AcisQueryEngine.hpp" -#include "AcisModifyEngine.hpp" #include "CubitDefines.h" #include "GeometryQueryTool.hpp" #include "CubitVector.hpp" @@ -762,9 +761,8 @@ #ifdef CGM // initialize cgm - CGMApp::instance()->startup( 0, NULL ); - AcisQueryEngine::instance(); - AcisModifyEngine::instance(); + InitCGMA::initialize_cgma(); + InitCGMA::initialize_engine("ACIS"); CGMApp::instance()->attrib_manager()->set_all_auto_read_flags(true); CGMApp::instance()->attrib_manager()->set_all_auto_actuate_flags(true); CubitStatus s = GeometryQueryTool::instance()->import_solid_model( scfile.c_str(), "ACIS_SAT"); Modified: MOAB/trunk/tools/dagmc/Makefile.am =================================================================== --- MOAB/trunk/tools/dagmc/Makefile.am 2007-07-17 21:20:35 UTC (rev 1209) +++ MOAB/trunk/tools/dagmc/Makefile.am 2007-07-17 21:22:01 UTC (rev 1210) @@ -36,6 +36,6 @@ TESTS = test_geom check_PROGRAMS = $(TESTS) test_geom_SOURCES = test_geom.cc -test_geom_LDADD = libdagmc.la $(top_builddir)/libMOAB.la +test_geom_LDADD = libdagmc.la $(top_builddir)/libMOAB.la $(CGM_LIBS_LTFLAGS) $(CGM_LIBS_LINK) Modified: MOAB/trunk/tools/dagmc/cgm2moab.cc =================================================================== --- MOAB/trunk/tools/dagmc/cgm2moab.cc 2007-07-17 21:20:35 UTC (rev 1209) +++ MOAB/trunk/tools/dagmc/cgm2moab.cc 2007-07-17 21:22:01 UTC (rev 1210) @@ -1,6 +1,3 @@ -#include "AcisQueryEngine.hpp" -#include "AcisModifyEngine.hpp" -#include "CGMApp.hpp" #include "GeometryQueryTool.hpp" #include "GeometryQueryEngine.hpp" #include "ModelQueryEngine.hpp" Modified: MOAB/trunk/tools/dagmc/main.cc =================================================================== --- MOAB/trunk/tools/dagmc/main.cc 2007-07-17 21:20:35 UTC (rev 1209) +++ MOAB/trunk/tools/dagmc/main.cc 2007-07-17 21:22:01 UTC (rev 1210) @@ -1,6 +1,5 @@ #include "GeometryQueryTool.hpp" -#include "AcisQueryEngine.hpp" -#include "AcisModifyEngine.hpp" +#include "InitCGMA.hpp" #include "CGMApp.hpp" #include "MBCore.hpp" #include "cgm2moab.hpp" @@ -114,9 +113,8 @@ // Initialize CGM - CGMApp::instance()->startup( 0, NULL ); - AcisQueryEngine::instance(); - AcisModifyEngine::instance(); + InitCGMA::initialize_cgma(); + InitCGMA::initialize_engine("ACIS"); if (actuate_attribs) { CGMApp::instance()->attrib_manager()->set_all_auto_read_flags( actuate_attribs ); CGMApp::instance()->attrib_manager()->set_all_auto_actuate_flags( actuate_attribs );