[MOAB-dev] r2786 - in MOAB/trunk: . tools/dagmc
jiangtao_ma at yahoo.com
jiangtao_ma at yahoo.com
Tue Mar 31 14:20:45 CDT 2009
Author: janehu
Date: 2009-03-31 14:20:41 -0500 (Tue, 31 Mar 2009)
New Revision: 2786
Added:
MOAB/trunk/tools/dagmc/Makefile.am
Removed:
MOAB/trunk/tools/dagmc/Makefile.am
Modified:
MOAB/trunk/Makefile.am
MOAB/trunk/ReadCGM.cpp
MOAB/trunk/tools/dagmc/cub2h5m.cc
Log:
Fixed the build problem.
Modified: MOAB/trunk/Makefile.am
===================================================================
--- MOAB/trunk/Makefile.am 2009-03-31 15:56:19 UTC (rev 2785)
+++ MOAB/trunk/Makefile.am 2009-03-31 19:20:41 UTC (rev 2786)
@@ -83,7 +83,6 @@
if HAVE_CGM
INCLUDES += $(CGM_INCLUDES)
- CPPFLAGS += $(CGM_CPPFLAGS) -DCGM $(MOAB_CGM_DEFINES)
MOAB_EXTRA_SRCS += ReadCGM.cpp ReadCGM.hpp
libMOAB_la_LIBADD += $(CGM_LTFLAGS) $(CGM_LIBS_LINK)
LDADD += $(CGM_LTFLAGS)
Modified: MOAB/trunk/ReadCGM.cpp
===================================================================
--- MOAB/trunk/ReadCGM.cpp 2009-03-31 15:56:19 UTC (rev 2785)
+++ MOAB/trunk/ReadCGM.cpp 2009-03-31 19:20:41 UTC (rev 2786)
@@ -98,14 +98,14 @@
MBErrorCode ReadCGM::load_file(const char *cgm_file_name,
MBEntityHandle& file_set,
const FileOptions& opts,
- const char* name,
+ const char* name_subset,
const int*, const int)
{
// blocks_to_load and num_blocks are ignored.
MBErrorCode rval;
file_set = 0;
- if (name) {
+ if (name_subset) {
readUtilIface->report_error( "Reading subset of files not supported for CGM data." );
return MB_UNSUPPORTED_OPERATION;
}
Deleted: MOAB/trunk/tools/dagmc/Makefile.am
===================================================================
--- MOAB/trunk/tools/dagmc/Makefile.am 2009-03-31 15:56:19 UTC (rev 2785)
+++ MOAB/trunk/tools/dagmc/Makefile.am 2009-03-31 19:20:41 UTC (rev 2786)
@@ -1,50 +0,0 @@
-AUTOMAKE_OPTIONS = foreign
-
- at CGM_CONFIG_OPTIONS@
-
-DEFS = $(DEFINES)
-INCLUDES += -I$(top_srcdir) -I$(top_builddir)
-
-lib_LTLIBRARIES = libdagmc.la
-libdagmc_la_SOURCES = DagMC.cpp
-libdagmc_la_includedir = $(includedir)
-libdagmc_la_include_HEADERS = cgm2moab.hpp cubfile.h DagMC.hpp
-
-if HAVE_CGM
-INCLUDES += $(CGM_INCLUDES)
-CPPFLAGS += $(CGM_CPPFLAGS) -DCGM $(MOAB_CGM_DEFINES)
-CXXFLAGS += $(CGM_CXXFLAGS)
-
-libdagmc_la_SOURCES += cgm2moab.cc
-
-noinst_PROGRAMS = cub2h5m
-bin_PROGRAMS = cgm2moab
-cgm2moab_SOURCES = main.cc cubfile.c
-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
-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
-# check that only libraries are going in $(libdir)
-cfgdir = $(libdir)
-cfg_DATA = dagmc.make
-
-TESTS = test_geom
-check_PROGRAMS = $(TESTS) pt_vol_test ray_fire_test
-test_geom_SOURCES = test_geom.cc
-cub2h5m_SOURCES = cub2h5m.cc
-test_geom_LDADD = libdagmc.la $(top_builddir)/libMOAB.la $(CGM_LTFLAGS) $(CGM_LIBS_LINK)
-cub2h5m_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_LTFLAGS) $(CGM_LIBS_LINK)
-
-ray_fire_test_SOURCES = ray_fire_test.cc
-ray_fire_test_LDADD = libdagmc.la $(top_builddir)/libMOAB.la $(CGM_LTFLAGS) $(CGM_LIBS_LINK)
-
-
Added: MOAB/trunk/tools/dagmc/Makefile.am
===================================================================
--- MOAB/trunk/tools/dagmc/Makefile.am (rev 0)
+++ MOAB/trunk/tools/dagmc/Makefile.am 2009-03-31 19:20:41 UTC (rev 2786)
@@ -0,0 +1,50 @@
+AUTOMAKE_OPTIONS = foreign
+
+ at CGM_CONFIG_OPTIONS@
+
+DEFS = $(DEFINES)
+INCLUDES += -I$(top_srcdir) -I$(top_builddir)
+
+lib_LTLIBRARIES = libdagmc.la
+libdagmc_la_SOURCES = DagMC.cpp
+libdagmc_la_includedir = $(includedir)
+libdagmc_la_include_HEADERS = cgm2moab.hpp cubfile.h DagMC.hpp
+
+if HAVE_CGM
+INCLUDES += $(CGM_INCLUDES)
+CPPFLAGS += $(CGM_CPPFLAGS) -DCGM $(MOAB_CGM_DEFINES)
+CXXFLAGS += $(CGM_CXXFLAGS)
+
+libdagmc_la_SOURCES += cgm2moab.cc
+
+noinst_PROGRAMS = cub2h5m
+bin_PROGRAMS = cgm2moab
+cgm2moab_SOURCES = main.cc cubfile.c
+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
+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
+# check that only libraries are going in $(libdir)
+cfgdir = $(libdir)
+cfg_DATA = dagmc.make
+
+TESTS = test_geom
+check_PROGRAMS = $(TESTS) pt_vol_test ray_fire_test
+test_geom_SOURCES = test_geom.cc
+cub2h5m_SOURCES = cub2h5m.cc
+test_geom_LDADD = libdagmc.la $(top_builddir)/libMOAB.la $(CGM_LTFLAGS) $(CGM_LIBS_LINK)
+cub2h5m_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_LTFLAGS) $(CGM_LIBS_LINK)
+
+ray_fire_test_SOURCES = ray_fire_test.cc
+ray_fire_test_LDADD = libdagmc.la $(top_builddir)/libMOAB.la $(CGM_LTFLAGS) $(CGM_LIBS_LINK)
+
+
Property changes on: MOAB/trunk/tools/dagmc/Makefile.am
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: MOAB/trunk/tools/dagmc/cub2h5m.cc
===================================================================
--- MOAB/trunk/tools/dagmc/cub2h5m.cc 2009-03-31 15:56:19 UTC (rev 2785)
+++ MOAB/trunk/tools/dagmc/cub2h5m.cc 2009-03-31 19:20:41 UTC (rev 2786)
@@ -119,10 +119,10 @@
strcat(options,",set");
FileOptions opts(options) ;
- MBErrorCode result = my_tqd->load_file(input_name, file_set, opts, 0, 0);
+ MBErrorCode result = my_tqd->load_file(input_name, file_set, opts, NULL, 0, 0);
//opts = "tdata=coord, 100, sum, temp.exo";
- result = my_ex_reader.load_file(update_name, file_set, opts, 0 , 0);
+ result = my_ex_reader.load_file(update_name, file_set, opts, NULL, 0 , 0);
result = my_impl->write_mesh( output_name );
assert(!result);
More information about the moab-dev
mailing list