[MOAB-dev] r4310 - in MOAB/trunk/tools: . dagmc

[sjackson at cae.wisc.edu]

Author: sjackson
Date: 2010-12-01 11:49:23 -0600 (Wed, 01 Dec 2010)
New Revision: 4310

Removed:
   MOAB/trunk/tools/dagmc/cgm2moab.man
   MOAB/trunk/tools/dagmc/cubfile.c
   MOAB/trunk/tools/dagmc/cubfile.h
   MOAB/trunk/tools/dagmc/main.cc
Modified:
   MOAB/trunk/tools/README.tools
   MOAB/trunk/tools/dagmc/Makefile.am
   MOAB/trunk/tools/dagmc/cub2h5m.cc
Log:
Remove cgm2moab tool.  It has been replaced by dagmc_preproc.

Also remove old, unused cubfile.[ch] files and references thereto.

Note to updaters: be sure to re-run autoreconf -fi after receiving
this revision.

Modified: MOAB/trunk/tools/README.tools
===================================================================
--- MOAB/trunk/tools/README.tools	2010-12-01 17:10:56 UTC (rev 4309)
+++ MOAB/trunk/tools/README.tools	2010-12-01 17:49:23 UTC (rev 4310)
@@ -4,7 +4,6 @@
 tools and as functionality to include in other applications.
 
 Brief description of tools below this directory:
-cgm2moab: grabs facets from geometric model & saves as MOAB model
 converter: converts mesh between any two formats read/written by MOAB
 hexmodops: dual-based hex meshing research support
 mbchaco: static partitioner based on Sandia CHACO library

Modified: MOAB/trunk/tools/dagmc/Makefile.am
===================================================================
--- MOAB/trunk/tools/dagmc/Makefile.am	2010-12-01 17:10:56 UTC (rev 4309)
+++ MOAB/trunk/tools/dagmc/Makefile.am	2010-12-01 17:49:23 UTC (rev 4310)
@@ -3,7 +3,7 @@
 lib_LTLIBRARIES = libdagmc.la
 libdagmc_la_SOURCES = DagMC.cpp
 libdagmc_la_includedir = $(includedir)
-libdagmc_la_include_HEADERS = cubfile.h DagMC.hpp
+libdagmc_la_include_HEADERS = DagMC.hpp
 
 if HAVE_CGM
   AM_CPPFLAGS += $(CGM_INCLUDES) $(CGM_CPPFLAGS) -DCGM $(MOAB_CGM_DEFINES)
@@ -15,23 +15,11 @@
   netcdf_progs = 
 endif
 
-  cgm2moabbin = cgm2moab
-  cgm2moabman = cgm2moab.man
-else
-  cgm2moabbin=
-  cgm2moabman=
 endif
 
-cgm2moab_SOURCES = main.cc cubfile.c
-cgm2moab_LDFLAGS = $(CGM_LTFLAGS) $(CGM_LDLFAGS)
-cgm2moab_LDADD = $(LDADD) 
-cgm2moab_DEPENDENCIES = libdagmc.la $(top_builddir)/src/libMOAB.la
+bin_PROGRAMS = dagmc_preproc
+noinst_PROGRAMS = quads_to_tris $(netcdf_progs) 
 
-bin_PROGRAMS = $(cgm2moabbin)
-noinst_PROGRAMS = quads_to_tris $(netcdf_progs) dagmc_preproc 
-man1_MANS = $(cgm2moabman)
-EXTRA_DIST = cgm2moab.man
-
 CGM_CPPFLAGS = @CGM_CPPFLAGS@
 CGM_LDFLAGS = @CGM_LDFLAGS@