[cgma-dev] r4455 - in cgm/branches/merge-cubit12: . geom geom/testing itaps

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2011-01-20 16:20:28 -0600 (Thu, 20 Jan 2011)
New Revision: 4455

Modified:
   cgm/branches/merge-cubit12/Makefile.am
   cgm/branches/merge-cubit12/geom/GeometryQueryTool.hpp
   cgm/branches/merge-cubit12/geom/Makefile.am
   cgm/branches/merge-cubit12/geom/testing/Makefile.am
   cgm/branches/merge-cubit12/geom/testing/cgm_test.cpp
   cgm/branches/merge-cubit12/geom/testing/cgm_test_script
   cgm/branches/merge-cubit12/itaps/iGeom_CGMA.cc
Log:
fix build issues w/ ACIS.  make check still fails in itaps/testgeom because something is different with getting the MESH_INTERVAL attribute

Modified: cgm/branches/merge-cubit12/Makefile.am
===================================================================
--- cgm/branches/merge-cubit12/Makefile.am	2011-01-18 18:06:54 UTC (rev 4454)
+++ cgm/branches/merge-cubit12/Makefile.am	2011-01-20 22:20:28 UTC (rev 4455)
@@ -48,7 +48,7 @@
   CORE_CGM_LIBS = 
 endif
 
-SUBDIRS = compat util geom init . $(igeom_DIR) test cgm_apps
+SUBDIRS = compat util geom init . $(igeom_DIR) test cgm_apps geom/testing
 
 libcgm_la_LIBADD = init/libcgma_init.la $(CORE_CGM_LIBS) $(CGM_EXT_LIBS) $(CUBIT_FILE)
 

Modified: cgm/branches/merge-cubit12/geom/GeometryQueryTool.hpp
===================================================================
--- cgm/branches/merge-cubit12/geom/GeometryQueryTool.hpp	2011-01-18 18:06:54 UTC (rev 4454)
+++ cgm/branches/merge-cubit12/geom/GeometryQueryTool.hpp	2011-01-20 22:20:28 UTC (rev 4455)
@@ -420,33 +420,6 @@
 				 const char* pBuffer,
 				 const int n_buffer_size);
 
-  CubitStatus read_geometry_file(char const* fileName,
-                                 char const* includePath = NULL,
-                                 char const* type = "ACIS_SAT");
-  /**<
-   * Read geometry from the specified file.
-    *  \arg filename
-    *  The name of the file to read.
-    *  \arg includePath
-    *  An optional path to be used to search for the file if the file
-    *  is not in the current directory.
-    *  \arg type
-    *  An optional type of file.
-    *   \return  CubitStatus - success/failure
-    *
-    *  Reads a geometry file (named fileName).  If the file cannot be found
-    *  in the current directory, and if includePath is not NULL, the include
-    *  path specified by includePath is added to the file name, and it is
-    *  searched in the given order. The file type specified in the "type"
-    *  argument determines what type of geometry file it is -- the default
-    *  is an ACIS SAT file.
-    *  Supported geometry file types are:
-    *     "ACIS_SAT"  --  ACIS SAT file format
-    *     "ACIS_SAB"  --  ACIS SAB file format (binary)
-    *  The function returns CUBIT_FAILURE if it cannot open the file, or
-    *  the "type" is not known. Otherwise it returns CUBIT_SUCCESS.
-    */
-
   /*!
    * Fire a ray at entities, passing back distances of hits and entities hit