[MOAB-dev] r2250 - MOAB/trunk/tools/dagmc

[kraftche at mcs.anl.gov]

Author: kraftche
Date: 2008-11-14 13:43:12 -0600 (Fri, 14 Nov 2008)
New Revision: 2250

Modified:
   MOAB/trunk/tools/dagmc/DagMC.cpp
   MOAB/trunk/tools/dagmc/Makefile.am
   MOAB/trunk/tools/dagmc/main.cc
Log:
update for changes to cgm.make.in and InitCGMA

Modified: MOAB/trunk/tools/dagmc/DagMC.cpp
===================================================================
--- MOAB/trunk/tools/dagmc/DagMC.cpp	2008-11-14 19:42:28 UTC (rev 2249)
+++ MOAB/trunk/tools/dagmc/DagMC.cpp	2008-11-14 19:43:12 UTC (rev 2250)
@@ -868,8 +868,7 @@
     
 #ifdef CGM
       // initialize cgm
-    InitCGMA::initialize_cgma();
-    InitCGMA::initialize_engine("ACIS");
+    InitCGMA::initialize_cgma("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	2008-11-14 19:42:28 UTC (rev 2249)
+++ MOAB/trunk/tools/dagmc/Makefile.am	2008-11-14 19:43:12 UTC (rev 2250)
@@ -19,7 +19,7 @@
 
 bin_PROGRAMS = cgm2moab
 cgm2moab_SOURCES = main.cc cubfile.c
-cgm2moab_LDFLAGS = $(CGM_LIBS_LTFLAGS)
+cgm2moab_LDFLAGS = $(CGM_LTFLAGS)
 cgm2moab_LDADD = libdagmc.la $(top_builddir)/libMOAB.la $(CGM_LIBS_LINK)
 cgm2moab_DEPENDENCIES = libdagmc.la $(top_builddir)/libMOAB.la
 dist_man1_MANS = cgm2moab.man
@@ -36,8 +36,8 @@
 TESTS = test_geom
 check_PROGRAMS = $(TESTS) pt_vol_test
 test_geom_SOURCES = test_geom.cc
-test_geom_LDADD = libdagmc.la $(top_builddir)/libMOAB.la $(CGM_LIBS_LTFLAGS)  $(CGM_LIBS_LINK)
+test_geom_LDADD = libdagmc.la $(top_builddir)/libMOAB.la $(CGM_LTFLAGS)  $(CGM_LIBS_LINK)
 
 pt_vol_test_SOURCES = pt_vol_test.cc
-pt_vol_test_LDADD = libdagmc.la $(top_builddir)/libMOAB.la $(CGM_LIBS_LTFLAGS)  $(CGM_LIBS_LINK)
+pt_vol_test_LDADD = libdagmc.la $(top_builddir)/libMOAB.la $(CGM_LTFLAGS)  $(CGM_LIBS_LINK)
 

Modified: MOAB/trunk/tools/dagmc/main.cc
===================================================================
--- MOAB/trunk/tools/dagmc/main.cc	2008-11-14 19:42:28 UTC (rev 2249)
+++ MOAB/trunk/tools/dagmc/main.cc	2008-11-14 19:43:12 UTC (rev 2250)
@@ -113,8 +113,7 @@
         
   
     // Initialize CGM
-  InitCGMA::initialize_cgma();
-  InitCGMA::initialize_engine("ACIS");
+  InitCGMA::initialize_cgma("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 );