[MOAB-dev] r3938 - MOAB/trunk/src/io

[tautges at mcs.anl.gov]

Author: tautges
Date: 2010-05-21 14:13:03 -0500 (Fri, 21 May 2010)
New Revision: 3938

Modified:
   MOAB/trunk/src/io/ReadCCMIO.cpp
Log:
Correcting some merging errors I'd introduced.



Modified: MOAB/trunk/src/io/ReadCCMIO.cpp
===================================================================
--- MOAB/trunk/src/io/ReadCCMIO.cpp	2010-05-21 19:02:38 UTC (rev 3937)
+++ MOAB/trunk/src/io/ReadCCMIO.cpp	2010-05-21 19:13:03 UTC (rev 3938)
@@ -208,48 +208,6 @@
   return MB_SUCCESS;
 }
 
-ErrorCode ReadCCMIO::get_processors(CCMIOID stateID,
-                                    CCMIOID &processorID, CCMIOID &verticesID,
-                                    CCMIOID &topologyID, CCMIOID &solutionID,
-                                    std::vector<CCMIOSize_t> &procs,
-                                    bool &has_solution) 
-{
-  return MB_SUCCESS;
-}
-
-ErrorCode ReadCCMIO::read_mesh(CCMIOID stateID, CCMIOID problemID,
-                               CCMIOID processorID, 
-                               Range *new_ents) 
-{
-  ErrorCode rval;
-  bool has_solution = true;
-  CCMIOID verticesID, topologyID, solutionID;
-  
-  CCMIOSize_t i = CCMIOSIZEC(0);
-  CCMIOError error = kCCMIONoErr;
-  CCMIONextEntity(&error, stateID, kCCMIOProcessor, &i, &processorID);
-  CCMIOReadProcessor(&error, processorID, &verticesID, &topologyID, NULL, &solutionID);
-  if (error != kCCMIONoErr) {
-      // Maybe no solution;  try again
-    error = kCCMIONoErr;
-    CCMIOReadProcessor(&error, processorID, &verticesID, &topologyID, NULL, NULL);
-    has_solution = false;
-  }
-  CHKCCMERR(error, "Error reading processor.");
-
-    // read the vertices, topology, and solution ids
-  TupleList vert_map;
-  rval = read_vertices(i, processorID, verticesID, topologyID, 
-                       solutionID, has_solution, new_ents, vert_map);
-  CHKERR(rval, NULL);
-  
-  rval = read_cells(i, problemID, verticesID, topologyID, 
-                    solutionID, has_solution, vert_map, new_ents);
-  CHKERR(rval, NULL);
-
-  return rval;
-}
-
 ErrorCode ReadCCMIO::load_metadata(CCMIOID rootID, CCMIOID problemID,