Commit 6ff6a318 authored by Sebastian Eibl's avatar Sebastian Eibl
Browse files

msvc fixes

parent 1ecdbf09
......@@ -50,12 +50,11 @@
#include <iostream>
namespace walberla {
namespace mesa_pd {
using namespace walberla::mesa_pd;
class ParticleAccessorWithShape : public data::ParticleAccessor
{
public:
class ParticleAccessorWithShape : public data::ParticleAccessor
{
public:
ParticleAccessorWithShape(std::shared_ptr<data::ParticleStorage>& ps, std::shared_ptr<data::ShapeStorage>& ss)
: ParticleAccessor(ps)
, ss_(ss)
......@@ -68,13 +67,13 @@ using namespace walberla::mesa_pd;
const Mat3& getInvInertia(const size_t p_idx) const {return ss_->shapes[ps_->getShapeIDRef(p_idx)]->getInvInertiaBF();}
data::BaseShape* getShape(const size_t p_idx) const {return ss_->shapes[ps_->getShapeIDRef(p_idx)].get();}
private:
private:
std::shared_ptr<data::ShapeStorage> ss_;
};
};
template<typename PStorage, typename CStorage, typename PAccessor, typename CAccessor>
class TestHCSITSKernel {
public:
template<typename PStorage, typename CStorage, typename PAccessor, typename CAccessor>
class TestHCSITSKernel {
public:
TestHCSITSKernel(PStorage &ps_, CStorage &cs_, PAccessor &pa_, CAccessor &ca_) : ps(ps_), cs(cs_), pa(pa_), ca(ca_),
erp(real_t(1.0)), model(kernel::HCSITSRelaxationStep::RelaxationModel::InelasticFrictionlessContact), contactThreshold(0), globalAcc(0) {}
......@@ -122,18 +121,18 @@ using namespace walberla::mesa_pd;
ps.forEachParticle(false, kernel::SelectAll(), pa, integration, pa, dt);
}
private:
private:
PStorage &ps;
CStorage &cs;
PAccessor &pa;
CAccessor &ca;
public:
public:
real_t erp;
kernel::HCSITSRelaxationStep::RelaxationModel model;
real_t contactThreshold;
Vec3 globalAcc;
};
};
void normalReactionTest(kernel::HCSITSRelaxationStep::RelaxationModel model)
......@@ -477,9 +476,10 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
} //namespace mesa_pd
} //namespace walberla
int main( int argc, char ** argv )
{
return walberla::main(argc, argv);
return walberla::mesa_pd::main(argc, argv);
}
......@@ -28,8 +28,7 @@
#include <iostream>
namespace walberla {
using namespace walberla::mesa_pd;
namespace mesa_pd {
int main( int argc, char ** argv )
{
......@@ -71,9 +70,10 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
} //namespace mesa_pd
} //namespace walberla
int main( int argc, char ** argv )
{
return walberla::main(argc, argv);
return walberla::mesa_pd::main(argc, argv);
}
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