Commit c00e1666 by Praetorius, Simon

### BaseProblems updated and some Warnings removed

parent 5857b717
 ... @@ -24,6 +24,7 @@ ... @@ -24,6 +24,7 @@ #include "boost/lexical_cast.hpp" #include "boost/lexical_cast.hpp" #include "boost/date_time/posix_time/posix_time.hpp" #include "boost/date_time/posix_time/posix_time.hpp" #include #include #include #include #include #include #include ... @@ -68,11 +69,16 @@ namespace Helpers { ... @@ -68,11 +69,16 @@ namespace Helpers { template template T atanh(T x) T atanh(T x) { { #ifndef _WIN32 T result; return atanh(x); try { #else result = boost::math::atanh(x); return 0.5*log((1.0+x)/(1.0-x)); } catch(...) { // domain_error, or overflow_error #endif if (x > 0.0) result = 10.0; else result = -10.0; } return result; } } // routines for conversion to string // routines for conversion to string ... ...
 ... @@ -188,13 +188,13 @@ namespace experimental { ... @@ -188,13 +188,13 @@ namespace experimental { { { if (kdtreeMap_Dof.find(feSpace) != kdtreeMap_Dof.end()) { if (kdtreeMap_Dof.find(feSpace) != kdtreeMap_Dof.end()) { if (kdtreeMap_Dof[feSpace].first != feSpace->getMesh()->getChangeIndex()) { if (kdtreeMap_Dof[feSpace].first != feSpace->getMesh()->getChangeIndex()) { feSpace->getMesh()->getDofIndexCoords(feSpace, kdtreeMap_Dof[feSpace].second->m_data); feSpace->getMesh()->getDofIndexCoords(kdtreeMap_Dof[feSpace].second->m_data); kdtreeMap_Dof[feSpace].second->reinit(); kdtreeMap_Dof[feSpace].second->reinit(); kdtreeMap_Dof[feSpace].first = feSpace->getMesh()->getChangeIndex(); kdtreeMap_Dof[feSpace].first = feSpace->getMesh()->getChangeIndex(); } } } else { } else { DOFVector >* coords = new DOFVector >(feSpace, "coords"); DOFVector >* coords = new DOFVector >(feSpace, "coords"); feSpace->getMesh()->getDofIndexCoords(feSpace, *coords); feSpace->getMesh()->getDofIndexCoords(*coords); KD_Tree_Dof* kdtree = new KD_Tree_Dof(Global::getGeo(WORLD), *coords); KD_Tree_Dof* kdtree = new KD_Tree_Dof(Global::getGeo(WORLD), *coords); kdtreeMap_Dof[feSpace] = std::make_pair(feSpace->getMesh()->getChangeIndex(), kdtree); kdtreeMap_Dof[feSpace] = std::make_pair(feSpace->getMesh()->getChangeIndex(), kdtree); ... ...
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!