diff --git a/FemLib/BoundaryCondition.cpp b/FemLib/BoundaryCondition.cpp
index 8d0a8aa29e0d92d23bf13410c6efaf63f6191aa4..3d2ca77c49ea00c7c46a92f9844fb4c98df3d7b4 100644
--- a/FemLib/BoundaryCondition.cpp
+++ b/FemLib/BoundaryCondition.cpp
@@ -16,7 +16,7 @@
BoundaryCondition::BoundaryCondition(const CBoundaryCondition &bc, const std::string &geometry_name)
: FEMCondition(geometry_name, bc.getProcessType(), bc.getProcessPrimaryVariable(),
- bc.getGeoType(), bc.getGeoName(),
+ bc.getGeomType(), bc.getGeoName(),
bc.getProcessDistributionType(), FEMCondition::BOUNDARY_CONDITION)
{
if (this->getProcessDistributionType() == FiniteElement::CONSTANT ||
diff --git a/FemLib/FEMCondition.cpp b/FemLib/FEMCondition.cpp
index 0ed42c09b084d9837587bc705f1241c900993de7..c9964ddffe2c37ff31b466f4121489b194bed95f 100644
--- a/FemLib/FEMCondition.cpp
+++ b/FemLib/FEMCondition.cpp
@@ -35,7 +35,7 @@ FEMCondition::FEMCondition(const std::string &geometry_name, FiniteElement::Proc
FEMCondition::FEMCondition(const FEMCondition &cond, CondType t)
: ProcessInfo(cond.getProcessType(), cond.getProcessPrimaryVariable()/*, NULL*/),
- GeoInfo(cond.getGeoType(), cond.getGeoObj()),
+ GeoInfo(cond.getGeomType(), cond.getGeoObj()),
DistributionInfo(cond.getProcessDistributionType()),
_type(t),
_geoName(cond.getGeoName()),
diff --git a/FemLib/GeoInfo.cpp b/FemLib/GeoInfo.cpp
index 1c4bf455b4397058ab74669519f90ca553f989d6..6289c5058d97e237f248aeffd692710eeca0edef 100644
--- a/FemLib/GeoInfo.cpp
+++ b/FemLib/GeoInfo.cpp
@@ -27,12 +27,12 @@ GeoInfo::GeoInfo(GeoLib::GEOTYPE geo_type, const GeoLib::GeoObject* geo_obj) :
GeoInfo::~GeoInfo()
{}
-GeoLib::GEOTYPE GeoInfo::getGeoType () const
+GeoLib::GEOTYPE GeoInfo::getGeomType () const
{
return _geo_type;
}
-std::string GeoInfo::getGeoTypeAsString () const
+std::string GeoInfo::getGeomTypeAsString () const
{
switch (_geo_type)
{
diff --git a/FemLib/GeoInfo.h b/FemLib/GeoInfo.h
index 7be1ca707a6e901f97759e3b575c6e19b1453c1d..b98489b285426bb58377c594ba87edd34fcc115e 100644
--- a/FemLib/GeoInfo.h
+++ b/FemLib/GeoInfo.h
@@ -49,13 +49,13 @@ public:
* @sa enum GeoType
* @return the geo type
*/
- GeoLib::GEOTYPE getGeoType () const;
+ GeoLib::GEOTYPE getGeomType () const;
/**
* get the type as a string for log output
* @return
*/
- std::string getGeoTypeAsString () const;
+ std::string getGeomTypeAsString () const;
/**
* getter for the pointer to the object
diff --git a/FemLib/InitialCondition.cpp b/FemLib/InitialCondition.cpp
index 5625b53def5c8e8ccf22c4503d7defb78a513dd1..df5d4aad73cc07f771e9bdbb3ba3e80ee3afce60 100644
--- a/FemLib/InitialCondition.cpp
+++ b/FemLib/InitialCondition.cpp
@@ -15,8 +15,8 @@
InitialCondition::InitialCondition(const CInitialCondition &ic, const std::string &geometry_name)
: FEMCondition(geometry_name, ic.getProcessType(), ic.getProcessPrimaryVariable(),
- ic.getGeoType(),
- (ic.getGeoType() == GeoLib::GEODOMAIN) ? "Domain" : ic.getGeoName(),
+ ic.getGeomType(),
+ (ic.getGeomType() == GeoLib::GEODOMAIN) ? "Domain" : ic.getGeoName(),
ic.getProcessDistributionType(), FEMCondition::INITIAL_CONDITION)
{
if (this->getProcessDistributionType() == FiniteElement::CONSTANT)
diff --git a/FemLib/SourceTerm.cpp b/FemLib/SourceTerm.cpp
index 4e8592f3c24bf885f71cedaa500dea6659fa5491..29f85a78b175601b2e445d2c09c59511bb25e447 100644
--- a/FemLib/SourceTerm.cpp
+++ b/FemLib/SourceTerm.cpp
@@ -15,7 +15,7 @@
SourceTerm::SourceTerm(const CSourceTerm &st, const std::string &geometry_name)
: FEMCondition(geometry_name, st.getProcessType(), st.getProcessPrimaryVariable(),
- st.getGeoType(), st.getGeoName(),
+ st.getGeomType(), st.getGeoName(),
st.getProcessDistributionType(), FEMCondition::SOURCE_TERM)
{
if (this->getProcessDistributionType() == FiniteElement::CONSTANT ||
diff --git a/FileIO/Legacy/MeshIO.cpp b/FileIO/Legacy/MeshIO.cpp
index 164a01515a2bfdbe6377b3a33d297aaf4fe00716..2a1c6b420cd3e1e16313884b02de27b2ffa4bf33 100644
--- a/FileIO/Legacy/MeshIO.cpp
+++ b/FileIO/Legacy/MeshIO.cpp
@@ -251,7 +251,7 @@ void MeshIO::writeElementsExceptLines(std::vector<MeshLib::Element*> const& ele_
size_t n_elements(0);
for (size_t i(0); i < ele_vector_size; i++) {
- if ((ele_vec[i])->getGeoType() == MshElemType::EDGE) {
+ if ((ele_vec[i])->getGeomType() == MshElemType::EDGE) {
non_line_element[i] = false;
non_null_element[i] = false;
} else {
@@ -265,7 +265,7 @@ void MeshIO::writeElementsExceptLines(std::vector<MeshLib::Element*> const& ele_
out << n_elements << std::endl;
for (size_t i(0), k(0); i < ele_vector_size; i++) {
if (non_line_element[i] && non_null_element[i]) {
- out << k << " " << ele_vec[i]->getValue() << " " << MshElemType2String(ele_vec[i]->getGeoType()) << " ";
+ out << k << " " << ele_vec[i]->getValue() << " " << MshElemType2String(ele_vec[i]->getGeomType()) << " ";
for(size_t j = 0; j < ele_vec[i]->getNNodes()-1; j++)
out << ele_vec[i]->getNode(j)->getID() << " ";
out << ele_vec[i]->getNode(ele_vec[i]->getNNodes()-1)->getID() << std::endl;
diff --git a/FileIO/XmlIO/VTKInterface.cpp b/FileIO/XmlIO/VTKInterface.cpp
index 649343648c046a8ff5ad4c073ece0f9096554cb4..df5c7b631020b0e3198cce04de91b7cccfa1b724 100644
--- a/FileIO/XmlIO/VTKInterface.cpp
+++ b/FileIO/XmlIO/VTKInterface.cpp
@@ -408,7 +408,7 @@ int VTKInterface::write(std::ostream& stream)
oss << std::endl;
offset_count += nElemNodes;
offstream << offset_count << " ";
- typestream << this->getVTKElementID(element->getGeoType()) << " ";
+ typestream << this->getVTKElementID(element->getGeomType()) << " ";
}
oss << data_array_close;
offstream << std::endl << data_array_close;
diff --git a/FileIO/XmlIO/XmlCndInterface.cpp b/FileIO/XmlIO/XmlCndInterface.cpp
index 31c10c19dd78f05310a5c332e62cf411574c46df..19bbefa4b7f942305637192d3d3bfc45591a88e1 100644
--- a/FileIO/XmlIO/XmlCndInterface.cpp
+++ b/FileIO/XmlIO/XmlCndInterface.cpp
@@ -259,7 +259,7 @@ void XmlCndInterface::writeCondition( QDomDocument doc, QDomElement &listTag, co
QDomElement geoTypeTag ( doc.createElement("Type") );
geoTag.appendChild(geoTypeTag);
QDomText geoTypeText ( doc.createTextNode(
- QString::fromStdString(GeoLib::convertGeoTypeToString(cond->getGeoType()))) );
+ QString::fromStdString(GeoLib::convertGeoTypeToString(cond->getGeomType()))) );
geoTypeTag.appendChild(geoTypeText);
QDomElement geoNameTag ( doc.createElement("Name") );
geoTag.appendChild(geoNameTag);
diff --git a/Gui/DataView/ElementTreeModel.cpp b/Gui/DataView/ElementTreeModel.cpp
index 974f0a4aa8f8362c3696cc5c60ac287b3e538876..45dcc9bf9f83904363643e5621a9390ae410ad2b 100644
--- a/Gui/DataView/ElementTreeModel.cpp
+++ b/Gui/DataView/ElementTreeModel.cpp
@@ -43,7 +43,7 @@ void ElementTreeModel::setElement(const MeshLib::Mesh* grid, const size_t elem_i
_rootItem->appendChild(elemItem);
QList<QVariant> typeData;
- typeData << "Element Type: " << QString::fromStdString(MshElemType2String(elem->getGeoType()));
+ typeData << "Element Type: " << QString::fromStdString(MshElemType2String(elem->getGeomType()));
TreeItem* typeItem = new TreeItem(typeData, elemItem);
elemItem->appendChild(typeItem);
diff --git a/Gui/DataView/FEMConditionSetupDialog.cpp b/Gui/DataView/FEMConditionSetupDialog.cpp
index 352cda76b7b3f3b73c4ff6b2c7d2df7d53e8c9b0..9fe94ee023002c5b5d595e6de1e90716b8fc1a2c 100644
--- a/Gui/DataView/FEMConditionSetupDialog.cpp
+++ b/Gui/DataView/FEMConditionSetupDialog.cpp
@@ -69,10 +69,10 @@ FEMConditionSetupDialog::~FEMConditionSetupDialog()
void FEMConditionSetupDialog::setupDialog()
{
- if (_cond.getGeoType() != GeoLib::INVALID)
+ if (_cond.getGeomType() != GeoLib::INVALID)
{
this->disTypeBox->addItem("Constant (Dirichlet)");
- if (_cond.getGeoType() == GeoLib::POLYLINE)
+ if (_cond.getGeomType() == GeoLib::POLYLINE)
this->disTypeBox->addItem("Linear (Dirichlet)");
if (this->_set_on_points)
@@ -127,7 +127,7 @@ void FEMConditionSetupDialog::setValuesFromCond()
on_condTypeBox_currentIndexChanged(2);
}
- if (_cond.getGeoType() != GeoLib::INVALID)
+ if (_cond.getGeomType() != GeoLib::INVALID)
{
if (_cond.getProcessDistributionType() == FiniteElement::CONSTANT || _cond.getProcessDistributionType() == FiniteElement::CONSTANT_NEUMANN)
{
@@ -152,7 +152,7 @@ void FEMConditionSetupDialog::accept()
_cond.setProcessType(static_cast<FiniteElement::ProcessType>(this->processTypeBox->currentIndex() + 1));
_cond.setProcessPrimaryVariable(static_cast<FiniteElement::PrimaryVariable>(this->pvTypeBox->currentIndex() + 1));
- if (_cond.getGeoType() != GeoLib::INVALID)
+ if (_cond.getGeomType() != GeoLib::INVALID)
{
if (condTypeBox->currentIndex()>1)
{
@@ -206,14 +206,14 @@ void FEMConditionSetupDialog::on_condTypeBox_currentIndexChanged(int index)
//if (index==1)
// this->geoNameBox->addItem("Domain");
// remove "Domain" if IC is unselected
- if (_cond.getGeoType() != GeoLib::INVALID)
+ if (_cond.getGeomType() != GeoLib::INVALID)
{
if (index>1) // source terms selected
{
while (this->disTypeBox->count()>0)
this->disTypeBox->removeItem(0);
this->disTypeBox->addItem("Constant (Neumann)");
- if (_cond.getGeoType() == GeoLib::POLYLINE)
+ if (_cond.getGeomType() == GeoLib::POLYLINE)
this->disTypeBox->addItem("Linear (Neumann)");
}
else
@@ -221,7 +221,7 @@ void FEMConditionSetupDialog::on_condTypeBox_currentIndexChanged(int index)
while (this->disTypeBox->count()>0)
this->disTypeBox->removeItem(0);
this->disTypeBox->addItem("Constant (Dirichlet)");
- if (_cond.getGeoType() == GeoLib::POLYLINE)
+ if (_cond.getGeomType() == GeoLib::POLYLINE)
this->disTypeBox->addItem("Linear (Dirichlet)");
}
}
@@ -298,7 +298,7 @@ FEMCondition* FEMConditionSetupDialog::typeCast(const FEMCondition &cond)
void FEMConditionSetupDialog::copyCondOnPoints()
{
std::vector<FEMCondition*> conditions;
- if (_cond.getGeoType() == GeoLib::POLYLINE)
+ if (_cond.getGeomType() == GeoLib::POLYLINE)
{
const GeoLib::Polyline* ply = dynamic_cast<const GeoLib::Polyline*>(_cond.getGeoObj());
size_t nPoints = ply->getNumberOfPoints();
@@ -314,7 +314,7 @@ void FEMConditionSetupDialog::copyCondOnPoints()
}
emit createFEMCondition(conditions);
}
- else if (_cond.getGeoType() == GeoLib::SURFACE)
+ else if (_cond.getGeomType() == GeoLib::SURFACE)
{
const GeoLib::Surface* sfc = dynamic_cast<const GeoLib::Surface*>(_cond.getGeoObj());
size_t nTriangles = sfc->getNTriangles();
diff --git a/Gui/DataView/MshLayerMapper.cpp b/Gui/DataView/MshLayerMapper.cpp
index ceb29d8760689fcce64e4d6e42ddc27d89c629e9..a5367e9c5c8a346bb77a3ed735c81fd684f6bd1f 100644
--- a/Gui/DataView/MshLayerMapper.cpp
+++ b/Gui/DataView/MshLayerMapper.cpp
@@ -74,15 +74,15 @@ MeshLib::Mesh* MshLayerMapper::CreateLayers(const MeshLib::Mesh* mesh, unsigned
e_nodes[j] = new_nodes[node_id+nNodes];
e_nodes[j+nElemNodes] = new_nodes[node_id];
}
- if (sfc_elem->getGeoType() == MshElemType::TRIANGLE) // extrude triangles to prism
+ if (sfc_elem->getGeomType() == MshElemType::TRIANGLE) // extrude triangles to prism
new_elems[elem_offset+i] = new MeshLib::Prism(e_nodes, mat_id);
- else if (sfc_elem->getGeoType() == MshElemType::QUAD) // extrude quads to hexes
+ else if (sfc_elem->getGeomType() == MshElemType::QUAD) // extrude quads to hexes
new_elems[elem_offset+i] = new MeshLib::Hex(e_nodes, mat_id);
}
else
{
std::cout << "Warning in MshLayerMapper::CreateLayers() - Method can only handle 2D mesh elements ..." << std::endl;
- std::cout << "Skipping Element " << i << " of type \"" << MshElemType2String(sfc_elem->getGeoType()) << "\"." << std::endl;
+ std::cout << "Skipping Element " << i << " of type \"" << MshElemType2String(sfc_elem->getGeomType()) << "\"." << std::endl;
}
}
}
diff --git a/Gui/DataView/MshModel.cpp b/Gui/DataView/MshModel.cpp
index d215e1350a75843d15d2b2e89f38c30b6edcc7ea..618c90e44e10382abedd7a6cf467ee8044081db5 100644
--- a/Gui/DataView/MshModel.cpp
+++ b/Gui/DataView/MshModel.cpp
@@ -68,7 +68,7 @@ void MshModel::addMeshObject(const MeshLib::Mesh* mesh)
for (size_t i = 0; i < nElems; i++)
{
const MeshLib::Element* current_element (elems[i]);
- MshElemType::type t (current_element->getGeoType());
+ MshElemType::type t (current_element->getGeomType());
QList<QVariant> elemData;
if (t != elem_type)
{
diff --git a/Gui/DataView/ProcessModel.cpp b/Gui/DataView/ProcessModel.cpp
index 18296073a6d899bc4aa8d671246e1064f2381506..d47a58868bb28ba0be63a2f808775234a18331e4 100644
--- a/Gui/DataView/ProcessModel.cpp
+++ b/Gui/DataView/ProcessModel.cpp
@@ -60,7 +60,7 @@ void ProcessModel::addConditionItem(FEMCondition* c)
QList<QVariant> condData;
condData << QString::fromStdString(c->getGeoName())
- << QString::fromStdString(c->getGeoTypeAsString());
+ << QString::fromStdString(c->getGeomTypeAsString());
CondItem* condItem = new CondItem(condData, condParent, c);
condParent->appendChild(condItem);
// add information on primary variable
@@ -102,7 +102,7 @@ void ProcessModel::addConditionItem(FEMCondition* c)
void ProcessModel::addCondition(FEMCondition* condition)
{
- bool is_domain = (condition->getGeoType() == GeoLib::GEODOMAIN) ? true : false;
+ bool is_domain = (condition->getGeomType() == GeoLib::GEODOMAIN) ? true : false;
// HACK: direct source terms are not domain conditions but they also don't contain geo-object-names
if (condition->getProcessDistributionType() == FiniteElement::DIRECT) is_domain = true;
@@ -111,7 +111,7 @@ void ProcessModel::addCondition(FEMCondition* condition)
{
object = _project.getGEOObjects()->getGEOObject(
condition->getAssociatedGeometryName(),
- condition->getGeoType(),
+ condition->getGeomType(),
condition->getGeoName());
condition->setGeoObj(object);
}
diff --git a/Gui/VtkVis/VtkConditionSource.cpp b/Gui/VtkVis/VtkConditionSource.cpp
index 5407df1174d561e97019ec6facf8ff71aa4cac18..5d4b594fa798fd4bce8c5970a81e06ac8d831b43 100644
--- a/Gui/VtkVis/VtkConditionSource.cpp
+++ b/Gui/VtkVis/VtkConditionSource.cpp
@@ -127,7 +127,7 @@ int VtkConditionSource::RequestData( vtkInformation* request,
}
else dis_type_value = it->second;
- if ((*_cond_vec)[n]->getGeoType() == GeoLib::POINT)
+ if ((*_cond_vec)[n]->getGeomType() == GeoLib::POINT)
{
/*
size_t nPoints = _points->size();
@@ -158,7 +158,7 @@ int VtkConditionSource::RequestData( vtkInformation* request,
<< std::endl;
*/
}
- else if ((*_cond_vec)[n]->getGeoType() == GeoLib::POLYLINE)
+ else if ((*_cond_vec)[n]->getGeomType() == GeoLib::POLYLINE)
{
const GeoLib::Polyline* ply = static_cast<const GeoLib::Polyline*>((*_cond_vec)[n]->getGeoObj());
const int nPoints = ply->getNumberOfPoints();
@@ -188,7 +188,7 @@ int VtkConditionSource::RequestData( vtkInformation* request,
pnt_id++;
}
}
- else if ((*_cond_vec)[n]->getGeoType() == GeoLib::SURFACE)
+ else if ((*_cond_vec)[n]->getGeomType() == GeoLib::SURFACE)
{
std::vector<int> point_idx_map(_points->size(), -1);
@@ -237,7 +237,7 @@ int VtkConditionSource::RequestData( vtkInformation* request,
}
}
// HACK: this is currently used when applying DIRECT conditions
- else if ((*_cond_vec)[n]->getGeoType() == GeoLib::INVALID)
+ else if ((*_cond_vec)[n]->getGeomType() == GeoLib::INVALID)
{
size_t nValues = dis_values.size();
for (size_t i=0; i<nValues; i++)
@@ -251,7 +251,7 @@ int VtkConditionSource::RequestData( vtkInformation* request,
}
}
// draw a bounding box in case of of the conditions is "domain"
- else if ((*_cond_vec)[n]->getGeoType() == GeoLib::GEODOMAIN)
+ else if ((*_cond_vec)[n]->getGeomType() == GeoLib::GEODOMAIN)
{
GeoLib::AABB bounding_box (_points);
std::vector<GeoLib::Point> box;
diff --git a/Gui/VtkVis/VtkMeshSource.cpp b/Gui/VtkVis/VtkMeshSource.cpp
index 8114b6496a22ee0fc635c3dc8ed29d75f14bf725..6c8c023fc31bcd7fc544c24d0a8cb4f521a2f6fe 100644
--- a/Gui/VtkVis/VtkMeshSource.cpp
+++ b/Gui/VtkVis/VtkMeshSource.cpp
@@ -129,7 +129,7 @@ int VtkMeshSource::RequestData( vtkInformation* request,
int type(0);
const MeshLib::Element* elem (elems[i]);
- switch (elem->getGeoType())
+ switch (elem->getGeomType())
{
case MshElemType::EDGE:
type = 3;
@@ -153,7 +153,7 @@ int VtkMeshSource::RequestData( vtkInformation* request,
type = 14;
break;
default: // if none of the above can be applied
- std::cout << "Error in VtkMeshSource::RequestData() - Unknown element type " << MshElemType2String(elem->getGeoType()) << "." << std::endl;
+ std::cout << "Error in VtkMeshSource::RequestData() - Unknown element type " << MshElemType2String(elem->getGeomType()) << "." << std::endl;
return 0;
}
diff --git a/MeshLib/Elements/Element.cpp b/MeshLib/Elements/Element.cpp
index 87679ffe4bb264e173f1757fa11755faeba3e156..7e24dbdabc3edc9cced003906b80a1bba6f6e203 100644
--- a/MeshLib/Elements/Element.cpp
+++ b/MeshLib/Elements/Element.cpp
@@ -112,7 +112,7 @@ const Node* Element::getNode(unsigned i) const
{
if (i < getNNodes())
return _nodes[i];
- std::cerr << "Error in MeshLib::Element::getNode() - Index " << i << " in " << MshElemType2String(getGeoType()) << " does not exist." << std::endl;
+ std::cerr << "Error in MeshLib::Element::getNode() - Index " << i << " in " << MshElemType2String(getGeomType()) << " does not exist." << std::endl;
return NULL;
}
diff --git a/MeshLib/Elements/Element.h b/MeshLib/Elements/Element.h
index 63933f3a971456ce2edc21399ce91e31c0fd68d6..3568745ca91f1d3e71b852dc3d5472faba647abd 100644
--- a/MeshLib/Elements/Element.h
+++ b/MeshLib/Elements/Element.h
@@ -116,7 +116,7 @@ public:
/**
* Get the type of the mesh element in geometric context (as a MshElemType-enum).
*/
- virtual MshElemType::type getGeoType() const = 0;
+ virtual MshElemType::type getGeomType() const = 0;
/**
* Get the type of the element in context of the finite element method.
diff --git a/MeshLib/Elements/TemplateEdge.h b/MeshLib/Elements/TemplateEdge.h
index 057f239035c61e15b27b4bf80f460ea890da52cc..1d15d036c39b5766a7f5e59668f5580da242f2ba 100644
--- a/MeshLib/Elements/TemplateEdge.h
+++ b/MeshLib/Elements/TemplateEdge.h
@@ -83,7 +83,7 @@ public:
* Method returns the type of the element. In this case EDGE will be returned.
* @return MshElemType::EDGE
*/
- virtual MshElemType::type getGeoType() const { return MshElemType::EDGE; }
+ virtual MshElemType::type getGeomType() const { return MshElemType::EDGE; }
/**
* Get the type of the element in context of the finite element method.
diff --git a/MeshLib/Elements/TemplateHex.h b/MeshLib/Elements/TemplateHex.h
index 3e56c269d13319b0e5dc416aaa29d3d71ed003e2..b5f8d873cb6a96b0b01d74e4086960149385cab5 100644
--- a/MeshLib/Elements/TemplateHex.h
+++ b/MeshLib/Elements/TemplateHex.h
@@ -81,7 +81,7 @@ public:
* Method returns the type of the element. In this case HEXAHEDRON will be returned.
* @return MshElemType::HEXAHEDRON
*/
- virtual MshElemType::type getGeoType() const { return MshElemType::HEXAHEDRON; }
+ virtual MshElemType::type getGeomType() const { return MshElemType::HEXAHEDRON; }
/**
* Method returns the FEM type of the element.
diff --git a/MeshLib/Elements/TemplatePrism.h b/MeshLib/Elements/TemplatePrism.h
index 38e068dfda6569f3c131bf85d461626f5b307940..63791e5a54487a69223feeb0bcdfa349957c5fb1 100644
--- a/MeshLib/Elements/TemplatePrism.h
+++ b/MeshLib/Elements/TemplatePrism.h
@@ -79,7 +79,7 @@ public:
* Method returns the type of the element. In this case PRISM will be returned.
* @return MshElemType::PRISM
*/
- virtual MshElemType::type getGeoType() const { return MshElemType::PRISM; }
+ virtual MshElemType::type getGeomType() const { return MshElemType::PRISM; }
/**
* Get the type of the element in context of the finite element method.
diff --git a/MeshLib/Elements/TemplatePyramid.h b/MeshLib/Elements/TemplatePyramid.h
index 540bf373ed75af8e776996bb82c74d7291a8c5f5..5abf8628cacbbd2a6f2355c894e481c78f21591f 100644
--- a/MeshLib/Elements/TemplatePyramid.h
+++ b/MeshLib/Elements/TemplatePyramid.h
@@ -77,7 +77,7 @@ public:
* Method returns the type of the element. In this case PYRAMID will be returned.
* @return MshElemType::PYRAMID
*/
- virtual MshElemType::type getGeoType() const { return MshElemType::PYRAMID; }
+ virtual MshElemType::type getGeomType() const { return MshElemType::PYRAMID; }
/**
* Get the type of the element in context of the finite element method.
diff --git a/MeshLib/Elements/TemplateQuad.h b/MeshLib/Elements/TemplateQuad.h
index 1212a581711829b915b6a5d3798cb54280098463..3be5c7619fccb64e5478f411d0e786458dbb26b0 100644
--- a/MeshLib/Elements/TemplateQuad.h
+++ b/MeshLib/Elements/TemplateQuad.h
@@ -62,7 +62,7 @@ public:
* Method returns the type of the element. In this case QUAD will be returned.
* @return MshElemType::QUAD
*/
- virtual MshElemType::type getGeoType() const { return MshElemType::QUAD; }
+ virtual MshElemType::type getGeomType() const { return MshElemType::QUAD; }
/**
* Get the type of the element in context of the finite element method.
diff --git a/MeshLib/Elements/TemplateTet.h b/MeshLib/Elements/TemplateTet.h
index 713730ee3e2164bbbd5913883987e60a389b1805..a34982a993afee40879a5b5834f4e0205bcfab7c 100644
--- a/MeshLib/Elements/TemplateTet.h
+++ b/MeshLib/Elements/TemplateTet.h
@@ -76,7 +76,7 @@ public:
* Method returns the type of the element. In this case TETRAHEDRON will be returned.
* @return MshElemType::TETRAHEDRON
*/
- virtual MshElemType::type getGeoType() const { return MshElemType::TETRAHEDRON; }
+ virtual MshElemType::type getGeomType() const { return MshElemType::TETRAHEDRON; }
/**
* Get the type of the element in context of the finite element method.
diff --git a/MeshLib/Elements/TemplateTri.h b/MeshLib/Elements/TemplateTri.h
index fc7c2daae7999793cb07a9174df7b01b6853cd61..fcd6fbd0c502dd5631e3c92c4735e1c2a9172403 100644
--- a/MeshLib/Elements/TemplateTri.h
+++ b/MeshLib/Elements/TemplateTri.h
@@ -69,7 +69,7 @@ public:
* Method returns the type of the element. In this case TRIANGLE will be returned.
* @return MshElemType::TRIANGLE
*/
- virtual MshElemType::type getGeoType() const { return MshElemType::TRIANGLE; }
+ virtual MshElemType::type getGeomType() const { return MshElemType::TRIANGLE; }
/**
* Get the type of the element in context of the finite element method.
diff --git a/MeshLib/Mesh.cpp b/MeshLib/Mesh.cpp
index 8e168fac8fc7c64629d5c906e5fd9eec3321d1cc..e3c279dc65f226d4156fb689b35dec2f8c71ca7c 100644
--- a/MeshLib/Mesh.cpp
+++ b/MeshLib/Mesh.cpp
@@ -170,7 +170,7 @@ void Mesh::setElementsConnectedToElements()
// create vector with all elements connected to current element (includes lots of doubles!)
std::vector<Element*> neighbors;
Element *const element (_elements[m]);
- if (element->getGeoType() != MshElemType::EDGE)
+ if (element->getGeomType() != MshElemType::EDGE)
{
const size_t nNodes (element->getNNodes());
for (unsigned n(0); n<nNodes; ++n)
@@ -183,7 +183,7 @@ void Mesh::setElementsConnectedToElements()
for (unsigned i(0); i<nNeighbors; ++i)
{
- if (element->addNeighbor(neighbors[i]) && neighbors[i]->getGeoType() != MshElemType::EDGE)
+ if (element->addNeighbor(neighbors[i]) && neighbors[i]->getGeomType() != MshElemType::EDGE)
{
neighbors[i]->addNeighbor(element);
}
diff --git a/MeshLib/MeshQuality/MeshQualityChecker.cpp b/MeshLib/MeshQuality/MeshQualityChecker.cpp
index 72a51a9265852f6378b32927f83fbde2bbdaa4ab..2c6c88694da1626234876121db81c43a11d1a261 100644
--- a/MeshLib/MeshQuality/MeshQualityChecker.cpp
+++ b/MeshLib/MeshQuality/MeshQualityChecker.cpp
@@ -37,7 +37,7 @@ BASELIB::Histogram<double> MeshQualityChecker::getHistogram (size_t nclasses) co
void MeshQualityChecker::errorMsg (const Element* elem, size_t idx) const
{
ERR ("Error in MeshQualityChecker::check() - Calculated value of element is below double precision minimum.");
- ERR ("Points of %s-Element %d: ", MshElemType2String(elem->getGeoType()).c_str(), idx);
+ ERR ("Points of %s-Element %d: ", MshElemType2String(elem->getGeomType()).c_str(), idx);
for (size_t i(0); i < elem->getNNodes(); i++)
{
const double* coords = elem->getNode(i)->getCoords();
diff --git a/MeshLib/MeshQuality/MeshQualityEquiAngleSkew.cpp b/MeshLib/MeshQuality/MeshQualityEquiAngleSkew.cpp
index e8507a16b9a3bf4879cc29656965d03475f0a2b6..d2263022b261cbe569a85d927a6d752e1e3de3d9 100644
--- a/MeshLib/MeshQuality/MeshQualityEquiAngleSkew.cpp
+++ b/MeshLib/MeshQuality/MeshQualityEquiAngleSkew.cpp
@@ -42,7 +42,7 @@ void MeshQualityEquiAngleSkew::check ()
for (size_t k(0); k < nElements; k++)
{
const Element* elem (elements[k]);
- switch (elem->getGeoType())
+ switch (elem->getGeomType())
{
case MshElemType::EDGE:
_mesh_quality_measure[k] = -1.0;
diff --git a/MeshLib/MeshQuality/MeshQualityShortestLongestRatio.cpp b/MeshLib/MeshQuality/MeshQualityShortestLongestRatio.cpp
index 17cf68347b55d9453db7d1e1d992a914066ef7d8..75bf76c123a9d0bc43a7d47383dd7016aa2797bc 100644
--- a/MeshLib/MeshQuality/MeshQualityShortestLongestRatio.cpp
+++ b/MeshLib/MeshQuality/MeshQualityShortestLongestRatio.cpp
@@ -29,7 +29,7 @@ void MeshQualityShortestLongestRatio::check()
for (size_t k(0); k < nElements; k++)
{
const Element* elem (elements[k]);
- switch (elem->getGeoType())
+ switch (elem->getGeomType())
{
case MshElemType::EDGE:
_mesh_quality_measure[k] = 1.0;
@@ -62,7 +62,7 @@ void MeshQualityShortestLongestRatio::check()
}
default:
ERR ("MeshQualityShortestLongestRatio::check () check for element type %s not implemented.",
- MshElemType2String(elem->getGeoType()).c_str());
+ MshElemType2String(elem->getGeomType()).c_str());
}
}
}
diff --git a/MeshLib/MeshQuality/MeshQualityVolume.cpp b/MeshLib/MeshQuality/MeshQualityVolume.cpp
index 961c1c9660e47e1a803f8ce426d825341f07e9b0..4f16e76c9f071e24c4638c70ce5faac8a3954051 100644
--- a/MeshLib/MeshQuality/MeshQualityVolume.cpp
+++ b/MeshLib/MeshQuality/MeshQualityVolume.cpp
@@ -32,7 +32,7 @@ void MeshQualityVolume::check()
for (size_t k(0); k < nElements; k++)
{
const Element* elem (elements[k]);
- MshElemType::type elem_type (elem->getGeoType());
+ MshElemType::type elem_type (elem->getGeomType());
if (elem_type == MshElemType::EDGE
|| elem_type == MshElemType::TRIANGLE
|| elem_type == MshElemType::QUAD)
diff --git a/MeshLib/MshEditor.cpp b/MeshLib/MshEditor.cpp
index 0759971cd250444bd952fcb01e367f19b269ef71..6cb86af7ebfcba3c3f45db230b494242e4464871 100644
--- a/MeshLib/MshEditor.cpp
+++ b/MeshLib/MshEditor.cpp
@@ -44,7 +44,7 @@ void MshEditor::getSurfaceAreaForNodes(const MeshLib::Mesh* mesh, std::vector<do
for (size_t i=0; i<nConnElems; ++i)
{
const MeshLib::Element* elem (conn_elems[i]);
- const unsigned nElemParts = (elem->getGeoType() == MshElemType::TRIANGLE) ? 3 : 4;
+ const unsigned nElemParts = (elem->getGeomType() == MshElemType::TRIANGLE) ? 3 : 4;
const double area = conn_elems[i]->getContent() / nElemParts;
node_area += area;
total_area += area;
@@ -134,7 +134,7 @@ MeshLib::Mesh* MshEditor::getMeshSurface(const MeshLib::Mesh &mesh, const double
for (unsigned i=0; i<nNewElements; ++i)
{
MeshLib::Element* elem (sfc_elements[i]);
- if (elem->getGeoType() == MshElemType::TRIANGLE) {
+ if (elem->getGeomType() == MshElemType::TRIANGLE) {
MeshLib::Node** tri_nodes = new MeshLib::Node*[3];
for (unsigned k(0); k<3; k++)
tri_nodes[k] = sfc_nodes[node_id_map[elem->getNode(k)->getID()]];
@@ -198,7 +198,7 @@ void MshEditor::get2DSurfaceElements(const std::vector<MeshLib::Element*> &all_e
continue;
}
- if (face->getGeoType() == MshElemType::TRIANGLE)
+ if (face->getGeomType() == MshElemType::TRIANGLE)
sfc_elements.push_back(new MeshLib::Tri(*static_cast<const MeshLib::Tri*>(face)));
else
sfc_elements.push_back(new MeshLib::Quad(*static_cast<const MeshLib::Quad*>(face)));
diff --git a/OGS/ProjectData.cpp b/OGS/ProjectData.cpp
index 00f485d6e67c881b7b0b979b28bef5c22e08875c..318f207f1a64761ed7c44265c4e9379080920f09 100644
--- a/OGS/ProjectData.cpp
+++ b/OGS/ProjectData.cpp
@@ -122,7 +122,7 @@ const FEMCondition* ProjectData::getCondition(const std::string &geo_name,
for (std::vector<FEMCondition*>::const_iterator it = _cond_vec.begin(); it != _cond_vec.end(); ++it)
if ((*it)->getAssociatedGeometryName().compare(geo_name) == 0)
if ( ((*it)->getGeoName().compare(cond_name) == 0) &&
- ((*it)->getGeoType() == type) )
+ ((*it)->getGeomType() == type) )
return *it;
std::cout << "Error in ProjectData::getCondition() - No condition found with name \"" <<
@@ -183,7 +183,7 @@ bool ProjectData::removeCondition(const std::string &geo_name,
{
if ((*it)->getAssociatedGeometryName().compare(geo_name) == 0)
if ( ((*it)->getGeoName().compare(cond_name) == 0) &&
- ((*it)->getGeoType() == type) )
+ ((*it)->getGeomType() == type) )
{
delete *it;
_cond_vec.erase(it);