Author: hongjun Date: 2009-08-20 16:32:24 -0500 (Thu, 20 Aug 2009) New Revision: 3113 Modified: cgm/trunk/itaps/iGeom_CGMA.cc Log: o Nightly distribution test error is fixed. o FileOption is not used and removed. Modified: cgm/trunk/itaps/iGeom_CGMA.cc =================================================================== --- cgm/trunk/itaps/iGeom_CGMA.cc 2009-08-20 21:23:30 UTC (rev 3112) +++ cgm/trunk/itaps/iGeom_CGMA.cc 2009-08-20 21:32:24 UTC (rev 3113) @@ -313,18 +313,22 @@ // make sure we have a null-terminated string for file name std::string file_name( name, name_len ); name = file_name.c_str(); - + // check if work in parallel bool parallel = false; - FileOptions opts(options); std::string parallel_opt; - FOErrorCode rval = opts.get_option("PARALLEL", parallel_opt); - if (FO_SUCCESS == rval) parallel = true; - + std::vector<std::string> opts; + std::string tmp_options(options, options_size); + tmp_options.insert(0, ";"); + tokenize(tmp_options, opts ); + for (std::vector<std::string>::iterator i = opts.begin(); i != opts.end(); ++i) + { + if (match_option( *i, "PARALLEL", parallel_opt )) parallel = true; + } + // parallel if (parallel) { #ifdef USE_MPI - //CubitStatus status = ParallelGeomTool::instance()->load_file(name, options); ParallelGeomTool pgt(reinterpret_cast<CGMTagManager*> (instance), NULL); CubitStatus status = pgt.load_file(name, options); if (CUBIT_SUCCESS != status) {