[MOAB-dev] r1303 - in MOAB/trunk/tools/iMesh: . SIDL SIDL/mserver
tautges at mcs.anl.gov
tautges at mcs.anl.gov
Wed Oct 10 09:30:46 CDT 2007
Author: tautges
Date: 2007-10-10 09:30:46 -0500 (Wed, 10 Oct 2007)
New Revision: 1303
Modified:
MOAB/trunk/tools/iMesh/SIDL/iMesh.sidl
MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.cc
MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.hh
MOAB/trunk/tools/iMesh/iBase.h
MOAB/trunk/tools/iMesh/iBase_f.h
MOAB/trunk/tools/iMesh/iMesh_protos.h
Log:
Adding 2nd order adj stuff and removing deprecated values in ErrorActions enum.
Modified: MOAB/trunk/tools/iMesh/SIDL/iMesh.sidl
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/iMesh.sidl 2007-10-08 20:20:33 UTC (rev 1302)
+++ MOAB/trunk/tools/iMesh/SIDL/iMesh.sidl 2007-10-10 14:30:46 UTC (rev 1303)
@@ -182,6 +182,11 @@
in EntityType entity_type_requested,
inout array<opaque> adj_entity_handles,
out int adj_entity_handles_size) throws iBase.Error;
+ void getEnt2ndAdj( in opaque entity_handle,
+ in EntityType order_adjacent_key,
+ in EntityType entity_type_requested,
+ inout array<opaque> adj_entity_handles,
+ out int adj_entity_handles_size) throws iBase.Error;
};
@@ -227,6 +232,14 @@
out int adj_entity_handles_size,
inout array<int> offset,
out int offset_size) throws iBase.Error;
+ void getEntArr2ndAdj( in array<opaque> entity_handles,
+ in int entity_handles_size,
+ in EntityType order_adjacent_key,
+ in EntityType entity_type_requested,
+ inout array<opaque> adj_entity_handles,
+ out int adj_entity_handles_size,
+ inout array<int> offset,
+ out int offset_size) throws iBase.Error;
};
Modified: MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.cc
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.cc 2007-10-08 20:20:33 UTC (rev 1302)
+++ MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.cc 2007-10-10 14:30:46 UTC (rev 1303)
@@ -3,15 +3,15 @@
// Symbol: iMesh_SIDL.MeshSidl-v0.2
// Symbol Type: class
// Babel Version: 0.10.12
-// sidl Created: 20070628 20:55:25 CDT
-// Generated: 20070628 20:55:32 CDT
+// sidl Created: 20070927 14:57:59 CDT
+// Generated: 20070927 14:58:07 CDT
// Description: Server-side implementation for iMesh_SIDL.MeshSidl
//
// WARNING: Automatically generated; only changes within splicers preserved
//
// babel-version = 0.10.12
// source-line = 5
-// source-url = file:/home/tautges/MOAB/tools/iMesh/SIDL/mserver/../iMesh_SIDL.sidl
+// source-url = file:/home/tautges/MOAB/tools/iMesh/SIDL/iMesh_SIDL.sidl
//
#include "iMesh_SIDL_MeshSidl_Impl.hh"
@@ -1799,6 +1799,34 @@
}
/**
+ * Method: getEnt2ndAdj[]
+ */
+void
+iMesh_SIDL::MeshSidl_impl::getEnt2ndAdj (
+ /* in */ void* entity_handle,
+ /* in */ ::iBase::EntityType order_adjacent_key,
+ /* in */ ::iBase::EntityType entity_type_requested,
+ /* inout */ ::sidl::array<void*>& adj_entity_handles,
+ /* out */ int32_t& adj_entity_handles_size )
+throw (
+ ::iBase::Error
+){
+ // DO-NOT-DELETE splicer.begin(iMesh_SIDL.MeshSidl.getEnt2ndAdj)
+ // Insert-Code-Here {iMesh_SIDL.MeshSidl.getEnt2ndAdj} (getEnt2ndAdj method)
+ CREATE_TEMP_EH_ARRAY(adj_entity_handles);
+
+ iMesh_getEnt2ndAdj (imeshInstance, (iBase_EntityHandle) entity_handle,
+ (iBase_EntityType)order_adjacent_key,
+ (iBase_EntityType)entity_type_requested,
+ TEMP_ARRAY_INOUT(adj_entity_handles), &imeshError);
+ PROCESS_ERROR;
+
+ ASSIGN_TYPED_ARRAY(void*, adj_entity_handles);
+
+ // DO-NOT-DELETE splicer.end(iMesh_SIDL.MeshSidl.getEnt2ndAdj)
+}
+
+/**
* Method: initEntArrIter[]
*/
void
@@ -1974,6 +2002,41 @@
}
/**
+ * Method: getEntArr2ndAdj[]
+ */
+void
+iMesh_SIDL::MeshSidl_impl::getEntArr2ndAdj (
+ /* in */ ::sidl::array<void*> entity_handles,
+ /* in */ int32_t entity_handles_size,
+ /* in */ ::iBase::EntityType order_adjacent_key,
+ /* in */ ::iBase::EntityType entity_type_requested,
+ /* inout */ ::sidl::array<void*>& adj_entity_handles,
+ /* out */ int32_t& adj_entity_handles_size,
+ /* inout */ ::sidl::array<int32_t>& offset,
+ /* out */ int32_t& offset_size )
+throw (
+ ::iBase::Error
+){
+ // DO-NOT-DELETE splicer.begin(iMesh_SIDL.MeshSidl.getEntArr2ndAdj)
+ // Insert-Code-Here {iMesh_SIDL.MeshSidl.getEntArr2ndAdj} (getEntArr2ndAdj method)
+ CREATE_TEMP_EH_ARRAY(adj_entity_handles);
+ CREATE_TEMP_ARRAY(int32_t, offset);
+
+ iMesh_getEntArr2ndAdj (imeshInstance,
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle, entity_handles),
+ (iBase_EntityType)order_adjacent_key,
+ (iBase_EntityType)entity_type_requested,
+ TEMP_ARRAY_INOUT(adj_entity_handles),
+ TEMP_ARRAY_INOUT(offset), &imeshError);
+ PROCESS_ERROR;
+
+ ASSIGN_TYPED_ARRAY(void*, adj_entity_handles);
+ ASSIGN_TYPED_ARRAY(int32_t, offset);
+
+ // DO-NOT-DELETE splicer.end(iMesh_SIDL.MeshSidl.getEntArr2ndAdj)
+}
+
+/**
* Method: setVtxCoords[]
*/
void
Modified: MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.hh
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.hh 2007-10-08 20:20:33 UTC (rev 1302)
+++ MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.hh 2007-10-10 14:30:46 UTC (rev 1303)
@@ -3,15 +3,15 @@
// Symbol: iMesh_SIDL.MeshSidl-v0.2
// Symbol Type: class
// Babel Version: 0.10.12
-// sidl Created: 20070628 20:55:25 CDT
-// Generated: 20070628 20:55:32 CDT
+// sidl Created: 20070927 14:57:59 CDT
+// Generated: 20070927 14:58:06 CDT
// Description: Server-side implementation for iMesh_SIDL.MeshSidl
//
// WARNING: Automatically generated; only changes within splicers preserved
//
// babel-version = 0.10.12
// source-line = 5
-// source-url = file:/home/tautges/MOAB/tools/iMesh/SIDL/mserver/../iMesh_SIDL.sidl
+// source-url = file:/home/tautges/MOAB/tools/iMesh/SIDL/iMesh_SIDL.sidl
//
#ifndef included_iMesh_SIDL_MeshSidl_Impl_hh
@@ -1188,6 +1188,21 @@
* user defined non-static method.
*/
void
+ getEnt2ndAdj (
+ /* in */ void* entity_handle,
+ /* in */ ::iBase::EntityType order_adjacent_key,
+ /* in */ ::iBase::EntityType entity_type_requested,
+ /* inout */ ::sidl::array<void*>& adj_entity_handles,
+ /* out */ int32_t& adj_entity_handles_size
+ )
+ throw (
+ ::iBase::Error
+ );
+
+ /**
+ * user defined non-static method.
+ */
+ void
initEntArrIter (
/* in */ void* entity_set_handle,
/* in */ ::iBase::EntityType requested_entity_type,
@@ -1284,6 +1299,24 @@
* user defined non-static method.
*/
void
+ getEntArr2ndAdj (
+ /* in */ ::sidl::array<void*> entity_handles,
+ /* in */ int32_t entity_handles_size,
+ /* in */ ::iBase::EntityType order_adjacent_key,
+ /* in */ ::iBase::EntityType entity_type_requested,
+ /* inout */ ::sidl::array<void*>& adj_entity_handles,
+ /* out */ int32_t& adj_entity_handles_size,
+ /* inout */ ::sidl::array<int32_t>& offset,
+ /* out */ int32_t& offset_size
+ )
+ throw (
+ ::iBase::Error
+ );
+
+ /**
+ * user defined non-static method.
+ */
+ void
setVtxCoords (
/* in */ void* vertex_handle,
/* in */ double x,
Modified: MOAB/trunk/tools/iMesh/iBase.h
===================================================================
--- MOAB/trunk/tools/iMesh/iBase.h 2007-10-08 20:20:33 UTC (rev 1302)
+++ MOAB/trunk/tools/iMesh/iBase.h 2007-10-10 14:30:46 UTC (rev 1303)
@@ -64,8 +64,6 @@
enum iBase_ErrorActions {
iBase_SILENT,
iBase_WARN_ONLY,
- iBase_ABORT_ON_ERROR,
- iBase_PRINT_AND_THROW_ERROR,
iBase_THROW_ERROR
};
Modified: MOAB/trunk/tools/iMesh/iBase_f.h
===================================================================
--- MOAB/trunk/tools/iMesh/iBase_f.h 2007-10-08 20:20:33 UTC (rev 1302)
+++ MOAB/trunk/tools/iMesh/iBase_f.h 2007-10-10 14:30:46 UTC (rev 1303)
@@ -34,14 +34,10 @@
integer iBase_SILENT
integer iBase_WARN_ONLY
- integer iBase_ABORT_ON_ERROR
- integer iBase_PRINT_AND_THROW_ERROR
integer iBase_THROW_ERROR
parameter (iBase_SILENT = 0)
parameter (iBase_WARN_ONLY = 1)
- parameter (iBase_ABORT_ON_ERROR = 2)
- parameter (iBase_PRINT_AND_THROW_ERROR = 3)
parameter (iBase_THROW_ERROR = 4)
Modified: MOAB/trunk/tools/iMesh/iMesh_protos.h
===================================================================
--- MOAB/trunk/tools/iMesh/iMesh_protos.h 2007-10-08 20:20:33 UTC (rev 1302)
+++ MOAB/trunk/tools/iMesh/iMesh_protos.h 2007-10-10 14:30:46 UTC (rev 1303)
@@ -28,6 +28,7 @@
#define iMesh_getEntArrTopo FC_FUNC_(imesh_getentarrtopo, IMESH_GETENTARRTOPO)
#define iMesh_getEntArrType FC_FUNC_(imesh_getentarrtype, IMESH_GETENTARRTYPE)
#define iMesh_getEntArrAdj FC_FUNC_(imesh_getentarradj, IMESH_GETENTARRADJ)
+#define iMesh_getEntArr2ndAdj FC_FUNC_(imesh_getentarr2ndadj, IMESH_GETENTARR2NDADJ)
#define iMesh_createEntSet FC_FUNC_(imesh_createentset, IMESH_CREATEENTSET)
#define iMesh_destroyEntSet FC_FUNC_(imesh_destroyentset, IMESH_DESTROYENTSET)
#define iMesh_isList FC_FUNC_(imesh_islist, IMESH_ISLIST)
@@ -100,6 +101,7 @@
#define iMesh_getEntType FC_FUNC_(imesh_getenttype, IMESH_GETENTTYPE)
#define iMesh_getVtxCoord FC_FUNC_(imesh_getvtxcoord, IMESH_GETVTXCOORD)
#define iMesh_getEntAdj FC_FUNC_(imesh_getentadj, IMESH_GETENTADJ)
+#define iMesh_getEnt2ndAdj FC_FUNC_(imesh_getent2ndadj, IMESH_GETENT2NDADJ)
#define iMesh_subtract FC_FUNC_(imesh_subtract, IMESH_SUBTRACT)
#define iMesh_intersect FC_FUNC_(imesh_intersect, IMESH_INTERSECT)
#define iMesh_unite FC_FUNC_(imesh_unite, IMESH_UNITE)
More information about the moab-dev
mailing list