System : Replaced tab with four spaces in ApplicationCode and subfolders

ApplicationCode/GeoMech/GeoMechDataModel/RigFemNativeStatCalc.h

@@ -35,15 +35,15 @@ class RigFemNativeStatCalc : public RigStatisticsCalculator
 public:
     RigFemNativeStatCalc(RigFemPartResultsCollection* femResultCollection, const RigFemResultAddress& resVarAddr);
 
-	virtual void minMaxCellScalarValues(size_t timeStepIndex, double& min, double& max);
-	virtual void posNegClosestToZero(size_t timeStepIndex, double& pos, double& neg);
-	virtual void valueSumAndSampleCount(double& valueSum, size_t& sampleCount);
+    virtual void minMaxCellScalarValues(size_t timeStepIndex, double& min, double& max);
+    virtual void posNegClosestToZero(size_t timeStepIndex, double& pos, double& neg);
+    virtual void valueSumAndSampleCount(double& valueSum, size_t& sampleCount);
 
-	virtual void addDataToHistogramCalculator(RigHistogramCalculator& histogramCalculator);
+    virtual void addDataToHistogramCalculator(RigHistogramCalculator& histogramCalculator);
     virtual size_t  timeStepCount();
 
 private:
-	RigFemPartResultsCollection* m_resultsData;
+    RigFemPartResultsCollection* m_resultsData;
     RigFemResultAddress m_resVarAddr;
 };
 

ApplicationCode/GeoMech/OdbReader/RifOdbReader.cpp

@@ -164,7 +164,7 @@ RifOdbReader::RifOdbReader()
         odb_initializeAPI();
     }
 
