[MOAB-dev] r2831 - in MOAB/trunk: . parallel tools/dagmc tools/iMesh tools/mbcoupler
kraftche at cae.wisc.edu
kraftche at cae.wisc.edu
Thu Apr 16 17:07:22 CDT 2009
Author: kraftche
Date: 2009-04-16 17:07:21 -0500 (Thu, 16 Apr 2009)
New Revision: 2831
Added:
MOAB/trunk/MBUnknownInterface.hpp
Removed:
MOAB/trunk/MBUnknownInterface.h
Modified:
MOAB/trunk/MBCN_protos.h
MOAB/trunk/MBEntityType.h
MOAB/trunk/MBInterface.hpp
MOAB/trunk/Makefile.am
MOAB/trunk/ReadWriteDefines.h
MOAB/trunk/exodus_order.h
MOAB/trunk/parallel/gs.h
MOAB/trunk/patran_order.h
MOAB/trunk/tools/dagmc/cubfile.h
MOAB/trunk/tools/iMesh/iMesh.h
MOAB/trunk/tools/mbcoupler/extrafindpt.h
MOAB/trunk/tools/mbcoupler/poly.h
Log:
Apparently the GCC warning about C++-style comments in C code will
never be fixed, so remove a C++-style comments from C headers.
Modified: MOAB/trunk/MBCN_protos.h
===================================================================
--- MOAB/trunk/MBCN_protos.h 2009-04-16 18:14:34 UTC (rev 2830)
+++ MOAB/trunk/MBCN_protos.h 2009-04-16 22:07:21 UTC (rev 2831)
@@ -1,7 +1,7 @@
#include "MBCN_FCDefs.h"
#ifdef FC_FUNC_
- //! get the basis of the numbering system
+ /* get the basis of the numbering system */
#define MBCN_GetBasis FC_FUNC_(mbcn_getbasis, MBCN_GETBASIS)
#define MBCN_SetBasis FC_FUNC_(mbcn_setbasis, MBCN_SETBASIS)
#define MBCN_EntityTypeName FC_FUNC_(mbcn_entitytypename, MBCN_ENTITYTYPENAME)
Modified: MOAB/trunk/MBEntityType.h
===================================================================
--- MOAB/trunk/MBEntityType.h 2009-04-16 18:14:34 UTC (rev 2830)
+++ MOAB/trunk/MBEntityType.h 2009-04-16 22:07:21 UTC (rev 2831)
@@ -44,16 +44,16 @@
};
#ifdef __cplusplus
-} // extern "C"
+} /* extern "C" */
-//! prefix increment operator for MBEntityType
+/** prefix increment operator for MBEntityType */
inline MBEntityType & operator++(MBEntityType &type)
{
return type = static_cast<MBEntityType>(type+1);
}
-//! postfix increment operator for MBEntityType
+/** postfix increment operator for MBEntityType */
inline MBEntityType operator++(MBEntityType &type, int)
{
MBEntityType oldval = type;
@@ -61,13 +61,13 @@
return oldval;
}
-//! prefix increment operator for MBEntityType
+/** prefix increment operator for MBEntityType */
inline MBEntityType & operator--(MBEntityType &type)
{
return type = static_cast<MBEntityType>(type-1);
}
-//! postfix increment operator for MBEntityType
+/** postfix increment operator for MBEntityType */
inline MBEntityType operator--(MBEntityType &type, int)
{
MBEntityType oldval = type;
Modified: MOAB/trunk/MBInterface.hpp
===================================================================
--- MOAB/trunk/MBInterface.hpp 2009-04-16 18:14:34 UTC (rev 2830)
+++ MOAB/trunk/MBInterface.hpp 2009-04-16 22:07:21 UTC (rev 2831)
@@ -54,7 +54,7 @@
#endif
-#include "MBUnknownInterface.h"
+#include "MBUnknownInterface.hpp"
#define MB_INTERFACE_VERSION "2.0.0"
static const MBuuid IDD_MBCore = MBuuid( 0x8956e0a, 0xc300, 0x4005,
0xbd, 0xf6, 0xc3, 0x4e, 0xf7, 0x1f, 0x5a, 0x52 );
Deleted: MOAB/trunk/MBUnknownInterface.h
===================================================================
--- MOAB/trunk/MBUnknownInterface.h 2009-04-16 18:14:34 UTC (rev 2830)
+++ MOAB/trunk/MBUnknownInterface.h 2009-04-16 22:07:21 UTC (rev 2831)
@@ -1,101 +0,0 @@
-/* Filename : MBUnkonwnInterface.h
- * Creator : Clinton Stimpson
- *
- * Date : 10 Jan 2002
- *
- * Owner : Clinton Stimpson
- *
- * Description: Contains declarations for MBuuid which keeps
- * track of different interfaces.
- * Also contains the declaration for the base class
- * MBUknownInterface from which all interfaces are
- * derived from
- */
-
-#ifndef MBUNKNOWNINTERFACE_HPP
-#define MBUNKNOWNINTERFACE_HPP
-
-#include <memory.h>
-
-typedef unsigned char MBuchar;
-typedef unsigned short MBushort;
-typedef unsigned MBuint;
-
-//! struct that handles universally unique id's for the Mesh Database
-
-// note: this MBuuid is compliant with the windows GUID.
-// It is possible to do a memcpy() to copy the data from a MBuuid to a GUID
-// if we want to support dll registration
-struct MBuuid
-{
- //! default constructor that initializes to zero
- MBuuid()
- {
- memset( this, 0, sizeof(MBuuid) );
- }
- //! constructor that takes initialization arguments
- MBuuid( MBuint l, MBushort w1, MBushort w2,
- MBuchar b1, MBuchar b2, MBuchar b3,
- MBuchar b4, MBuchar b5, MBuchar b6,
- MBuchar b7, MBuchar b8 )
- {
- data1 = l;
- data2 = w1;
- data3 = w2;
- data4[0] = b1;
- data4[1] = b2;
- data4[2] = b3;
- data4[3] = b4;
- data4[4] = b5;
- data4[5] = b6;
- data4[6] = b7;
- data4[7] = b8;
- }
- //! copy constructor
- MBuuid( const MBuuid& mdbuuid )
- {
- memcpy( this, &mdbuuid, sizeof(MBuuid));
- }
- //! sets this uuid equal to another one
- MBuuid &operator=(const MBuuid& orig)
- {
- memcpy( this, &orig, sizeof(MBuuid));
- return *this;
- }
- //! returns whether two uuid's are equal
- bool operator==(const MBuuid& orig) const
- {
- return !memcmp(this, &orig, sizeof(MBuuid));
- }
- //! returns whether two uuid's are not equal
- bool operator!=(const MBuuid& orig) const
- {
- return!(*this == orig);
- }
-
- //! uuid data storage
- MBuint data1;
- MBushort data2;
- MBushort data3;
- MBuchar data4[8];
-};
-
-//! MBuuid for an unknown interface
-//! this can be used to either return a default interface
-//! or a NULL interface
-static const MBuuid IDD_MBUnknown = MBuuid( 0xf4f6605e, 0x2a7e, 0x4760,
- 0xbb, 0x06, 0xb9, 0xed, 0x27, 0xe9, 0x4a, 0xec );
-
-
-//! base class for all interface classes
-class MBUnknownInterface
-{
-public:
- virtual int QueryInterface
- ( const MBuuid&, MBUnknownInterface** ) = 0;
- virtual ~MBUnknownInterface() {};
-};
-
-
-#endif // MBUNKNOWNINTERFACE_HPP
-
Copied: MOAB/trunk/MBUnknownInterface.hpp (from rev 2826, MOAB/trunk/MBUnknownInterface.h)
===================================================================
--- MOAB/trunk/MBUnknownInterface.hpp (rev 0)
+++ MOAB/trunk/MBUnknownInterface.hpp 2009-04-16 22:07:21 UTC (rev 2831)
@@ -0,0 +1,101 @@
+/* Filename : MBUnkonwnInterface.h
+ * Creator : Clinton Stimpson
+ *
+ * Date : 10 Jan 2002
+ *
+ * Owner : Clinton Stimpson
+ *
+ * Description: Contains declarations for MBuuid which keeps
+ * track of different interfaces.
+ * Also contains the declaration for the base class
+ * MBUknownInterface from which all interfaces are
+ * derived from
+ */
+
+#ifndef MBUNKNOWNINTERFACE_HPP
+#define MBUNKNOWNINTERFACE_HPP
+
+#include <memory.h>
+
+typedef unsigned char MBuchar;
+typedef unsigned short MBushort;
+typedef unsigned MBuint;
+
+//! struct that handles universally unique id's for the Mesh Database
+
+// note: this MBuuid is compliant with the windows GUID.
+// It is possible to do a memcpy() to copy the data from a MBuuid to a GUID
+// if we want to support dll registration
+struct MBuuid
+{
+ //! default constructor that initializes to zero
+ MBuuid()
+ {
+ memset( this, 0, sizeof(MBuuid) );
+ }
+ //! constructor that takes initialization arguments
+ MBuuid( MBuint l, MBushort w1, MBushort w2,
+ MBuchar b1, MBuchar b2, MBuchar b3,
+ MBuchar b4, MBuchar b5, MBuchar b6,
+ MBuchar b7, MBuchar b8 )
+ {
+ data1 = l;
+ data2 = w1;
+ data3 = w2;
+ data4[0] = b1;
+ data4[1] = b2;
+ data4[2] = b3;
+ data4[3] = b4;
+ data4[4] = b5;
+ data4[5] = b6;
+ data4[6] = b7;
+ data4[7] = b8;
+ }
+ //! copy constructor
+ MBuuid( const MBuuid& mdbuuid )
+ {
+ memcpy( this, &mdbuuid, sizeof(MBuuid));
+ }
+ //! sets this uuid equal to another one
+ MBuuid &operator=(const MBuuid& orig)
+ {
+ memcpy( this, &orig, sizeof(MBuuid));
+ return *this;
+ }
+ //! returns whether two uuid's are equal
+ bool operator==(const MBuuid& orig) const
+ {
+ return !memcmp(this, &orig, sizeof(MBuuid));
+ }
+ //! returns whether two uuid's are not equal
+ bool operator!=(const MBuuid& orig) const
+ {
+ return!(*this == orig);
+ }
+
+ //! uuid data storage
+ MBuint data1;
+ MBushort data2;
+ MBushort data3;
+ MBuchar data4[8];
+};
+
+//! MBuuid for an unknown interface
+//! this can be used to either return a default interface
+//! or a NULL interface
+static const MBuuid IDD_MBUnknown = MBuuid( 0xf4f6605e, 0x2a7e, 0x4760,
+ 0xbb, 0x06, 0xb9, 0xed, 0x27, 0xe9, 0x4a, 0xec );
+
+
+//! base class for all interface classes
+class MBUnknownInterface
+{
+public:
+ virtual int QueryInterface
+ ( const MBuuid&, MBUnknownInterface** ) = 0;
+ virtual ~MBUnknownInterface() {};
+};
+
+
+#endif // MBUNKNOWNINTERFACE_HPP
+
Property changes on: MOAB/trunk/MBUnknownInterface.hpp
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
Modified: MOAB/trunk/Makefile.am
===================================================================
--- MOAB/trunk/Makefile.am 2009-04-16 18:14:34 UTC (rev 2830)
+++ MOAB/trunk/Makefile.am 2009-04-16 22:07:21 UTC (rev 2831)
@@ -261,7 +261,7 @@
MBSkinner.hpp \
MBTagConventions.hpp \
MBTypes.h \
- MBUnknownInterface.h \
+ MBUnknownInterface.hpp \
MBUtil.hpp \
MBWriteUtilIface.hpp \
MBWriterIface.hpp \
Modified: MOAB/trunk/ReadWriteDefines.h
===================================================================
--- MOAB/trunk/ReadWriteDefines.h 2009-04-16 18:14:34 UTC (rev 2830)
+++ MOAB/trunk/ReadWriteDefines.h 2009-04-16 22:07:21 UTC (rev 2831)
@@ -6,7 +6,7 @@
#pragma warning(disable : 4786)
#endif
-// CJS -- we need to figure out how this fits in the component framework
+/* CJS -- we need to figure out how this fits in the component framework */
#error "don't include this file"
Modified: MOAB/trunk/exodus_order.h
===================================================================
--- MOAB/trunk/exodus_order.h 2009-04-16 18:14:34 UTC (rev 2830)
+++ MOAB/trunk/exodus_order.h 2009-04-16 22:07:21 UTC (rev 2831)
@@ -25,22 +25,22 @@
static const int* const* exodus_hex_order = patran_hex_order;
static const int *const *const exodus_elem_order_map[] = {
- patran_null_order, // MBVERTEX
- patran_null_order, // MBEDGE
- patran_null_order, // MBTRI
- patran_null_order, // MBQUAD
- patran_null_order, // MBPOLYGON
- exodus_tet_order, // MBTET
- patran_null_order, // MBPYRAMID
- patran_pri_order, // MBPRISM
- patran_null_order, // MBKNIFE
- exodus_hex_order, // MBHEX
- patran_null_order, // MBPOLYHEDRON
+ patran_null_order, /* MBVERTEX */
+ patran_null_order, /* MBEDGE */
+ patran_null_order, /* MBTRI */
+ patran_null_order, /* MBQUAD */
+ patran_null_order, /* MBPOLYGON */
+ exodus_tet_order, /* MBTET */
+ patran_null_order, /* MBPYRAMID */
+ patran_pri_order, /* MBPRISM */
+ patran_null_order, /* MBKNIFE */
+ exodus_hex_order, /* MBHEX */
+ patran_null_order, /* MBPOLYHEDRON */
patran_null_order
};
#ifdef __cplusplus
-} // extern "C"
+} /* extern "C" */
#endif
#endif
Modified: MOAB/trunk/parallel/gs.h
===================================================================
--- MOAB/trunk/parallel/gs.h 2009-04-16 18:14:34 UTC (rev 2830)
+++ MOAB/trunk/parallel/gs.h 2009-04-16 22:07:21 UTC (rev 2831)
@@ -6,7 +6,7 @@
#warning "gs.h" requires "types.h" and "crystal.h"
#endif
-// typedef struct gs_data_ gs_data;
+/* typedef struct gs_data_ gs_data; */
#ifndef MPI
# define crystal_data void
Modified: MOAB/trunk/patran_order.h
===================================================================
--- MOAB/trunk/patran_order.h 2009-04-16 18:14:34 UTC (rev 2830)
+++ MOAB/trunk/patran_order.h 2009-04-16 22:07:21 UTC (rev 2831)
@@ -90,22 +90,22 @@
is the same as PATRAN (or the number of nodes is invalid.) */
static const int *const *const patran_elem_order_map[] = {
- patran_null_order, // MBVERTEX
- patran_null_order, // MBEDGE
- patran_null_order, // MBTRI
- patran_null_order, // MBQUAD
- patran_null_order, // MBPOLYGON
- patran_tet_order, // MBTET
- patran_null_order, // MBPYRAMID
- patran_pri_order, // MBPRISM
- patran_null_order, // MBKNIFE
- patran_hex_order, // MBHEX
- patran_null_order, // MBPOLYHEDRON
+ patran_null_order, /* MBVERTEX */
+ patran_null_order, /* MBEDGE */
+ patran_null_order, /* MBTRI */
+ patran_null_order, /* MBQUAD */
+ patran_null_order, /* MBPOLYGON */
+ patran_tet_order, /* MBTET */
+ patran_null_order, /* MBPYRAMID */
+ patran_pri_order, /* MBPRISM */
+ patran_null_order, /* MBKNIFE */
+ patran_hex_order, /* MBHEX */
+ patran_null_order, /* MBPOLYHEDRON */
patran_null_order
};
#ifdef __cplusplus
-} // extern "C"
+} /* extern "C" */
#endif
#endif
Modified: MOAB/trunk/tools/dagmc/cubfile.h
===================================================================
--- MOAB/trunk/tools/dagmc/cubfile.h 2009-04-16 18:14:34 UTC (rev 2830)
+++ MOAB/trunk/tools/dagmc/cubfile.h 2009-04-16 22:07:21 UTC (rev 2831)
@@ -75,7 +75,7 @@
int cub_file_type( FILE* cubfile, FILE* output_file, enum CubFileType type );
#ifdef __cplusplus
-} // extern "C"
+} /* extern "C" */
#endif
#endif
Modified: MOAB/trunk/tools/iMesh/iMesh.h
===================================================================
--- MOAB/trunk/tools/iMesh/iMesh.h 2009-04-16 18:14:34 UTC (rev 2830)
+++ MOAB/trunk/tools/iMesh/iMesh.h 2009-04-16 22:07:21 UTC (rev 2831)
@@ -1976,7 +1976,7 @@
/*out*/ int *err);
#ifdef __cplusplus
-} // extern "C"
+} /* extern "C" */
#endif
#endif /* ifndef IMESH_CBIND_H__ */
Modified: MOAB/trunk/tools/mbcoupler/extrafindpt.h
===================================================================
--- MOAB/trunk/tools/mbcoupler/extrafindpt.h 2009-04-16 18:14:34 UTC (rev 2830)
+++ MOAB/trunk/tools/mbcoupler/extrafindpt.h 2009-04-16 22:07:21 UTC (rev 2831)
@@ -1,5 +1,5 @@
-//extra stuff that james didn't expose
+/* extra stuff that james didn't expose */
typedef struct {
unsigned constraints;
Modified: MOAB/trunk/tools/mbcoupler/poly.h
===================================================================
--- MOAB/trunk/tools/mbcoupler/poly.h 2009-04-16 18:14:34 UTC (rev 2830)
+++ MOAB/trunk/tools/mbcoupler/poly.h 2009-04-16 22:07:21 UTC (rev 2831)
@@ -115,23 +115,23 @@
Usage:
lagrange_data p;
- lagrange_setup(&p,z,n); // setup for nodes z[0 ... n-1]
+ lagrange_setup(&p,z,n); /* setup for nodes z[0 ... n-1] */
the weights
p->J [0 ... n-1] interpolation weights
p->D [0 ... n-1] 1st derivative weights
p->D2[0 ... n-1] 2nd derivative weights
are computed for a given x with:
- lagrange_0(p,x); // compute p->J
- lagrange_1(p,x); // compute p->J, p->D
- lagrange_2(p,x); // compute p->J, p->D, p->D2
- lagrange_2u(p); // compute p->D2 after call of lagrange_1(p,x);
+ lagrange_0(p,x); /* compute p->J */
+ lagrange_1(p,x); /* compute p->J, p->D */
+ lagrange_2(p,x); /* compute p->J, p->D, p->D2 */
+ lagrange_2u(p); /* compute p->D2 after call of lagrange_1(p,x); */
These functions use the z array supplied to setup
(that pointer should not be freed between calls)
Weights for x=z[0] and x=z[n-1] are computed during setup; access as:
p->J_z0, etc. and p->J_zn, etc.
- lagrange_free(&p); // deallocate memory allocated by setup
+ lagrange_free(&p); /* deallocate memory allocated by setup */
--------------------------------------------------------------------------*/
typedef struct {
More information about the moab-dev
mailing list