From e8b4b88b67ddc95d8b4495448b39d74364be9ee1 Mon Sep 17 00:00:00 2001
From: Karsten Rink <karsten.rink@ufz.de>
Date: Thu, 26 Jun 2014 18:07:17 +0200
Subject: [PATCH] domain ICs are can be read from file
---
FileIO/XmlIO/Boost/BoostXmlCndInterface.cpp | 9 ++++++---
FileIO/XmlIO/Qt/XmlCndInterface.cpp | 3 ++-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/FileIO/XmlIO/Boost/BoostXmlCndInterface.cpp b/FileIO/XmlIO/Boost/BoostXmlCndInterface.cpp
index 82d906b3560..9c805ac6820 100644
--- a/FileIO/XmlIO/Boost/BoostXmlCndInterface.cpp
+++ b/FileIO/XmlIO/Boost/BoostXmlCndInterface.cpp
@@ -140,13 +140,16 @@ void BoostXmlCndInterface::readDistributionTag(boost::property_tree::ptree const
else if (dis_tag.first.compare("Value") == 0) {
FiniteElement::DistributionType const& dt(cond->getProcessDistributionType());
- if (dt == FiniteElement::CONSTANT || dt == FiniteElement::CONSTANT_NEUMANN) {
+ if (dt == FiniteElement::CONSTANT ||
+ dt == FiniteElement::CONSTANT_NEUMANN ||
+ dt == FiniteElement::NODESCONSTANT) {
cond->setConstantDisValue(BaseLib::str2number<double>(dis_tag.second.data()));
return;
}
- if (dt == FiniteElement::LINEAR || dt == FiniteElement::LINEAR_NEUMANN
- || dt == FiniteElement::DIRECT) {
+ if (dt == FiniteElement::LINEAR ||
+ dt == FiniteElement::LINEAR_NEUMANN ||
+ dt == FiniteElement::DIRECT) {
std::vector<std::size_t> dis_node_ids;
std::vector<double> dis_values;
diff --git a/FileIO/XmlIO/Qt/XmlCndInterface.cpp b/FileIO/XmlIO/Qt/XmlCndInterface.cpp
index 328400e6c5a..5d173d26ee6 100644
--- a/FileIO/XmlIO/Qt/XmlCndInterface.cpp
+++ b/FileIO/XmlIO/Qt/XmlCndInterface.cpp
@@ -126,7 +126,8 @@ void XmlCndInterface::readConditions(const QDomNode &listRoot,
std::vector<size_t> disNodes;
std::vector<double> disValues;
if (c->getProcessDistributionType()==FiniteElement::CONSTANT ||
- c->getProcessDistributionType()==FiniteElement::CONSTANT_NEUMANN)
+ c->getProcessDistributionType()==FiniteElement::CONSTANT_NEUMANN ||
+ c->getProcessDistributionType()==FiniteElement::NODESCONSTANT)
disValues.push_back( distProps.at(j).toElement().text().toDouble() );
else if (c->getProcessDistributionType()==FiniteElement::LINEAR ||
c->getProcessDistributionType()==FiniteElement::LINEAR_NEUMANN ||
--
GitLab