Commit dba6f3f9 authored by Jerry Clarke's avatar Jerry Clarke
Browse files

Now builds with and without NDGM

XdmfNDGM and XdmfRuntime now dummy out all ndgm_xxx
calls #ifndef HAVE_NDGM
parent 387f4f81
......@@ -24,6 +24,7 @@ IF(XDMF_HAS_NDGM)
SUBDIRS(NDGM)
ENDIF(NDGM_DIR)
ADD_DEFINITIONS(-DHAVE_NDGM)
INCLUDE_DIRECTORIES(${NDGM_DIR}/libsrc)
ENDIF(XDMF_HAS_NDGM)
OPTION(XDMF_SYSTEM_HDF5 "Use sytstem HDF5" ON)
......
......@@ -26,7 +26,9 @@ SET(ICE_SIZEOF_LONG ${CMAKE_SIZEOF_LONG})
SET(ICE_SIZEOF_SHORT ${CMAKE_SIZEOF_SHORT})
INCLUDE (${CMAKE_ROOT}/Modules/CheckTypeSize.cmake)
MESSAGE(STATUS "Finding a 64 Bit Integer")
CHECK_TYPE_SIZE(__int64 SIZEOF___INT64)
IF(WIN32)
CHECK_TYPE_SIZE(__int64 SIZEOF___INT64)
ENDIF(WIN32)
CHECK_TYPE_SIZE("long long" SIZEOF_LONG_LONG)
# Don't Really Need to check these ...
......
......@@ -28,12 +28,12 @@ SET( XdmfModelSource
XdmfGeometry
XdmfGrid
XdmfTopology
XdmfNDGM
XdmfRuntime
)
SET( XdmfNdgmSource
H5FDndgm
XdmfNDGM
XdmfRuntime
)
SET( XdmfPythonSource
......@@ -44,7 +44,9 @@ SET( XdmfTclSource
)
INCLUDE (${CMAKE_ROOT}/Modules/CheckTypeSize.cmake)
CHECK_TYPE_SIZE(__int64 SIZEOF___INT64)
IF(WIN32)
CHECK_TYPE_SIZE(__int64 SIZEOF___INT64)
ENDIF(WIN32)
CHECK_TYPE_SIZE("long long" SIZEOF_LONG_LONG)
OPTION(XDMF_BUILD_SHARED_LIBS "Build Shared XDMF Library" ON)
......
......@@ -29,38 +29,53 @@
#endif
extern "C" {
#ifdef HAVE_NDGM
NDGM_32_INT
XdmfNDGMErrorCallback( NDGM_NODE *node,
NDGM_32_INT reason,
NDGM_PTR user_data) {
return(NDGM_SUCCESS); /* Device Close and Free Lower Data Structs */
}
#else
char *XdmfGetNdgmEntries( void ){return(NULL);}
void XdmfDeleteAllNdgmEntries( void ){return;}
XdmfInt64 XdmfAddNdgmEntry( char *Name, XdmfInt64 Length ){return(0);}
#endif
}
XdmfNDGM::XdmfNDGM() {
// Default NDGM UID
#ifdef HAVE_NDGM
this->NdgmUid = ndgm_unique( NULL, 1, 0 );
gethostname( this->NdgmHost, XDMF_MAX_STRING_LENGTH );
this->NdgmMode = XDMF_NDGM_MSG_SERVER;
this->NdgmNode = NULL;
this->NdgmDriver = NDGM_SOC;
#endif
}
XdmfNDGM::~XdmfNDGM() {
#ifdef HAVE_NDGM
if( this->NdgmNode ) {
ndgm_msg_close( this->NdgmNode );
}
#endif
}
XdmfInt64
XdmfNDGM::GetLastAddress( void ) {
#ifdef HAVE_NDGM
return( NDGM_LAST_ADDRESS() );
#else
return(0);
#endif
}
XdmfInt32
XdmfNDGM::Clear( void ) {
#ifdef HAVE_NDGM
XdmfInt64 Address = 0, LastAddress = NDGM_LAST_ADDRESS();
XdmfInt8 buffer[ 1000010 ];
......@@ -72,12 +87,13 @@ while( Address < ( LastAddress - 1000000) ){
if( Address < LastAddress ){
ndgm_put( Address, buffer, LastAddress - Address + 1 );
}
#endif
return( XDMF_SUCCESS );
}
XdmfInt32
XdmfNDGM::Open( XdmfInt32 IdOffset ) {
#ifdef HAVE_NDGM
char connection[ XDMF_MAX_STRING_LENGTH ];
......@@ -148,10 +164,14 @@ switch ( this->NdgmMode ) {
break;
}
return( XDMF_SUCCESS );
#else
return(XDMF_FAIL);
#endif
}
XdmfInt32
XdmfNDGM::Close( XdmfInt32 Disconnect ) {
#ifdef HAVE_NDGM
switch ( this->NdgmMode ) {
case XDMF_NDGM_CLIENT :
XdmfDebug("Closing Client Connection");
......@@ -169,10 +189,14 @@ XdmfNDGM::Close( XdmfInt32 Disconnect ) {
break;
}
return( XDMF_SUCCESS );
#else
return(XDMF_FAIL);
#endif
}
XdmfInt32
XdmfNDGM::Check( void ) {
#ifdef HAVE_NDGM
NDGM_CHAR dummy[NDGM_MAX_PACKET_SIZE];
NDGM_CMD *Cmd;
......@@ -201,11 +225,15 @@ if( this->NdgmNode == NULL ){
this->NdgmClient->id = this->NdgmClient->msg->owner;
}
return( XDMF_SUCCESS );
#else
return(XDMF_FAIL);
#endif
}
XdmfInt32
XdmfNDGM::Get(XdmfInt64 Address, XdmfArray *Array )
{
#ifdef HAVE_NDGM
NDGM_LENGTH Length;
Length = Array->GetCoreLength();
......@@ -215,11 +243,15 @@ if( ndgm_get( Address, Array->GetDataPointer(), Length ) == XDMF_FAIL ){
return( XDMF_FAIL );
}
return( XDMF_SUCCESS );
#else
return(XDMF_FAIL);
#endif
}
XdmfInt32
XdmfNDGM::Put(XdmfInt64 Address, XdmfArray *Array )
{
#ifdef HAVE_NDGM
NDGM_LENGTH Length;
Length = Array->GetCoreLength();
......@@ -229,11 +261,15 @@ if( ndgm_put( Address, Array->GetDataPointer(), Length ) == XDMF_FAIL ){
return( XDMF_FAIL );
}
return( XDMF_SUCCESS );
#else
return(XDMF_FAIL);
#endif
}
XdmfInt32
XdmfNDGM::Send(XdmfArray *Array, XdmfInt32 Opcode )
{
#ifdef HAVE_NDGM
NDGM_CMD *Cmd;
XdmfInt32 Status;
......@@ -253,11 +289,15 @@ if( Status > 0 ) {
Status -= sizeof(NDGM_CMD);
}
return( Status );
#else
return(XDMF_FAIL);
#endif
}
XdmfInt32
XdmfNDGM::Recv( XdmfArray *Array )
{
#ifdef HAVE_NDGM
NDGM_CMD *Cmd;
if( this->NdgmClient == NULL ) return( XDMF_FAIL );
......@@ -277,6 +317,7 @@ if( this->NdgmNode ) {
Cmd->length );
return( Cmd->length );
}
#endif
return( XDMF_FAIL );
}
......@@ -27,7 +27,14 @@
#ifndef SWIG
extern "C" {
#ifdef HAVE_NDGM
#include "Ndgm/ndgm.h"
#else
#define NDGM_CMD_NOP 0
typedef struct {
char *dummy;
} NDGM_NODE;
#endif
}
#endif /* SWIG */
......@@ -127,19 +134,35 @@ Open a connection
XdmfInt32 Recv( XdmfArray *Array );
//! Initialize a Barrier
XdmfInt32 BarrierInit( XdmfInt32 Barrier = 20 , XdmfInt32 Value = -1 ){
#ifdef HAVE_NDGM
return( ndgm_barrier_init( Barrier, Value ));
#else
return(-1);
#endif
}
//! Wait in a Barrier
XdmfInt32 BarrierWait( XdmfInt32 Barrier ) {
#ifdef HAVE_NDGM
return( ndgm_barrier_wait( Barrier ) );
#else
return(-1);
#endif
}
//! Wait in a Barrier without effecting count
XdmfInt32 BarrierAudit( XdmfInt32 Barrier ) {
#ifdef HAVE_NDGM
return( ndgm_barrier_audit( Barrier ) );
#else
return(-1);
#endif
}
XdmfInt32 BarrierPoll( XdmfInt32 Barrier ) {
#ifdef HAVE_NDGM
return( ndgm_barrier_poll( Barrier ) );
#else
return(-1);
#endif
}
......
......@@ -711,9 +711,7 @@ static swig_type_info *swig_types[35];
#include <XdmfTransform.h>
#include <XdmfTopology.h>
#include <XdmfParameter.h>
#ifdef HAVE_NDGM
#include <XdmfNDGM.h>
#endif
extern void SetGlobalDebugOn();
extern void SetGlobalDebugOff();
......@@ -3872,7 +3870,6 @@ static PyObject *_wrap_XdmfHeavyData_GetClassName(PyObject *self, PyObject *args
return NULL;
}
#ifdef HAVE_NDGM
static PyObject *_wrap_XdmfHeavyData_GetNdgmHost(PyObject *self, PyObject *args) {
PyObject *resultobj;
XdmfHeavyData *arg1 = (XdmfHeavyData *) 0 ;
......@@ -3905,7 +3902,6 @@ static PyObject *_wrap_XdmfHeavyData_SetNdgmHost(PyObject *self, PyObject *args)
fail:
return NULL;
}
#endif
static PyObject *_wrap_XdmfHeavyData_GetWorkingDirectory(PyObject *self, PyObject *args) {
PyObject *resultobj;
......@@ -5240,7 +5236,6 @@ static PyObject *_wrap_XdmfDOM_FindNumberOfProcessingInstructions(PyObject *self
return NULL;
}
#ifdef HAVE_NDGM
static PyObject *_wrap_XdmfDOM_GetNdgmHost(PyObject *self, PyObject *args) {
PyObject *resultobj;
XdmfDOM *arg1 = (XdmfDOM *) 0 ;
......@@ -5273,7 +5268,6 @@ static PyObject *_wrap_XdmfDOM_SetNdgmHost(PyObject *self, PyObject *args) {
fail:
return NULL;
}
#endif
static PyObject *_wrap_XdmfDOM_GetWorkingDirectory(PyObject *self, PyObject *args) {
PyObject *resultobj;
......@@ -5602,7 +5596,6 @@ static PyObject *_wrap_XdmfLightData_GetClassName(PyObject *self, PyObject *args
return NULL;
}
#ifdef HAVE_NDGM
static PyObject *_wrap_XdmfLightData_GetNdgmHost(PyObject *self, PyObject *args) {
PyObject *resultobj;
XdmfLightData *arg1 = (XdmfLightData *) 0 ;
......@@ -5635,7 +5628,6 @@ static PyObject *_wrap_XdmfLightData_SetNdgmHost(PyObject *self, PyObject *args)
fail:
return NULL;
}
#endif
static PyObject *_wrap_XdmfLightData_GetName(PyObject *self, PyObject *args) {
PyObject *resultobj;
......@@ -8337,7 +8329,6 @@ static PyObject * XdmfTransform_swigregister(PyObject *self, PyObject *args) {
return Py_BuildValue((char *)"");
}
#ifdef HAVE_NDGM
static PyObject *_wrap_new_XdmfNDGM(PyObject *self, PyObject *args) {
PyObject *resultobj;
XdmfNDGM *result;
......@@ -8962,7 +8953,6 @@ static PyObject *_wrap_XdmfAddNdgmEntry(PyObject *self, PyObject *args) {
fail:
return NULL;
}
#endif
static PyMethodDef SwigMethods[] = {
{ (char *)"new_XdmfObject", _wrap_new_XdmfObject, METH_VARARGS },
......@@ -9124,10 +9114,8 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"new_XdmfHeavyData", _wrap_new_XdmfHeavyData, METH_VARARGS },
{ (char *)"delete_XdmfHeavyData", _wrap_delete_XdmfHeavyData, METH_VARARGS },
{ (char *)"XdmfHeavyData_GetClassName", _wrap_XdmfHeavyData_GetClassName, METH_VARARGS },
#ifdef HAVE_NDGM
{ (char *)"XdmfHeavyData_GetNdgmHost", _wrap_XdmfHeavyData_GetNdgmHost, METH_VARARGS },
{ (char *)"XdmfHeavyData_SetNdgmHost", _wrap_XdmfHeavyData_SetNdgmHost, METH_VARARGS },
#endif
{ (char *)"XdmfHeavyData_GetWorkingDirectory", _wrap_XdmfHeavyData_GetWorkingDirectory, METH_VARARGS },
{ (char *)"XdmfHeavyData_SetWorkingDirectory", _wrap_XdmfHeavyData_SetWorkingDirectory, METH_VARARGS },
{ (char *)"XdmfHeavyData_GetDomain", _wrap_XdmfHeavyData_GetDomain, METH_VARARGS },
......@@ -9200,10 +9188,8 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"XdmfDOM_FindNumberOfElementsByAttribute", _wrap_XdmfDOM_FindNumberOfElementsByAttribute, METH_VARARGS },
{ (char *)"XdmfDOM_FindProcessingInstruction", _wrap_XdmfDOM_FindProcessingInstruction, METH_VARARGS },
{ (char *)"XdmfDOM_FindNumberOfProcessingInstructions", _wrap_XdmfDOM_FindNumberOfProcessingInstructions, METH_VARARGS },
#ifdef HAVE_NDGM
{ (char *)"XdmfDOM_GetNdgmHost", _wrap_XdmfDOM_GetNdgmHost, METH_VARARGS },
{ (char *)"XdmfDOM_SetNdgmHost", _wrap_XdmfDOM_SetNdgmHost, METH_VARARGS },
#endif
{ (char *)"XdmfDOM_GetWorkingDirectory", _wrap_XdmfDOM_GetWorkingDirectory, METH_VARARGS },
{ (char *)"XdmfDOM_SetWorkingDirectory", _wrap_XdmfDOM_SetWorkingDirectory, METH_VARARGS },
{ (char *)"XdmfDOM_Get", _wrap_XdmfDOM_Get, METH_VARARGS },
......@@ -9222,10 +9208,8 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"new_XdmfLightData", _wrap_new_XdmfLightData, METH_VARARGS },
{ (char *)"delete_XdmfLightData", _wrap_delete_XdmfLightData, METH_VARARGS },
{ (char *)"XdmfLightData_GetClassName", _wrap_XdmfLightData_GetClassName, METH_VARARGS },
#ifdef HAVE_NDGM
{ (char *)"XdmfLightData_GetNdgmHost", _wrap_XdmfLightData_GetNdgmHost, METH_VARARGS },
{ (char *)"XdmfLightData_SetNdgmHost", _wrap_XdmfLightData_SetNdgmHost, METH_VARARGS },
#endif
{ (char *)"XdmfLightData_GetName", _wrap_XdmfLightData_GetName, METH_VARARGS },
{ (char *)"XdmfLightData_SetName", _wrap_XdmfLightData_SetName, METH_VARARGS },
{ (char *)"XdmfLightData_GetFileName", _wrap_XdmfLightData_GetFileName, METH_VARARGS },
......@@ -9381,7 +9365,6 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"XdmfTransform_DataDescToElement", _wrap_XdmfTransform_DataDescToElement, METH_VARARGS },
{ (char *)"XdmfTransform_ArrayToElement", _wrap_XdmfTransform_ArrayToElement, METH_VARARGS },
{ (char *)"XdmfTransform_swigregister", XdmfTransform_swigregister, METH_VARARGS },
#ifdef HAVE_NDGM
{ (char *)"new_XdmfNDGM", _wrap_new_XdmfNDGM, METH_VARARGS },
{ (char *)"delete_XdmfNDGM", _wrap_delete_XdmfNDGM, METH_VARARGS },
{ (char *)"XdmfNDGM_GetClassName", _wrap_XdmfNDGM_GetClassName, METH_VARARGS },
......@@ -9418,7 +9401,6 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"XdmfGetNdgmEntries", _wrap_XdmfGetNdgmEntries, METH_VARARGS },
{ (char *)"XdmfDeleteAllNdgmEntries", _wrap_XdmfDeleteAllNdgmEntries, METH_VARARGS },
{ (char *)"XdmfAddNdgmEntry", _wrap_XdmfAddNdgmEntry, METH_VARARGS },
#endif
{ NULL, NULL }
};
......@@ -9500,11 +9482,9 @@ static void *_p_XdmfFormatMultiTo_p_XdmfObject(void *x) {
static void *_p_XdmfArrayTo_p_XdmfObject(void *x) {
return (void *)((XdmfObject *) (XdmfDataDesc *) ((XdmfArray *) x));
}
#ifdef HAVE_NDGM
static void *_p_XdmfNDGMTo_p_XdmfObject(void *x) {
return (void *)((XdmfObject *) (XdmfDataDesc *) ((XdmfNDGM *) x));
}
#endif
static void *_p_XdmfGeometryTo_p_XdmfObject(void *x) {
return (void *)((XdmfObject *) (XdmfLightData *) ((XdmfGeometry *) x));
}
......@@ -9529,11 +9509,9 @@ static void *_p_XdmfGridTo_p_XdmfTopology(void *x) {
static void *_p_XdmfHeavyDataTo_p_XdmfDataDesc(void *x) {
return (void *)((XdmfDataDesc *) ((XdmfHeavyData *) x));
}
#ifdef HAVE_NDGM
static void *_p_XdmfNDGMTo_p_XdmfDataDesc(void *x) {
return (void *)((XdmfDataDesc *) ((XdmfNDGM *) x));
}
#endif
static void *_p_XdmfArrayTo_p_XdmfDataDesc(void *x) {
return (void *)((XdmfDataDesc *) ((XdmfArray *) x));
}
......@@ -9549,9 +9527,7 @@ static void *_p_XdmfCharArrayTo_p_XdmfArray(void *x) {
static swig_type_info _swigt__p_XdmfFormatXML[] = {{"_p_XdmfFormatXML", 0, "XdmfFormatXML *", 0},{"_p_XdmfFormatXML"},{0}};
static swig_type_info _swigt__p_XdmfTransform[] = {{"_p_XdmfTransform", 0, "XdmfTransform *", 0},{"_p_XdmfTransform"},{0}};
static swig_type_info _swigt__p_XdmfTopology[] = {{"_p_XdmfTopology", 0, "XdmfTopology *", 0},{"_p_XdmfGrid", _p_XdmfGridTo_p_XdmfTopology},{"_p_XdmfTopology"},{0}};
#ifdef HAVE_NDGM
static swig_type_info _swigt__p_XdmfNDGM[] = {{"_p_XdmfNDGM", 0, "XdmfNDGM *", 0},{"_p_XdmfNDGM"},{0}};
#endif
static swig_type_info _swigt__p_XdmfInt64[] = {{"_p_XdmfInt64", 0, "XdmfInt64 *", 0},{"_p_XdmfLength"},{"_p_XdmfInt64"},{0}};
static swig_type_info _swigt__XdmfPointer[] = {{"_XdmfPointer", 0, "XdmfPointer", 0},{"_XdmfPointer"},{"_p_void"},{0}};
static swig_type_info _swigt__p_void[] = {{"_p_void", 0, "void *", 0},{"_XdmfPointer"},{"_p_void"},{0}};
......@@ -9560,11 +9536,7 @@ static swig_type_info _swigt__p_XDMF_TREE_NODE[] = {{"_p_XDMF_TREE_NODE", 0, "XD
static swig_type_info _swigt__p_XdmfFormatHDF[] = {{"_p_XdmfFormatHDF", 0, "XdmfFormatHDF *", 0},{"_p_XdmfFormatHDF"},{0}};
static swig_type_info _swigt__p_XdmfGeometry[] = {{"_p_XdmfGeometry", 0, "XdmfGeometry *", 0},{"_p_XdmfGeometry"},{0}};
static swig_type_info _swigt__p_XdmfFormatMulti[] = {{"_p_XdmfFormatMulti", 0, "XdmfFormatMulti *", 0},{"_p_XdmfFormatMulti"},{0}};
static swig_type_info _swigt__p_XdmfObject[] = {{"_p_XdmfObject", 0, "XdmfObject *", 0},{"_p_XdmfTransform", _p_XdmfTransformTo_p_XdmfObject},{"_p_XdmfLightData", _p_XdmfLightDataTo_p_XdmfObject},{"_p_XdmfDOM", _p_XdmfDOMTo_p_XdmfObject},{"_p_XdmfObject"},{"_p_XdmfParameter", _p_XdmfParameterTo_p_XdmfObject},{"_p_XdmfFormatHDF", _p_XdmfFormatHDFTo_p_XdmfObject},{"_p_XdmfFormatXML", _p_XdmfFormatXMLTo_p_XdmfObject},{"_p_XdmfXNode", _p_XdmfXNodeTo_p_XdmfObject},{"_p_XdmfCharArray", _p_XdmfCharArrayTo_p_XdmfObject},{"_p_XdmfGrid", _p_XdmfGridTo_p_XdmfObject},{"_p_XdmfHeavyData", _p_XdmfHeavyDataTo_p_XdmfObject},{"_p_XdmfAttribute", _p_XdmfAttributeTo_p_XdmfObject},{"_p_XdmfFormat", _p_XdmfFormatTo_p_XdmfObject},{"_p_XdmfTopology", _p_XdmfTopologyTo_p_XdmfObject},{"_p_XdmfFormatMulti", _p_XdmfFormatMultiTo_p_XdmfObject},{"_p_XdmfDataDesc", _p_XdmfDataDescTo_p_XdmfObject},
#ifdef HAVE_NDGM
{"_p_XdmfNDGM", _p_XdmfNDGMTo_p_XdmfObject},
#endif
{"_p_XdmfArray", _p_XdmfArrayTo_p_XdmfObject},{"_p_XdmfGeometry", _p_XdmfGeometryTo_p_XdmfObject},{"_p_XdmfHDF", _p_XdmfHDFTo_p_XdmfObject},{0}};
static swig_type_info _swigt__p_XdmfObject[] = {{"_p_XdmfObject", 0, "XdmfObject *", 0},{"_p_XdmfTransform", _p_XdmfTransformTo_p_XdmfObject},{"_p_XdmfLightData", _p_XdmfLightDataTo_p_XdmfObject},{"_p_XdmfDOM", _p_XdmfDOMTo_p_XdmfObject},{"_p_XdmfObject"},{"_p_XdmfParameter", _p_XdmfParameterTo_p_XdmfObject},{"_p_XdmfFormatHDF", _p_XdmfFormatHDFTo_p_XdmfObject},{"_p_XdmfFormatXML", _p_XdmfFormatXMLTo_p_XdmfObject},{"_p_XdmfXNode", _p_XdmfXNodeTo_p_XdmfObject},{"_p_XdmfCharArray", _p_XdmfCharArrayTo_p_XdmfObject},{"_p_XdmfGrid", _p_XdmfGridTo_p_XdmfObject},{"_p_XdmfHeavyData", _p_XdmfHeavyDataTo_p_XdmfObject},{"_p_XdmfAttribute", _p_XdmfAttributeTo_p_XdmfObject},{"_p_XdmfFormat", _p_XdmfFormatTo_p_XdmfObject},{"_p_XdmfTopology", _p_XdmfTopologyTo_p_XdmfObject},{"_p_XdmfFormatMulti", _p_XdmfFormatMultiTo_p_XdmfObject},{"_p_XdmfDataDesc", _p_XdmfDataDescTo_p_XdmfObject}, {"_p_XdmfNDGM", _p_XdmfNDGMTo_p_XdmfObject}, {"_p_XdmfArray", _p_XdmfArrayTo_p_XdmfObject},{"_p_XdmfGeometry", _p_XdmfGeometryTo_p_XdmfObject},{"_p_XdmfHDF", _p_XdmfHDFTo_p_XdmfObject},{0}};
static swig_type_info _swigt__p_XdmfHDF[] = {{"_p_XdmfHDF", 0, "XdmfHDF *", 0},{"_p_XdmfHDF"},{0}};
static swig_type_info _swigt__p_XdmfXNode[] = {{"_p_XdmfXNode", 0, "XdmfXNode *", 0},{"_p_XdmfXNode"},{0}};
static swig_type_info _swigt__p_XdmfDOM[] = {{"_p_XdmfDOM", 0, "XdmfDOM *", 0},{"_p_XdmfDOM"},{0}};
......@@ -9573,9 +9545,7 @@ static swig_type_info _swigt__p_XdmfLightData[] = {{"_p_XdmfLightData", 0, "Xdmf
static swig_type_info _swigt__p_XdmfInt32[] = {{"_p_XdmfInt32", 0, "XdmfInt32 *", 0},{"_p_XdmfInt32"},{0}};
static swig_type_info _swigt__p_XdmfHeavyData[] = {{"_p_XdmfHeavyData", 0, "XdmfHeavyData *", 0},{"_p_XdmfHeavyData"},{"_p_XdmfHDF", _p_XdmfHDFTo_p_XdmfHeavyData},{0}};
static swig_type_info _swigt__p_XdmfFloat64[] = {{"_p_XdmfFloat64", 0, "XdmfFloat64 *", 0},{"_p_XdmfFloat64"},{0}};
#ifdef HAVE_NDGM
static swig_type_info _swigt__p_NDGM_NODE[] = {{"_p_NDGM_NODE", 0, "NDGM_NODE *", 0},{"_p_NDGM_NODE"},{0}};
#endif
static swig_type_info _swigt__p_hid_t[] = {{"_p_hid_t", 0, "hid_t *", 0},{"_p_hid_t"},{0}};
static swig_type_info _swigt__p_XdmfParameter[] = {{"_p_XdmfParameter", 0, "XdmfParameter *", 0},{"_p_XdmfParameter"},{0}};
static swig_type_info _swigt__p_std__istream[] = {{"_p_std__istream", 0, "istream *", 0},{"_p_std__istream"},{0}};
......@@ -9586,20 +9556,14 @@ static swig_type_info _swigt__p_XdmfCharArray[] = {{"_p_XdmfCharArray", 0, "Xdmf
static swig_type_info _swigt__p_XdmfFormat[] = {{"_p_XdmfFormat", 0, "XdmfFormat *", 0},{"_p_XdmfFormatHDF", _p_XdmfFormatHDFTo_p_XdmfFormat},{"_p_XdmfFormat"},{"_p_XdmfFormatMulti", _p_XdmfFormatMultiTo_p_XdmfFormat},{"_p_XdmfFormatXML", _p_XdmfFormatXMLTo_p_XdmfFormat},{0}};
static swig_type_info _swigt__p_XdmfInt8[] = {{"_p_XdmfInt8", 0, "XdmfInt8 *", 0},{"_p_XdmfInt8"},{0}};
static swig_type_info _swigt__p_XdmfFloat32[] = {{"_p_XdmfFloat32", 0, "XdmfFloat32 *", 0},{"_p_XdmfFloat32"},{0}};
static swig_type_info _swigt__p_XdmfDataDesc[] = {{"_p_XdmfDataDesc", 0, "XdmfDataDesc *", 0},{"_p_XdmfHeavyData", _p_XdmfHeavyDataTo_p_XdmfDataDesc},
#ifdef HAVE_NDGM
{"_p_XdmfNDGM", _p_XdmfNDGMTo_p_XdmfDataDesc},
#endif
{"_p_XdmfArray", _p_XdmfArrayTo_p_XdmfDataDesc},{"_p_XdmfDataDesc"},{"_p_XdmfHDF", _p_XdmfHDFTo_p_XdmfDataDesc},{"_p_XdmfCharArray", _p_XdmfCharArrayTo_p_XdmfDataDesc},{0}};
static swig_type_info _swigt__p_XdmfDataDesc[] = {{"_p_XdmfDataDesc", 0, "XdmfDataDesc *", 0},{"_p_XdmfHeavyData", _p_XdmfHeavyDataTo_p_XdmfDataDesc}, {"_p_XdmfNDGM", _p_XdmfNDGMTo_p_XdmfDataDesc}, {"_p_XdmfArray", _p_XdmfArrayTo_p_XdmfDataDesc},{"_p_XdmfDataDesc"},{"_p_XdmfHDF", _p_XdmfHDFTo_p_XdmfDataDesc},{"_p_XdmfCharArray", _p_XdmfCharArrayTo_p_XdmfDataDesc},{0}};
static swig_type_info _swigt__p_XdmfGrid[] = {{"_p_XdmfGrid", 0, "XdmfGrid *", 0},{"_p_XdmfGrid"},{0}};
static swig_type_info *swig_types_initial[] = {
_swigt__p_XdmfFormatXML,
_swigt__p_XdmfTransform,
_swigt__p_XdmfTopology,
#ifdef HAVE_NDGM
_swigt__p_XdmfNDGM,
#endif
_swigt__p_XdmfInt64,
_swigt__XdmfPointer,
_swigt__p_void,
......@@ -9617,9 +9581,7 @@ _swigt__p_XdmfLightData,
_swigt__p_XdmfInt32,
_swigt__p_XdmfHeavyData,
_swigt__p_XdmfFloat64,
#ifdef HAVE_NDGM
_swigt__p_NDGM_NODE,
#endif
_swigt__p_hid_t,
_swigt__p_XdmfParameter,
_swigt__p_std__istream,
......@@ -9698,11 +9660,9 @@ static swig_const_info swig_const_table[] = {
{ SWIG_PY_INT, (char *)"XDMF_GEOMETRY_X_Y_Z", (long) 3, 0, 0, 0},
{ SWIG_PY_INT, (char *)"XDMF_GEOMETRY_VXVYVZ", (long) 4, 0, 0, 0},
{ SWIG_PY_INT, (char *)"XDMF_GEOMETRY_ORIGIN_DXDYDZ", (long) 5, 0, 0, 0},
#ifdef HAVE_NDGM
{ SWIG_PY_INT, (char *)"XDMF_NDGM_MSG_SERVER", (long) 0, 0, 0, 0},
{ SWIG_PY_INT, (char *)"XDMF_NDGM_MSG_CLIENT", (long) 1, 0, 0, 0},
{ SWIG_PY_INT, (char *)"XDMF_NDGM_CLIENT", (long) 2, 0, 0, 0},
#endif
{0}};
#ifdef __cplusplus
......
......@@ -104,6 +104,7 @@ next Frequency multiple
//! Signal Completed Update in Free Run or Safe Mode
XdmfInt32 SignalComplete( XdmfInt32 Barrier = XDMF_DEFAULT_BARRIER, XdmfInt32 Mode = -1 ) {
#ifdef HAVE_NDGM
XdmfInt32 Status;
XdmfDebug("Clearing Barrier " << Barrier << endl);
Status = ndgm_barrier_init(Barrier, -1);
......@@ -114,6 +115,10 @@ next Frequency multiple
}
XdmfDebug("Status = " << Status << endl );
return( Status );
#else
// This allows for ICE Aware Applications without NDGM
return(XDMF_SUCCESS);
#endif
}
//! Update the Time/Iteration Scalar Values
......
SET( Xdmf_SRCS
vtkMyXdmfReader
vtkXdmfDataSetWriter
vtkXdmfReader
vtkXdmfDataArray
)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment