OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added C3D8 elements. Removed unused close()

Browse Source 
Close (or something similar) will be added when needed.
This commit is contained in:
Jacob Støren 2015-04-28 09:21:27 +02:00
parent 8be93ae448
commit 0560457cd2
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/GeoMech/OdbReader/RifGeoMechReaderInterface.h
View File

@ -38,7 +38,6 @@ public:
virtual ~RifGeoMechReaderInterface(); virtual ~RifGeoMechReaderInterface();
virtual bool readFemParts(const std::string& fileName, RigFemPartCollection* geoMechCase) = 0; virtual bool readFemParts(const std::string& fileName, RigFemPartCollection* geoMechCase) = 0;
virtual void close() = 0;
virtual std::vector<double> timeSteps() = 0; virtual std::vector<double> timeSteps() = 0;
virtual std::vector<std::string> scalarNodeResultNames() = 0; virtual std::vector<std::string> scalarNodeResultNames() = 0;

19
ApplicationCode/GeoMech/OdbReader/RifOdbReader.cpp
View File

@ -25,11 +25,14 @@
#include <odb_API.h> #include <odb_API.h>
#include <map> #include <map>
#include <iostream>
std::map<std::string, RigElementType> initFemTypeMap() std::map<std::string, RigElementType> initFemTypeMap()
{ {
std::map<std::string, RigElementType> typeMap; std::map<std::string, RigElementType> typeMap;
typeMap["C3D8R"] = HEX8; typeMap["C3D8R"] = HEX8;
typeMap["C3D8"] = HEX8;
typeMap["C3D8P"] = HEX8;
typeMap["CAX4"] = CAX4; typeMap["CAX4"] = CAX4;
return typeMap; return typeMap;
@ -105,7 +108,13 @@ void readOdbFile(const std::string& fileName, RigFemPartCollection* femParts)
// Get the type // Get the type
it = odbElmTypeToRigElmTypeMap.find(odbElm.type().cStr()); it = odbElmTypeToRigElmTypeMap.find(odbElm.type().cStr());
if (it == odbElmTypeToRigElmTypeMap.end()) continue; // Unsupported type if (it == odbElmTypeToRigElmTypeMap.end())
{
#if 0
std::cout << "Unsupported element type :" << odbElm.type().cStr() << std::endl;
#endif
continue; // Unsupported type
}
RigElementType elmType = it->second; RigElementType elmType = it->second;
@ -160,14 +169,6 @@ bool RifOdbReader::readFemParts(const std::string& fileName, RigFemPartCollectio
return true; return true;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RifOdbReader::close()
{
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

1
ApplicationCode/GeoMech/OdbReader/RifOdbReader.h
View File

@ -38,7 +38,6 @@ public:
virtual ~RifOdbReader(); virtual ~RifOdbReader();
virtual bool readFemParts(const std::string& fileName, RigFemPartCollection* femParts); virtual bool readFemParts(const std::string& fileName, RigFemPartCollection* femParts);
virtual void close();
virtual std::vector<double> timeSteps(); virtual std::vector<double> timeSteps();
virtual std::vector<std::string> scalarNodeResultNames() {return std::vector<std::string> ();}; virtual std::vector<std::string> scalarNodeResultNames() {return std::vector<std::string> ();};