Commit 6a2647c0 authored by Andrew J. Burns (Cont's avatar Andrew J. Burns (Cont

Merge branch 'master' of hsai-dev.arl.army.mil:/data/Repository/Xdmf2

parents ce12619f d663dd9d
......@@ -23,6 +23,9 @@ set(CMAKE_MODULE_PATH
include(XdmfFunctions)
# Converting Install Prefix to an absolute path
get_filename_component(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" ABSOLUTE)
# RPath
set(CMAKE_SKIP_BUILD_RPATH FALSE)
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
......@@ -280,6 +283,7 @@ if(NOT XDMF_BUILD_CORE_ONLY)
if(XDMF_WRAP_PYTHON)
XDMF_SWIG_PYTHON(Xdmf XdmfCore XdmfDSM)
set(XDMF_PYTHON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib/python/)
endif(XDMF_WRAP_PYTHON)
if(BUILD_TESTING)
......
......@@ -182,7 +182,9 @@ set(XdmfCore_INCLUDE_DIRS
${PYTHON_INCLUDE_DIRS}
CACHE INTERNAL "")
set(XDMF_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include PARENT_SCOPE)
set(XDMF_LIBRARIES ${XDMF_LIBRARIES} ${CMAKE_INSTALL_PREFIX}/lib)
set(XDMF_DIR ${CMAKE_INSTALL_PREFIX} PARENT_SCOPE)
set(XDMF_BINARIES ${XDMF_BINARIES} ${CMAKE_INSTALL_PREFIX}/bin)
if(XDMF_BUILD_DSM)
......
......@@ -30,6 +30,7 @@ class XdmfItem;
// Includes
#include <map>
#include <vector>
#include <string>
#include "XdmfCore.hpp"
#include "XdmfSharedPtr.hpp"
......
......@@ -985,7 +985,7 @@ XdmfFortran::openDomainGridCollection(const int index,
mDomain->getGridCollection(index);
int i;
int n;
if (openMaps == 1) {
if (openMaps) {
n = openedGridCollection->getNumberMaps();
shared_ptr<XdmfMap> openedMap;
for (i = 0; i < n; i++) {
......@@ -994,7 +994,7 @@ XdmfFortran::openDomainGridCollection(const int index,
mPreviousMaps.push_back(openedMap);
}
}
if (openAttributes == 1) {
if (openAttributes) {
n = openedGridCollection->getNumberAttributes();
shared_ptr<XdmfAttribute> openedAttribute;
for (i = 0; i < n; i++) {
......@@ -1003,7 +1003,7 @@ XdmfFortran::openDomainGridCollection(const int index,
mPreviousAttributes.push_back(openedAttribute);
}
}
if (openInformation == 1) {
if (openInformation) {
n = openedGridCollection->getNumberInformations();
shared_ptr<XdmfInformation> openedInformation;
for (i = 0; i < n; i++) {
......@@ -1012,7 +1012,7 @@ XdmfFortran::openDomainGridCollection(const int index,
mPreviousInformations.push_back(openedInformation);
}
}
if (openSets == 1) {
if (openSets) {
n = openedGridCollection->getNumberSets();
shared_ptr<XdmfSet> openedSet;
for (i = 0; i < n; i++) {
......@@ -1074,7 +1074,7 @@ XdmfFortran::openGridCollectionGridCollection(const int index,
mGridCollections.top()->getGridCollection(index);
int i;
int n;
if (openMaps == 1) {
if (openMaps) {
n = openedGridCollection->getNumberMaps();
shared_ptr<XdmfMap> openedMap;
for (i = 0; i < n; i++) {
......@@ -1083,7 +1083,7 @@ XdmfFortran::openGridCollectionGridCollection(const int index,
mPreviousMaps.push_back(openedMap);
}
}
if (openAttributes == 1) {
if (openAttributes) {
n = openedGridCollection->getNumberAttributes();
shared_ptr<XdmfAttribute> openedAttribute;
for (i = 0; i < n; i++) {
......@@ -1092,7 +1092,7 @@ XdmfFortran::openGridCollectionGridCollection(const int index,
mPreviousAttributes.push_back(openedAttribute);
}
}
if (openInformation == 1) {
if (openInformation) {
n = openedGridCollection->getNumberInformations();
shared_ptr<XdmfInformation> openedInformation;
for (i = 0; i < n; i++) {
......@@ -1101,7 +1101,7 @@ XdmfFortran::openGridCollectionGridCollection(const int index,
mPreviousInformations.push_back(openedInformation);
}
}
if (openSets == 1) {
if (openSets) {
n = openedGridCollection->getNumberSets();
shared_ptr<XdmfSet> openedSet;
for (i = 0; i < n; i++) {
......@@ -1274,7 +1274,7 @@ XdmfFortran::openDomainGrid(const int gridType,
mTime = openedGrid->getTime();
int i;
int n;
if (openAttributes == 1) {
if (openAttributes) {
n = openedGrid->getNumberAttributes();
shared_ptr<XdmfAttribute> openedAttribute;
for (i = 0; i < n; i++) {
......@@ -1283,7 +1283,7 @@ XdmfFortran::openDomainGrid(const int gridType,
mPreviousAttributes.push_back(openedAttribute);
}
}
if (openMaps == 1) {
if (openMaps) {
n = openedGrid->getNumberMaps();
shared_ptr<XdmfMap> openedMap;
for (i = 0; i < n; i++) {
......@@ -1292,7 +1292,7 @@ XdmfFortran::openDomainGrid(const int gridType,
mPreviousMaps.push_back(openedMap);
}
}
if (openInformation == 1) {
if (openInformation) {
n = openedGrid->getNumberInformations();
shared_ptr<XdmfInformation> openedInformation;
for (i = 0; i < n; i++) {
......@@ -1301,7 +1301,7 @@ XdmfFortran::openDomainGrid(const int gridType,
mPreviousInformations.push_back(openedInformation);
}
}
if (openSets == 1) {
if (openSets) {
n = openedGrid->getNumberSets();
shared_ptr<XdmfSet> openedSet;
for (i = 0; i < n; i++) {
......@@ -1329,7 +1329,7 @@ XdmfFortran::openDomainGrid(const int gridType,
mTime = openedGrid->getTime();
int i;
int n;
if (openAttributes == 1) {
if (openAttributes) {
n = openedGrid->getNumberAttributes();
shared_ptr<XdmfAttribute> openedAttribute;
for (i = 0; i < n; i++) {
......@@ -1338,7 +1338,7 @@ XdmfFortran::openDomainGrid(const int gridType,
mPreviousAttributes.push_back(openedAttribute);
}
}
if (openMaps == 1) {
if (openMaps) {
n = openedGrid->getNumberMaps();
shared_ptr<XdmfMap> openedMap;
for (i = 0; i < n; i++) {
......@@ -1347,7 +1347,7 @@ XdmfFortran::openDomainGrid(const int gridType,
mPreviousMaps.push_back(openedMap);
}
}
if (openInformation == 1) {
if (openInformation) {
n = openedGrid->getNumberInformations();
shared_ptr<XdmfInformation> openedInformation;
for (i = 0; i < n; i++) {
......@@ -1356,7 +1356,7 @@ XdmfFortran::openDomainGrid(const int gridType,
mPreviousInformations.push_back(openedInformation);
}
}
if (openSets == 1) {
if (openSets) {
n = openedGrid->getNumberSets();
shared_ptr<XdmfSet> openedSet;
for (i = 0; i < n; i++) {
......@@ -1386,7 +1386,7 @@ XdmfFortran::openDomainGrid(const int gridType,
mDimensions = openedGrid->getDimensions();
int i;
int n;
if (openAttributes == 1) {
if (openAttributes) {
n = openedGrid->getNumberAttributes();
shared_ptr<XdmfAttribute> openedAttribute;
for (i = 0; i < n; i++) {
......@@ -1395,7 +1395,7 @@ XdmfFortran::openDomainGrid(const int gridType,
mPreviousAttributes.push_back(openedAttribute);
}
}
if (openMaps == 1) {
if (openMaps) {
n = openedGrid->getNumberMaps();
shared_ptr<XdmfMap> openedMap;
for (i = 0; i < n; i++) {
......@@ -1404,7 +1404,7 @@ XdmfFortran::openDomainGrid(const int gridType,
mPreviousMaps.push_back(openedMap);
}
}
if (openInformation == 1) {
if (openInformation) {
n = openedGrid->getNumberInformations();
shared_ptr<XdmfInformation> openedInformation;
for (i = 0; i < n; i++) {
......@@ -1413,7 +1413,7 @@ XdmfFortran::openDomainGrid(const int gridType,
mPreviousInformations.push_back(openedInformation);
}
}
if (openSets == 1) {
if (openSets) {
n = openedGrid->getNumberSets();
shared_ptr<XdmfSet> openedSet;
for (i = 0; i < n; i++) {
......@@ -1441,7 +1441,7 @@ XdmfFortran::openDomainGrid(const int gridType,
mTime = openedGrid->getTime();
int i;
int n;
if (openAttributes == 1) {
if (openAttributes) {
n = openedGrid->getNumberAttributes();
shared_ptr<XdmfAttribute> openedAttribute;
for (i = 0; i < n; i++) {
......@@ -1450,7 +1450,7 @@ XdmfFortran::openDomainGrid(const int gridType,
mPreviousAttributes.push_back(openedAttribute);
}
}
if (openMaps == 1) {
if (openMaps) {
n = openedGrid->getNumberMaps();
shared_ptr<XdmfMap> openedMap;
for (i = 0; i < n; i++) {
......@@ -1459,7 +1459,7 @@ XdmfFortran::openDomainGrid(const int gridType,
mPreviousMaps.push_back(openedMap);
}
}
if (openInformation == 1) {
if (openInformation) {
n = openedGrid->getNumberInformations();
shared_ptr<XdmfInformation> openedInformation;
for (i = 0; i < n; i++) {
......@@ -1468,7 +1468,7 @@ XdmfFortran::openDomainGrid(const int gridType,
mPreviousInformations.push_back(openedInformation);
}
}
if (openSets == 1) {
if (openSets) {
n = openedGrid->getNumberSets();
shared_ptr<XdmfSet> openedSet;
for (i = 0; i < n; i++) {
......@@ -2373,7 +2373,7 @@ XdmfFortran::openGridCollectionGrid(const int gridType,
mTime = openedGrid->getTime();
int i;
int n;
if (openAttributes == 1) {
if (openAttributes) {
n = openedGrid->getNumberAttributes();
shared_ptr<XdmfAttribute> openedAttribute;
for (i = 0; i < n; i++) {
......@@ -2382,7 +2382,7 @@ XdmfFortran::openGridCollectionGrid(const int gridType,
mPreviousAttributes.push_back(openedAttribute);
}
}
if (openMaps == 1) {
if (openMaps) {
n = openedGrid->getNumberMaps();
shared_ptr<XdmfMap> openedMap;
for (i = 0; i < n; i++) {
......@@ -2391,7 +2391,7 @@ XdmfFortran::openGridCollectionGrid(const int gridType,
mPreviousMaps.push_back(openedMap);
}
}
if (openInformation == 1) {
if (openInformation) {
n = openedGrid->getNumberInformations();
shared_ptr<XdmfInformation> openedInformation;
for (i = 0; i < n; i++) {
......@@ -2400,7 +2400,7 @@ XdmfFortran::openGridCollectionGrid(const int gridType,
mPreviousInformations.push_back(openedInformation);
}
}
if (openSets == 1) {
if (openSets) {
n = openedGrid->getNumberSets();
shared_ptr<XdmfSet> openedSet;
for (i = 0; i < n; i++) {
......@@ -2428,7 +2428,7 @@ XdmfFortran::openGridCollectionGrid(const int gridType,
mTime = openedGrid->getTime();
int i;
int n;
if (openAttributes == 1) {
if (openAttributes) {
n = openedGrid->getNumberAttributes();
shared_ptr<XdmfAttribute> openedAttribute;
for (i = 0; i < n; i++) {
......@@ -2437,7 +2437,7 @@ XdmfFortran::openGridCollectionGrid(const int gridType,
mPreviousAttributes.push_back(openedAttribute);
}
}
if (openMaps == 1) {
if (openMaps) {
n = openedGrid->getNumberMaps();
shared_ptr<XdmfMap> openedMap;
for (i = 0; i < n; i++) {
......@@ -2446,7 +2446,7 @@ XdmfFortran::openGridCollectionGrid(const int gridType,
mPreviousMaps.push_back(openedMap);
}
}
if (openInformation == 1) {
if (openInformation) {
n = openedGrid->getNumberInformations();
shared_ptr<XdmfInformation> openedInformation;
for (i = 0; i < n; i++) {
......@@ -2455,7 +2455,7 @@ XdmfFortran::openGridCollectionGrid(const int gridType,
mPreviousInformations.push_back(openedInformation);
}
}
if (openSets == 1) {
if (openSets) {
n = openedGrid->getNumberSets();
shared_ptr<XdmfSet> openedSet;
for (i = 0; i < n; i++) {
......@@ -2485,7 +2485,7 @@ XdmfFortran::openGridCollectionGrid(const int gridType,
mDimensions = openedGrid->getDimensions();
int i;
int n;
if (openAttributes == 1) {
if (openAttributes) {
n = openedGrid->getNumberAttributes();
shared_ptr<XdmfAttribute> openedAttribute;
for (i = 0; i < n; i++) {
......@@ -2494,7 +2494,7 @@ XdmfFortran::openGridCollectionGrid(const int gridType,
mPreviousAttributes.push_back(openedAttribute);
}
}
if (openMaps == 1) {
if (openMaps) {
n = openedGrid->getNumberMaps();
shared_ptr<XdmfMap> openedMap;
for (i = 0; i < n; i++) {
......@@ -2503,7 +2503,7 @@ XdmfFortran::openGridCollectionGrid(const int gridType,
mPreviousMaps.push_back(openedMap);
}
}
if (openInformation == 1) {
if (openInformation) {
n = openedGrid->getNumberInformations();
shared_ptr<XdmfInformation> openedInformation;
for (i = 0; i < n; i++) {
......@@ -2512,7 +2512,7 @@ XdmfFortran::openGridCollectionGrid(const int gridType,
mPreviousInformations.push_back(openedInformation);
}
}
if (openSets == 1) {
if (openSets) {
n = openedGrid->getNumberSets();
shared_ptr<XdmfSet> openedSet;
for (i = 0; i < n; i++) {
......@@ -2540,7 +2540,7 @@ XdmfFortran::openGridCollectionGrid(const int gridType,
mTime = openedGrid->getTime();
int i;
int n;
if (openAttributes == 1) {
if (openAttributes) {
n = openedGrid->getNumberAttributes();
shared_ptr<XdmfAttribute> openedAttribute;
for (i = 0; i < n; i++) {
......@@ -2549,7 +2549,7 @@ XdmfFortran::openGridCollectionGrid(const int gridType,
mPreviousAttributes.push_back(openedAttribute);
}
}
if (openMaps == 1) {
if (openMaps) {
n = openedGrid->getNumberMaps();
shared_ptr<XdmfMap> openedMap;
for (i = 0; i < n; i++) {
......@@ -2558,7 +2558,7 @@ XdmfFortran::openGridCollectionGrid(const int gridType,
mPreviousMaps.push_back(openedMap);
}
}
if (openInformation == 1) {
if (openInformation) {
n = openedGrid->getNumberInformations();
shared_ptr<XdmfInformation> openedInformation;
for (i = 0; i < n; i++) {
......@@ -2567,7 +2567,7 @@ XdmfFortran::openGridCollectionGrid(const int gridType,
mPreviousInformations.push_back(openedInformation);
}
}
if (openSets == 1) {
if (openSets) {
n = openedGrid->getNumberSets();
shared_ptr<XdmfSet> openedSet;
for (i = 0; i < n; i++) {
......@@ -6720,7 +6720,7 @@ XdmfFortran::openSet(const int index, const int openAttribute, const int openInf
int i;
int n;
n = openedSet->getNumberAttributes();
if (openAttribute == 1) {
if (openAttribute) {
shared_ptr<XdmfAttribute> openedAttribute;
for (i = 0; i < n; i++) {
openedAttribute = openedSet->getAttribute(i);
......@@ -6728,7 +6728,7 @@ XdmfFortran::openSet(const int index, const int openAttribute, const int openInf
mPreviousAttributes.push_back(openedAttribute);
}
}
if (openInformation == 1) {
if (openInformation) {
n = openedSet->getNumberInformations();
shared_ptr<XdmfInformation> openedInformation;
for (i = 0; i < n; i++) {
......
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