-	m_odb = NULL;
+    m_odb = NULL;
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -172,7 +172,7 @@ RifOdbReader::RifOdbReader()
 //--------------------------------------------------------------------------------------------------
 RifOdbReader::~RifOdbReader()
 {
-	close();
+    close();
 
     if (--sm_instanceCount == 0)
     {
@@ -185,11 +185,11 @@ RifOdbReader::~RifOdbReader()
 //--------------------------------------------------------------------------------------------------
 void RifOdbReader::close()
 {
-	if (m_odb)
-	{
-		m_odb->close();
-		m_odb = NULL;
-	}
+    if (m_odb)
+    {
+        m_odb->close();
+        m_odb = NULL;
+    }
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -197,17 +197,17 @@ void RifOdbReader::close()
 //--------------------------------------------------------------------------------------------------
 bool RifOdbReader::openFile(const std::string& fileName, std::string* errorMessage)
 {
-	close();
-	CVF_ASSERT(m_odb == NULL);
+    close();
+    CVF_ASSERT(m_odb == NULL);
 
-	odb_String path = fileName.c_str();
+    odb_String path = fileName.c_str();
 
-	try
-	{
-		m_odb = &openOdb(path, true);
-	}
+    try
+    {
+        m_odb = &openOdb(path, true);
+    }
 
-	catch (const nex_Exception& nex) 
+    catch (const nex_Exception& nex) 
     {
         if (errorMessage)
         {
@@ -230,7 +230,7 @@ bool RifOdbReader::openFile(const std::string& fileName, std::string* errorMessa
         return false;
     }
 
-	return true;
+    return true;
 }
 
 
@@ -239,13 +239,13 @@ bool RifOdbReader::openFile(const std::string& fileName, std::string* errorMessa
 //--------------------------------------------------------------------------------------------------
 void RifOdbReader::assertMetaDataLoaded()
 {
-	CVF_ASSERT(m_odb != NULL);
+    CVF_ASSERT(m_odb != NULL);
 
     if (m_resultsMetaData.empty())
-	{
+    {
         m_resultsMetaData = readResultsMetaData(m_odb);
     }
-	
+    
 }
 
 
@@ -254,11 +254,11 @@ void RifOdbReader::assertMetaDataLoaded()
 //--------------------------------------------------------------------------------------------------
 std::map< RifOdbReader::RifOdbResultKey, std::vector<std::string> > RifOdbReader::readResultsMetaData(odb_Odb* odb)
 {
-	CVF_ASSERT(odb != NULL);
+    CVF_ASSERT(odb != NULL);
 
     std::map< RifOdbResultKey, std::vector<std::string> > resultsMap;
 
-	const odb_StepRepository& stepRepository = odb->steps();
+    const odb_StepRepository& stepRepository = odb->steps();
     odb_StepRepositoryIT stepIt(stepRepository);
     stepIt.first();
     
@@ -268,56 +268,56 @@ std::map< RifOdbReader::RifOdbResultKey, std::vector<std::string> > RifOdbReader
     if (stepFrames.size() > 1)
     {
         // Optimization: Get results metadata for the second frame of the first step only
-		const odb_Frame& frame = stepFrames.constGet(1);
-			
-		const odb_FieldOutputRepository& fieldCon = frame.fieldOutputs();
-		odb_FieldOutputRepositoryIT fieldConIT(fieldCon);
+        const odb_Frame& frame = stepFrames.constGet(1);
+            
+        const odb_FieldOutputRepository& fieldCon = frame.fieldOutputs();
+        odb_FieldOutputRepositoryIT fieldConIT(fieldCon);
 
-		for (fieldConIT.first(); !fieldConIT.isDone(); fieldConIT.next()) 
-		{
-			const odb_FieldOutput& field = fieldCon[fieldConIT.currentKey()]; 
-			
-			const odb_SequenceFieldLocation& fieldLocations = field.locations();
-			for (int loc = 0; loc < fieldLocations.size(); loc++)
-			{
-				const odb_FieldLocation& fieldLocation = fieldLocations.constGet(loc);
+        for (fieldConIT.first(); !fieldConIT.isDone(); fieldConIT.next()) 
+        {
+            const odb_FieldOutput& field = fieldCon[fieldConIT.currentKey()]; 
+            
+            const odb_SequenceFieldLocation& fieldLocations = field.locations();
+            for (int loc = 0; loc < fieldLocations.size(); loc++)
+            {
+                const odb_FieldLocation& fieldLocation = fieldLocations.constGet(loc);
 
-				std::string fieldName = field.name().CStr();
-				odb_SequenceString components = field.componentLabels();
+                std::string fieldName = field.name().CStr();
+                odb_SequenceString components = field.componentLabels();
 
-				std::vector<std::string> compVec;
+                std::vector<std::string> compVec;
 
-				int numComp = components.size();
-				for (int comp = 0; comp < numComp; comp++)
-				{
-					compVec.push_back(components[comp].CStr());
-				}
+                int numComp = components.size();
+                for (int comp = 0; comp < numComp; comp++)
+                {
+                    compVec.push_back(components[comp].CStr());
+                }
 
-				switch (fieldLocation.position())
-				{
-					case odb_Enum::NODAL:
+                switch (fieldLocation.position())
+                {
+                    case odb_Enum::NODAL:
                         resultsMap[RifOdbResultKey(NODAL, fieldName)] = compVec;
-						break;
+                        break;
 
                     case odb_Enum::ELEMENT_NODAL:
                         resultsMap[RifOdbResultKey(ELEMENT_NODAL, fieldName)] = compVec;
-						break;
+                        break;
 
-					case odb_Enum::INTEGRATION_POINT:
+                    case odb_Enum::INTEGRATION_POINT:
                         resultsMap[RifOdbResultKey(INTEGRATION_POINT, fieldName)] = compVec;
                         resultsMap[RifOdbResultKey(ELEMENT_NODAL, fieldName)] = compVec;
-						break;
+                        break;
 
-					default:
-						break;
-				}
-			}
+                    default:
+                        break;
+                }
+            }
         }
     }
 
     stepFrames.release();
 
-	return resultsMap;
+    return resultsMap;
 }
 
 
@@ -327,7 +327,7 @@ std::map< RifOdbReader::RifOdbResultKey, std::vector<std::string> > RifOdbReader
 bool RifOdbReader::readFemParts(RigFemPartCollection* femParts)
 {
     CVF_ASSERT(femParts);
-	CVF_ASSERT(m_odb != NULL);
+    CVF_ASSERT(m_odb != NULL);
 
 
     odb_Assembly&  rootAssembly = m_odb->rootAssembly();
@@ -418,7 +418,7 @@ bool RifOdbReader::readFemParts(RigFemPartCollection* femParts)
         modelProgress.incrementProgress();
     }
     
-	return true;
+    return true;
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -426,18 +426,18 @@ bool RifOdbReader::readFemParts(RigFemPartCollection* femParts)
 //--------------------------------------------------------------------------------------------------
 std::vector<std::string> RifOdbReader::stepNames()
 {
-	CVF_ASSERT(m_odb != NULL);
+    CVF_ASSERT(m_odb != NULL);
 
-	std::vector<std::string> stepNames;
+    std::vector<std::string> stepNames;
 
-	odb_StepRepository stepRepository = m_odb->steps();
-	odb_StepRepositoryIT sIter(stepRepository);
-	for (sIter.first(); !sIter.isDone(); sIter.next()) 
-	{
-		stepNames.push_back(stepRepository[sIter.currentKey()].name().CStr());
-	}
+    odb_StepRepository stepRepository = m_odb->steps();
+    odb_StepRepositoryIT sIter(stepRepository);
+    for (sIter.first(); !sIter.isDone(); sIter.next()) 
+    {
+        stepNames.push_back(stepRepository[sIter.currentKey()].name().CStr());
+    }
 
-	return stepNames;
+    return stepNames;
 }
 
 
@@ -446,25 +446,25 @@ std::vector<std::string> RifOdbReader::stepNames()
 //--------------------------------------------------------------------------------------------------
 std::vector<double> RifOdbReader::frameTimes(int stepIndex)
 {
-	CVF_ASSERT(m_odb != NULL);
+    CVF_ASSERT(m_odb != NULL);
 
-	odb_StepRepository& stepRepository = m_odb->steps();
+    odb_StepRepository& stepRepository = m_odb->steps();
 
-	odb_StepList stepList = stepRepository.stepList();
-	odb_Step& step = stepList.Get(stepIndex);
-	
-	odb_SequenceFrame& stepFrames = step.frames();
+    odb_StepList stepList = stepRepository.stepList();
+    odb_Step& step = stepList.Get(stepIndex);
+    
+    odb_SequenceFrame& stepFrames = step.frames();
 
-	std::vector<double> frameValues;
+    std::vector<double> frameValues;
 
-	int numFrames = stepFrames.size();
-	for (int f = 0; f < numFrames; f++) 
-	{
-		odb_Frame frame = stepFrames.constGet(f);
-		frameValues.push_back(frame.frameValue());
-	}
+    int numFrames = stepFrames.size();
+    for (int f = 0; f < numFrames; f++) 
+    {
+        odb_Frame frame = stepFrames.constGet(f);
+        frameValues.push_back(frame.frameValue());
+    }
 
-	return frameValues;
+    return frameValues;
 }
 
 
@@ -485,24 +485,24 @@ std::vector<std::string> RifOdbReader::elementSetNames(int partIndex)
         
         int currentInstance = 0;
         odb_InstanceRepositoryIT instIt(instances);
-	    for (instIt.first(); !instIt.isDone(); instIt.next(), currentInstance++) 
-	    {
+        for (instIt.first(); !instIt.isDone(); instIt.next(), currentInstance++) 
+        {
             const odb_Instance& instance = instIt.currentValue();
 
             if (currentInstance == partIndex)
             {
                 const odb_SetRepository& sets = rootAssembly.elementSets();
-	
-	            odb_SetRepositoryIT setIt(sets);
-	            for (setIt.first(); !setIt.isDone(); setIt.next()) 
-	            {
+    
+                odb_SetRepositoryIT setIt(sets);
+                for (setIt.first(); !setIt.isDone(); setIt.next()) 
+                {
                     const odb_Set& set = setIt.currentValue();
                     setNames.push_back(set.name().CStr());
-	            }
+                }
 
                 break;
             }
-	    }
+        }
 
         m_partElementSetNames[partIndex] = setNames;
     }
@@ -524,16 +524,16 @@ std::vector<size_t> RifOdbReader::elementSet(int partIndex, int setIndex)
     const odb_Set& set = rootAssembly.elementSets()[odb_String(setNames[setIndex].c_str())];  
     odb_SequenceString instanceNames = set.instanceNames();
 
-	const odb_SequenceElement& setElements = set.elements(instanceNames[partIndex]);
-	int elementCount = setElements.size();
+    const odb_SequenceElement& setElements = set.elements(instanceNames[partIndex]);
+    int elementCount = setElements.size();
 
     std::vector<size_t> elementIndexes;
     elementIndexes.resize(elementCount);
 
-	for (int i = 0; i < elementCount; i++) 
-	{
+    for (int i = 0; i < elementCount; i++) 
+    {
         elementIndexes[i] = setElements.element(i).index();
-	}
+    }
 
     return elementIndexes;
 }
@@ -571,14 +571,14 @@ std::map<std::string, std::vector<std::string> > RifOdbReader::scalarIntegration
 //--------------------------------------------------------------------------------------------------
 const odb_Frame& RifOdbReader::stepFrame(int stepIndex, int frameIndex) const
 {
-	CVF_ASSERT(m_odb);
+    CVF_ASSERT(m_odb);
 
-	const odb_StepRepository& stepRepository = m_odb->steps();
-	const odb_StepList& stepList = stepRepository.stepList();
+    const odb_StepRepository& stepRepository = m_odb->steps();
+    const odb_StepList& stepList = stepRepository.stepList();
     const odb_Step& step = stepList.ConstGet(stepIndex);
-	const odb_SequenceFrame& stepFrames = step.frames();
+    const odb_SequenceFrame& stepFrames = step.frames();
 
-	return stepFrames.constGet(frameIndex);
+    return stepFrames.constGet(frameIndex);
 }
 
 
@@ -616,20 +616,20 @@ size_t RifOdbReader::resultItemCount(const std::string& fieldName, int partIndex
     odb_Instance* partInstance = instance(partIndex);
     CVF_ASSERT(partInstance != NULL);
 
-	const odb_Frame& frame = stepFrame(stepIndex, frameIndex);
-	const odb_FieldOutput& instanceFieldOutput = frame.fieldOutputs()[fieldName.c_str()].getSubset(*partInstance);
-	const odb_SequenceFieldBulkData& seqFieldBulkData = instanceFieldOutput.bulkDataBlocks();
+    const odb_Frame& frame = stepFrame(stepIndex, frameIndex);
+    const odb_FieldOutput& instanceFieldOutput = frame.fieldOutputs()[fieldName.c_str()].getSubset(*partInstance);
+    const odb_SequenceFieldBulkData& seqFieldBulkData = instanceFieldOutput.bulkDataBlocks();
 
-	size_t resultItemCount = 0;
-	int numBlocks = seqFieldBulkData.size();
+    size_t resultItemCount = 0;
+    int numBlocks = seqFieldBulkData.size();
 
-	for (int block = 0; block < numBlocks; block++)
-	{
-		const odb_FieldBulkData& bulkData =	seqFieldBulkData[block];
-		resultItemCount += bulkData.length();
-	}
+    for (int block = 0; block < numBlocks; block++)
+    {
+        const odb_FieldBulkData& bulkData =    seqFieldBulkData[block];
+        resultItemCount += bulkData.length();
+    }
 
-	return resultItemCount;
+    return resultItemCount;
 }
 
 
@@ -648,21 +648,21 @@ size_t RifOdbReader::componentsCount(const std::string& fieldName, ResultPositio
 //--------------------------------------------------------------------------------------------------
 int RifOdbReader::componentIndex(const RifOdbResultKey& result, const std::string& componentName)
 {
-	std::vector<std::string> compNames = componentNames(result);
+    std::vector<std::string> compNames = componentNames(result);
 
     // If there are no component names, we expect the field to be a pure scalar.
     // Then an empty string is the valid component name
     if (!compNames.size() && componentName == "") return 0;
 
-	for (size_t i = 0; i < compNames.size(); i++)
-	{
-		if (compNames[i] == componentName)
-		{
-			return static_cast<int>(i);
-		}
-	}
+    for (size_t i = 0; i < compNames.size(); i++)
+    {
+        if (compNames[i] == componentName)
+        {
+            return static_cast<int>(i);
+        }
+    }
 
-	return -1;
+    return -1;
 }
 
 
@@ -674,15 +674,15 @@ std::vector<std::string> RifOdbReader::componentNames(const RifOdbResultKey& res
     assertMetaDataLoaded();
 
     std::map< RifOdbResultKey, std::vector<std::string> >::const_iterator resMapIt = m_resultsMetaData.find(result);
-	if (resMapIt != m_resultsMetaData.end())
-	{
+    if (resMapIt != m_resultsMetaData.end())
+    {
         std::vector<std::string> compNames;
         compNames = resMapIt->second;
         return compNames;
-	}
-	
+    }
+    
     CVF_ASSERT(false);
-	return std::vector<std::string>();
+    return std::vector<std::string>();
 }
 
 
@@ -697,12 +697,12 @@ std::map<std::string, std::vector<std::string> > RifOdbReader::fieldAndComponent
 
     std::map< RifOdbResultKey, std::vector<std::string> >::const_iterator resMapIt;
     for (resMapIt = m_resultsMetaData.begin(); resMapIt != m_resultsMetaData.end(); resMapIt++)
-	{
+    {
         if (resMapIt->first.resultPostion == position)
         {
             fieldsAndComponents[resMapIt->first.fieldName] = resMapIt->second;
         }
-	}
+    }
 
     return fieldsAndComponents;
 }
@@ -713,42 +713,42 @@ std::map<std::string, std::vector<std::string> > RifOdbReader::fieldAndComponent
 //--------------------------------------------------------------------------------------------------
 void RifOdbReader::readDisplacements(int partIndex, int stepIndex, int frameIndex, std::vector<cvf::Vec3f>* displacements)
 {
-	CVF_ASSERT(displacements);
+    CVF_ASSERT(displacements);
 
     odb_Instance* partInstance = instance(partIndex);
     CVF_ASSERT(partInstance != NULL);
 
-	size_t dataSize = resultItemCount("U", partIndex, stepIndex, frameIndex);
-	if (dataSize > 0)
-	{
-		displacements->resize(dataSize);
-	}
+    size_t dataSize = resultItemCount("U", partIndex, stepIndex, frameIndex);
+    if (dataSize > 0)
+    {
+        displacements->resize(dataSize);
+    }
 
-	const odb_Frame& frame = stepFrame(stepIndex, frameIndex);
-	const odb_FieldOutput& instanceFieldOutput = frame.fieldOutputs()["U"].getSubset(*partInstance);
-	const odb_SequenceFieldBulkData& seqFieldBulkData = instanceFieldOutput.bulkDataBlocks();
+    const odb_Frame& frame = stepFrame(stepIndex, frameIndex);
+    const odb_FieldOutput& instanceFieldOutput = frame.fieldOutputs()["U"].getSubset(*partInstance);
+    const odb_SequenceFieldBulkData& seqFieldBulkData = instanceFieldOutput.bulkDataBlocks();
 
-	size_t dataIndex = 0;
-	int numBlocks = seqFieldBulkData.size();
-	for (int block = 0; block < numBlocks; block++)
-	{
-		const odb_FieldBulkData& bulkData =	seqFieldBulkData[block];
+    size_t dataIndex = 0;
+    int numBlocks = seqFieldBulkData.size();
+    for (int block = 0; block < numBlocks; block++)
+    {
+        const odb_FieldBulkData& bulkData =    seqFieldBulkData[block];
         RifOdbBulkDataGetter bulkDataGetter(bulkData);
 
-		if (bulkData.numberOfNodes() > 0)
-		{
-			int numNodes = bulkData.length();
-			int numComp = bulkData.width();
+        if (bulkData.numberOfNodes() > 0)
+        {
+            int numNodes = bulkData.length();
+            int numComp = bulkData.width();
             float* data = bulkDataGetter.data();
 
-			for (int i = 0; i < numNodes; i++)
-			{
-				(*displacements)[i + dataIndex].set(data[i*numComp], data[i*numComp + 1], data[i*numComp + 2]);
-			}
+            for (int i = 0; i < numNodes; i++)
+            {
+                (*displacements)[i + dataIndex].set(data[i*numComp], data[i*numComp + 1], data[i*numComp + 2]);
+            }
 
-			dataIndex += numNodes*numComp;
-		}
-	}
+            dataIndex += numNodes*numComp;
+        }
+    }
 }
 
 
@@ -757,7 +757,7 @@ void RifOdbReader::readDisplacements(int partIndex, int stepIndex, int frameInde
 //--------------------------------------------------------------------------------------------------
 void RifOdbReader::readNodeField(const std::string& fieldName, int partIndex, int stepIndex, int frameIndex, std::vector<std::vector<float>*>* resultValues)
 {
-	CVF_ASSERT(resultValues);
+    CVF_ASSERT(resultValues);
 
     odb_Instance* partInstance = instance(partIndex);
     CVF_ASSERT(partInstance != NULL);
@@ -769,42 +769,42 @@ void RifOdbReader::readNodeField(const std::string& fieldName, int partIndex, in
 
     size_t dataSize = nodeIdToIdxMap.size();
 
-	if (dataSize > 0)
-	{
+    if (dataSize > 0)
+    {
         for (int comp = 0; comp < compCount; comp++)
-	    {
+        {
             CVF_ASSERT((*resultValues)[comp]);
 
-		    (*resultValues)[comp]->resize(dataSize, std::numeric_limits<float>::infinity());
+            (*resultValues)[comp]->resize(dataSize, std::numeric_limits<float>::infinity());
         }
-	}
+    }
 
-	const odb_Frame& frame = stepFrame(stepIndex, frameIndex);
-	const odb_FieldOutput& instanceFieldOutput = frame.fieldOutputs()[fieldName.c_str()].getSubset(*partInstance);
+    const odb_Frame& frame = stepFrame(stepIndex, frameIndex);
+    const odb_FieldOutput& instanceFieldOutput = frame.fieldOutputs()[fieldName.c_str()].getSubset(*partInstance);
     const odb_FieldOutput& fieldOutput = instanceFieldOutput.getSubset(odb_Enum::NODAL);
-	const odb_SequenceFieldBulkData& seqFieldBulkData = fieldOutput.bulkDataBlocks();
+    const odb_SequenceFieldBulkData& seqFieldBulkData = fieldOutput.bulkDataBlocks();
 
-	size_t dataIndex = 0;
-	int numBlocks = seqFieldBulkData.size();
-	for (int block = 0; block < numBlocks; block++)
-	{
-		const odb_FieldBulkData& bulkData =	seqFieldBulkData[block];
+    size_t dataIndex = 0;
+    int numBlocks = seqFieldBulkData.size();
+    for (int block = 0; block < numBlocks; block++)
+    {
+        const odb_FieldBulkData& bulkData =    seqFieldBulkData[block];
         RifOdbBulkDataGetter bulkDataGetter(bulkData);
 
-		int numNodes = bulkData.length();
-		int numComp = bulkData.width();
+        int numNodes = bulkData.length();
+        int numComp = bulkData.width();
         int* nodeLabels = bulkData.nodeLabels();
         float* data = bulkDataGetter.data();
 
-		for (int nIdx = 0; nIdx < numNodes; nIdx++)
-		{
+        for (int nIdx = 0; nIdx < numNodes; nIdx++)
+        {
             for (int comp = 0; comp < numComp; comp++)
             {
                 std::vector<float>* singleComponentValues = (*resultValues)[comp];
                 (*singleComponentValues)[nodeIdToIdxMap[nodeLabels[nIdx]]] = data[nIdx*numComp + comp];
             }
-		}
-	}
+        }
+    }
 }
 
 
@@ -824,36 +824,36 @@ void RifOdbReader::readElementNodeField(const std::string& fieldName,
     CVF_ASSERT(compCount == resultValues->size());
 
     size_t dataSize = resultItemCount(fieldName, partIndex, stepIndex, frameIndex);
-	if (dataSize > 0)
-	{
+    if (dataSize > 0)
+    {
         for (int comp = 0; comp < compCount; comp++)
-	    {
+        {
             CVF_ASSERT((*resultValues)[comp]);
 
-		    (*resultValues)[comp]->resize(dataSize, std::numeric_limits<float>::infinity());
+            (*resultValues)[comp]->resize(dataSize, std::numeric_limits<float>::infinity());
         }
-	}
+    }
 
-	const odb_Frame& frame = stepFrame(stepIndex, frameIndex);
-	const odb_FieldOutput& instanceFieldOutput = frame.fieldOutputs()[fieldName.c_str()].getSubset(*partInstance);
+    const odb_Frame& frame = stepFrame(stepIndex, frameIndex);
+    const odb_FieldOutput& instanceFieldOutput = frame.fieldOutputs()[fieldName.c_str()].getSubset(*partInstance);
     const odb_FieldOutput& fieldOutput = instanceFieldOutput.getSubset(odb_Enum::ELEMENT_NODAL);
-	const odb_SequenceFieldBulkData& seqFieldBulkData = fieldOutput.bulkDataBlocks();
+    const odb_SequenceFieldBulkData& seqFieldBulkData = fieldOutput.bulkDataBlocks();
 
     std::map<int, int>& elementIdToIdxMap = m_elementIdToIdxMaps[partIndex];
     CVF_ASSERT(elementIdToIdxMap.size() > 0);
-	    
+        
     size_t dataIndex = 0;
-	int numBlocks = seqFieldBulkData.size();
-	for (int block = 0; block < numBlocks; block++)
-	{
-		const odb_FieldBulkData& bulkData =	seqFieldBulkData[block];
+    int numBlocks = seqFieldBulkData.size();
+    for (int block = 0; block < numBlocks; block++)
+    {
+        const odb_FieldBulkData& bulkData =    seqFieldBulkData[block];
         RifOdbBulkDataGetter bulkDataGetter(bulkData);
 
-		int numValues = bulkData.length();
-		int numComp = bulkData.width();
+        int numValues = bulkData.length();
+        int numComp = bulkData.width();
         int elemCount = bulkData.numberOfElements();
-		int elemNodeCount = numValues/elemCount;
-		int* elementLabels = bulkData.elementLabels();
+        int elemNodeCount = numValues/elemCount;
+        int* elementLabels = bulkData.elementLabels();
         float* data = bulkDataGetter.data();
 
         for (int elem = 0; elem < elemCount; elem++)
@@ -873,7 +873,7 @@ void RifOdbReader::readElementNodeField(const std::string& fieldName,
                 }
             }
         }
-	}
+    }
 }
 
 
@@ -891,36 +891,36 @@ void RifOdbReader::readIntegrationPointField(const std::string& fieldName, int p
     CVF_ASSERT(compCount == resultValues->size());
 
     size_t dataSize = resultItemCount(fieldName, partIndex, stepIndex, frameIndex);
-	if (dataSize > 0)
-	{
+    if (dataSize > 0)
+    {
         for (int comp = 0; comp < compCount; comp++)
-	    {
+        {
             CVF_ASSERT((*resultValues)[comp]);
 
-		    (*resultValues)[comp]->resize(dataSize, std::numeric_limits<float>::infinity());
+            (*resultValues)[comp]->resize(dataSize, std::numeric_limits<float>::infinity());
         }
-	}
+    }
 
-	const odb_Frame& frame = stepFrame(stepIndex, frameIndex);
-	const odb_FieldOutput& instanceFieldOutput = frame.fieldOutputs()[fieldName.c_str()].getSubset(*partInstance);
+    const odb_Frame& frame = stepFrame(stepIndex, frameIndex);
+    const odb_FieldOutput& instanceFieldOutput = frame.fieldOutputs()[fieldName.c_str()].getSubset(*partInstance);
     const odb_FieldOutput& fieldOutput = instanceFieldOutput.getSubset(odb_Enum::INTEGRATION_POINT);
-	const odb_SequenceFieldBulkData& seqFieldBulkData = fieldOutput.bulkDataBlocks();
+    const odb_SequenceFieldBulkData& seqFieldBulkData = fieldOutput.bulkDataBlocks();
 
     std::map<int, int>& elementIdToIdxMap = m_elementIdToIdxMaps[partIndex];
     CVF_ASSERT(elementIdToIdxMap.size() > 0);
-	    
+        
     size_t dataIndex = 0;
-	int numBlocks = seqFieldBulkData.size();
-	for (int block = 0; block < numBlocks; block++)
-	{
-		const odb_FieldBulkData& bulkData =	seqFieldBulkData[block];
+    int numBlocks = seqFieldBulkData.size();
+    for (int block = 0; block < numBlocks; block++)
+    {
+        const odb_FieldBulkData& bulkData =    seqFieldBulkData[block];
         RifOdbBulkDataGetter bulkDataGetter(bulkData);
 
-		int numValues = bulkData.length();
-		int numComp = bulkData.width();
+        int numValues = bulkData.length();
+        int numComp = bulkData.width();
         int elemCount = bulkData.numberOfElements();
-		int ipCount = numValues/elemCount;
-		int* elementLabels = bulkData.elementLabels();
+        int ipCount = numValues/elemCount;
+        int* elementLabels = bulkData.elementLabels();
         float* data = bulkDataGetter.data();
 
         RigElementType eType = toRigElementType(bulkData.baseElementType());
@@ -945,5 +945,5 @@ void RifOdbReader::readIntegrationPointField(const std::string& fieldName, int p
                 }
             }
         }
-	}
+    }
 }

ApplicationCode/GeoMech/OdbReader/RifOdbReader.h

@@ -41,7 +41,7 @@ public:
     RifOdbReader();
     virtual ~RifOdbReader();
 
-	virtual bool                                                openFile(const std::string& fileName, std::string* errorMessage);
+    virtual bool                                                openFile(const std::string& fileName, std::string* errorMessage);
 
     virtual bool                                                readFemParts(RigFemPartCollection* geoMechCase);
     virtual std::vector<std::string>                            stepNames();
@@ -63,9 +63,9 @@ public:
 private:
     enum ResultPosition
     {
-	    NODAL,
-	    ELEMENT_NODAL,
-	    INTEGRATION_POINT
+        NODAL,
+        ELEMENT_NODAL,
+        INTEGRATION_POINT
     };
 
     class RifOdbResultKey
@@ -93,7 +93,7 @@ private:
     size_t                                                  resultItemCount(const std::string& fieldName, int partIndex, int stepIndex, int frameIndex);
     size_t                                                  componentsCount(const std::string& fieldName, ResultPosition position);
     const odb_Frame&                                        stepFrame(int stepIndex, int frameIndex) const;
-    odb_Instance*									        instance(int instanceIndex);
+    odb_Instance*                                            instance(int instanceIndex);
 
     int                                                     componentIndex(const RifOdbResultKey& result, const std::string& componentName);
     std::vector<std::string>                                componentNames(const RifOdbResultKey& result);
@@ -108,5 +108,5 @@ private:
     std::vector< std::map<int, int> >                       m_nodeIdToIdxMaps;
     std::vector< std::map<int, int> >                       m_elementIdToIdxMaps;
 
-	static size_t                                           sm_instanceCount;
+    static size_t                                           sm_instanceCount;
 };

ApplicationCode/GeoMech/OdbReader_UnitTests/RifOdbReader-Test.cpp

@@ -41,84 +41,84 @@ TEST(OdbReaderTest, BasicTests)
     cvf::DebugTimer timer("DebugTimer");
     timer.reportTime();
 
-	reader->openFile(TEST_FILE);
+    reader->openFile(TEST_FILE);
     reader->readFemParts(femData.p());
 
     EXPECT_EQ(1, femData->partCount());
     EXPECT_EQ(4320, femData->part(0)->elementCount());
     EXPECT_EQ(HEX8, femData->part(0)->elementType(0));
 
-	EXPECT_EQ(true, reader->stepNames().size() == 1);
+    EXPECT_EQ(true, reader->stepNames().size() == 1);
 
-	std::vector<std::string> steps = reader->stepNames();
-	EXPECT_EQ(true, steps.at(0).find("Date_20100930") >= 0);
-	EXPECT_EQ(2, reader->frameTimes(0).size());
-	EXPECT_EQ(1.0, reader->frameTimes(0)[1]);
+    std::vector<std::string> steps = reader->stepNames();
+    EXPECT_EQ(true, steps.at(0).find("Date_20100930") >= 0);
+    EXPECT_EQ(2, reader->frameTimes(0).size());
+    EXPECT_EQ(1.0, reader->frameTimes(0)[1]);
 
-	std::map<std::string, std::vector<std::string> > scalarNodeFieldsMap = reader->scalarNodeFieldAndComponentNames();
-	EXPECT_EQ(3, scalarNodeFieldsMap.size());
-	
-	std::map<std::string, std::vector<std::string> > scalarElementNodeFieldsMap = reader->scalarElementNodeFieldAndComponentNames();
-	EXPECT_EQ(0, scalarElementNodeFieldsMap.size());
-	
-	std::map<std::string, std::vector<std::string> > scalarIntegrationPointFieldsMap = reader->scalarIntegrationPointFieldAndComponentNames();
-	EXPECT_EQ(6, scalarIntegrationPointFieldsMap.size());
+    std::map<std::string, std::vector<std::string> > scalarNodeFieldsMap = reader->scalarNodeFieldAndComponentNames();
+    EXPECT_EQ(3, scalarNodeFieldsMap.size());
+    
+    std::map<std::string, std::vector<std::string> > scalarElementNodeFieldsMap = reader->scalarElementNodeFieldAndComponentNames();
+    EXPECT_EQ(0, scalarElementNodeFieldsMap.size());
+    
+    std::map<std::string, std::vector<std::string> > scalarIntegrationPointFieldsMap = reader->scalarIntegrationPointFieldAndComponentNames();
+    EXPECT_EQ(6, scalarIntegrationPointFieldsMap.size());
 
-	std::vector<float> displacementValues;
-	reader->readScalarNodeField("U", "U2", 0, 0, 1, &displacementValues);
-	EXPECT_EQ(5168, displacementValues.size());
+    std::vector<float> displacementValues;
+    reader->readScalarNodeField("U", "U2", 0, 0, 1, &displacementValues);
+    EXPECT_EQ(5168, displacementValues.size());
 
-	std::vector<float> integrationPointS22;
+    std::vector<float> integrationPointS22;
     timer.restart();
-	reader->readScalarIntegrationPointField("S", "S22", 0, 0, 1, &integrationPointS22);
+    reader->readScalarIntegrationPointField("S", "S22", 0, 0, 1, &integrationPointS22);
     timer.reportLapTime("Read S/S22");
     timer.restart();
-	reader->readScalarIntegrationPointField("S", "S22", 0, 0, 1, &integrationPointS22);
+    reader->readScalarIntegrationPointField("S", "S22", 0, 0, 1, &integrationPointS22);
     timer.reportLapTime("Read S/S22 2nd time");
     timer.restart();
-	reader->readScalarIntegrationPointField("S", "S22", 0, 0, 1, &integrationPointS22);
+    reader->readScalarIntegrationPointField("S", "S22", 0, 0, 1, &integrationPointS22);
     timer.reportLapTime("Read S/S22 3rd time");
     EXPECT_EQ(34560, integrationPointS22.size());
-	EXPECT_FLOAT_EQ(-1921117.3, integrationPointS22[0]);
-	EXPECT_FLOAT_EQ(-1408592.5, integrationPointS22[1]);
-	EXPECT_FLOAT_EQ(-1345666.9, integrationPointS22[2]);
+    EXPECT_FLOAT_EQ(-1921117.3, integrationPointS22[0]);
+    EXPECT_FLOAT_EQ(-1408592.5, integrationPointS22[1]);
+    EXPECT_FLOAT_EQ(-1345666.9, integrationPointS22[2]);
 
-   	std::vector<float> elementNodeS11;
+       std::vector<float> elementNodeS11;
     reader->readScalarElementNodeField("S", "S11", 0, 0, 1, &elementNodeS11);
-	EXPECT_EQ(34560, elementNodeS11.size());
-	EXPECT_FLOAT_EQ(-2074357.3, elementNodeS11[0]);
-	EXPECT_FLOAT_EQ(-1353137.5, elementNodeS11[1]);
-	EXPECT_FLOAT_EQ(-1144559.4, elementNodeS11[2]);
+    EXPECT_EQ(34560, elementNodeS11.size());
+    EXPECT_FLOAT_EQ(-2074357.3, elementNodeS11[0]);
+    EXPECT_FLOAT_EQ(-1353137.5, elementNodeS11[1]);
+    EXPECT_FLOAT_EQ(-1144559.4, elementNodeS11[2]);
 
-	std::vector<float> integrationPointE33;
-	reader->readScalarIntegrationPointField("E", "E33", 0, 0, 1, &integrationPointE33);
-	EXPECT_EQ(34560, integrationPointE33.size());
+    std::vector<float> integrationPointE33;
+    reader->readScalarIntegrationPointField("E", "E33", 0, 0, 1, &integrationPointE33);
+    EXPECT_EQ(34560, integrationPointE33.size());
 
-	std::vector<float> integrationPointTEMP;
-	reader->readScalarIntegrationPointField("TEMP", "", 0, 0, 1, &integrationPointTEMP);
-	EXPECT_EQ(34560, integrationPointTEMP.size());
+    std::vector<float> integrationPointTEMP;
+    reader->readScalarIntegrationPointField("TEMP", "", 0, 0, 1, &integrationPointTEMP);
+    EXPECT_EQ(34560, integrationPointTEMP.size());
 
-	std::vector<cvf::Vec3f> displacements;
-	reader->readDisplacements(0, 0, 1, &displacements);
-	EXPECT_EQ(5168, displacements.size());
-	EXPECT_FLOAT_EQ(0.047638997, displacements[1].y());
-	EXPECT_FLOAT_EQ(-0.0036307564, displacements[6].x());
-	EXPECT_FLOAT_EQ(0.065709047, displacements[6].y());
-	EXPECT_FLOAT_EQ(-0.059760433, displacements[6].z());
+    std::vector<cvf::Vec3f> displacements;
+    reader->readDisplacements(0, 0, 1, &displacements);
+    EXPECT_EQ(5168, displacements.size());
+    EXPECT_FLOAT_EQ(0.047638997, displacements[1].y());
+    EXPECT_FLOAT_EQ(-0.0036307564, displacements[6].x());
+    EXPECT_FLOAT_EQ(0.065709047, displacements[6].y());
+    EXPECT_FLOAT_EQ(-0.059760433, displacements[6].z());
 
-	std::vector<float> porValues;
-	reader->readScalarNodeField("POR", "", 0, 0, 1, &porValues);
-	EXPECT_EQ(5168, porValues.size());
+    std::vector<float> porValues;
+    reader->readScalarNodeField("POR", "", 0, 0, 1, &porValues);
+    EXPECT_EQ(5168, porValues.size());
 
-	std::vector<float> voidrValues;
-	reader->readScalarIntegrationPointField("VOIDR", "", 0, 0, 0, &voidrValues);
-	EXPECT_EQ(34560, voidrValues.size());
-	EXPECT_FLOAT_EQ(0.22864963, voidrValues[0]);
-	EXPECT_FLOAT_EQ(0.23406270, voidrValues[1]);
-	EXPECT_FLOAT_EQ(0.24549910, voidrValues[2]);
+    std::vector<float> voidrValues;
+    reader->readScalarIntegrationPointField("VOIDR", "", 0, 0, 0, &voidrValues);
+    EXPECT_EQ(34560, voidrValues.size());
+    EXPECT_FLOAT_EQ(0.22864963, voidrValues[0]);
+    EXPECT_FLOAT_EQ(0.23406270, voidrValues[1]);
+    EXPECT_FLOAT_EQ(0.24549910, voidrValues[2]);
 
     timer.restart();
-   	reader->readScalarIntegrationPointField("S", "S22", 0, 0, 1, &integrationPointS22);
+       reader->readScalarIntegrationPointField("S", "S22", 0, 0, 1, &integrationPointS22);
     timer.reportLapTime("Read S/S22 final time");
 }