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

[Jiangtao Hu]

Hi, Iulian:
I agree that if we don't need to support cubit10.0, we don't need to separate the code using CUBIT_12 flag.
One thing I want to point out that I noticed that you also removed the flag for cubit13 in itaps, which is because moab and above are not using the reflect and scale funtions. In case later, you want to use any of them (hopefully not), as long as we support cubit12 and cubit13, please note that the interface is different for these two versions.
Jane Hu



Asst. Researcher

Dept. of Engineering Physics

UW @ Madison



"And we know that for those who love God, that is, for those who are called according to his purpose, all things are working together for good." (Romans 8:28)

--- On Thu, 2/14/13, iulian at mcs.anl.gov <iulian at mcs.anl.gov> wrote:

From: iulian at mcs.anl.gov <iulian at mcs.anl.gov>
Subject: [MOAB-dev] r6002 - MOAB/trunk/src/io
To: moab-dev at mcs.anl.gov
Date: Thursday, February 14, 2013, 12:04 PM

Author: iulian
Date: 2013-02-14 11:04:34 -0600 (Thu, 14 Feb 2013)
New Revision: 6002

Modified:
   MOAB/trunk/src/io/ReadCGM.cpp
Log:
remove reference to CUBIT_12, it is not needed anymore, because we are not going to support
cubit 10 anymore, and cubit 13 has the same signature for the import_solid_model and
export_... methods (as cubit 12)


Modified: MOAB/trunk/src/io/ReadCGM.cpp
===================================================================
--- MOAB/trunk/src/io/ReadCGM.cpp    2013-02-13 17:19:42 UTC (rev 6001)
+++ MOAB/trunk/src/io/ReadCGM.cpp    2013-02-14 17:04:34 UTC (rev 6002)
@@ -41,9 +41,7 @@
 
 #include "moab/GeomTopoTool.hpp"
 
-#ifdef CUBIT_12
 # include "CubitCompat.hpp"
-#endif
 
 #include <stdio.h>
 #include <algorithm>
@@ -193,11 +191,7 @@
   if (!file_type || !strcmp(file_type ,"CUBIT")) 
     return MB_FAILURE;
 
-#ifndef CUBIT_12
-  s = GeometryQueryTool::instance()->import_solid_model( cgm_file_name, file_type );
-#else
   s = CubitCompat_import_solid_model( cgm_file_name, file_type );
-#endif
   if (CUBIT_SUCCESS != s) {
     readUtilIface->report_error( "%s: Failed to read file of type \"%s\"", cgm_file_name, file_type );
     return MB_FAILURE;

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/moab-dev/attachments/20130214/d71a4745/attachment.html>