Liebe GitLab-Nutzerin, lieber GitLab-Nutzer,

am kommenden Sonnabend, den 24.08.2019, finden in der Zeit von 8:00 bis 17:00 Uhr Wartungsarbeiten am GitLab-Server statt. In diesem Zeitraum steht Ihnen der Gitlab-Dienst nicht zur Verfügung. Wir bitten Sie dafür um Verständnis.

Die Administratoren

Dear GitLab-User,

the GitLab server will be maintained next Saturday, 24.8.2019, from 8am to 5pm. The GitLab service will be not available in that time. We apologise for any inconvenience caused.

The administrators

Commit 9d352199 authored by Praetorius, Simon's avatar Praetorius, Simon

resolved some review comments on initefile and meshstructure

parent 5b211985
Pipeline #1657 passed with stages
in 43 minutes and 3 seconds
......@@ -37,7 +37,6 @@
#include <boost/lexical_cast.hpp>
#include <boost/numeric/conversion/cast.hpp>
#include <boost/thread/shared_mutex.hpp> // requires c++14
#include <boost/type_traits.hpp>
......@@ -423,8 +422,6 @@ namespace AMDiS {
template<typename T>
static void get(const std::string tag, T& value, int debugInfo = -1)
{
// boost::shared_lock<boost::shared_mutex> lock(singlett().mutex_);
if (debugInfo == -1)
debugInfo = singlett().getMsgInfo();
else {
......@@ -498,8 +495,6 @@ namespace AMDiS {
/// return InitEntry object for tag tag
static InitEntry get(const std::string tag)
{
// boost::shared_lock<boost::shared_mutex> lock(singlett().mutex_);
InitEntry result;
std::string valStr;
......@@ -527,8 +522,6 @@ else if(error_code == TAG_NOT_FOUND_BREAK)
template<typename T>
static void set(const std::string tag, T const& value, int debugInfo= -1)
{
// boost::unique_lock<boost::shared_mutex> lock(singlett().mutex_);
if (debugInfo == -1)
debugInfo = singlett().getMsgInfo();
......@@ -578,14 +571,14 @@ else if(error_code == TAG_NOT_FOUND_BREAK)
{
singlett().clear();
}
/// save singlett-data to file with filename fn
static void save(std::string fn)
{
singlett().write(fn);
}
// list of included filenames
static std::set< std::string >& getIncludeList()
......@@ -593,7 +586,7 @@ else if(error_code == TAG_NOT_FOUND_BREAK)
static std::set< std::string > include_list;
return include_list;
}
protected:
Initfile()
: msgInfo(0),
......@@ -656,8 +649,6 @@ protected:
void getInternalParameters();
int msgInfo, msgWait, paramInfo, breakOnMissingTag;
// mutable boost::shared_mutex mutex_;
};
typedef Initfile Parameters;
......
......@@ -280,25 +280,25 @@ namespace AMDiS {
bool cont = true;
while (cont) {
bool cont1;
// #ifndef NDEBUG
#ifndef NDEBUG
bool cont2;
// #endif
#endif
if (structure1->isLeafElement() == structure2->isLeafElement()) {
cont1 = structure1->nextElement(result);
// #ifndef NDEBUG
#ifndef NDEBUG
cont2 = structure2->nextElement();
// #endif
#endif
} else {
if (structure1->isLeafElement()) {
cont1 = structure1->nextElement();
// #ifndef NDEBUG
#ifndef NDEBUG
cont2 = structure2->skipBranch(result);
// #endif
#endif
} else {
cont1 = structure1->skipBranch(result);
// #ifndef NDEBUG
#ifndef NDEBUG
cont2 = structure2->nextElement();
// #endif
#endif
}
}
TEST_EXIT_DBG(cont1 == cont2)("Structures don't match!\n");
......@@ -504,7 +504,7 @@ namespace AMDiS {
elInfo = stack.traverseNext(elInfo);
}
}
void MeshStructure::setMeshStructureValues(int macroElIndex,
DOFVector<double>* vec,
......@@ -519,7 +519,7 @@ namespace AMDiS {
Mesh *mesh = feSpace->getMesh();
bool feSpaceHasNonVertexDofs = (feSpace->getBasisFcts()->getDegree() > 1);
int nVertexPreDofs = feSpace->getAdmin()->getNumberOfPreDofs(VERTEX);
std::size_t counter = 0;
if (withElIndex) {
TEST_EXIT(static_cast<int>(values[0]) == macroElIndex)
......
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