[cgma-dev] r5834 - cgm/trunk/geom

[janehu at mcs.anl.gov]

Author: janehu
Date: 2012-10-26 11:49:01 -0500 (Fri, 26 Oct 2012)
New Revision: 5834

Modified:
   cgm/trunk/geom/CubitCompat.cpp
Log:
Remove CUBIT_12 flag in cubit13.1 code, only compatible to cubit13.1.

Modified: cgm/trunk/geom/CubitCompat.cpp
===================================================================
--- cgm/trunk/geom/CubitCompat.cpp	2012-10-26 09:24:44 UTC (rev 5833)
+++ cgm/trunk/geom/CubitCompat.cpp	2012-10-26 16:49:01 UTC (rev 5834)
@@ -2,50 +2,41 @@
 #include "CubitCompat.hpp"
 #include "GeometryQueryTool.hpp"
 #include <string.h>
-#define CUBIT_12 3
-#if CUBIT_12  >= 2
 
-  #define CUBIT_COMPAT_FT_ELIF(TYPE) \
-    else if (!strcmp(file_type,#TYPE)) \
-      return TYPE ## _TYPE
+#define CUBIT_COMPAT_FT_ELIF(TYPE) \
+  else if (!strcmp(file_type,#TYPE)) \
+    return TYPE ## _TYPE
 
-  static Model_File_Type
-  CubitCompat_file_type( const char* file_type )
-  {
-    if (!file_type)
-      return MFT_NOT_DEFINED;
-    CUBIT_COMPAT_FT_ELIF(ACIS);
-    CUBIT_COMPAT_FT_ELIF(ACIS_SAT);
-    CUBIT_COMPAT_FT_ELIF(ACIS_SAB);
-    CUBIT_COMPAT_FT_ELIF(ACIS_DEBUG);
-    CUBIT_COMPAT_FT_ELIF(IGES);
-    CUBIT_COMPAT_FT_ELIF(CATIA);
-    CUBIT_COMPAT_FT_ELIF(STEP);
-    CUBIT_COMPAT_FT_ELIF(PROE);
-    CUBIT_COMPAT_FT_ELIF(GRANITE);
-    CUBIT_COMPAT_FT_ELIF(GRANITE_G);
-    CUBIT_COMPAT_FT_ELIF(GRANITE_SAT);
-    CUBIT_COMPAT_FT_ELIF(GRANITE_PROE_PART);
-    CUBIT_COMPAT_FT_ELIF(GRANITE_PROE_ASM);
-    CUBIT_COMPAT_FT_ELIF(GRANITE_NEUTRAL);
-    CUBIT_COMPAT_FT_ELIF(NCGM);
-    CUBIT_COMPAT_FT_ELIF(CATIA_NCGM);
-    CUBIT_COMPAT_FT_ELIF(CATPART);
-    CUBIT_COMPAT_FT_ELIF(CATPRODUCT);
-    CUBIT_COMPAT_FT_ELIF(FACET);
-    CUBIT_COMPAT_FT_ELIF(SOLIDWORKS);
-    CUBIT_COMPAT_FT_ELIF(OCC);
-    else
-      return MFT_NOT_DEFINED;
-  }
+static Model_File_Type
+CubitCompat_file_type( const char* file_type )
+{
+  if (!file_type)