Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pybind11/fixiling windows link problems #1830

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions applications/DEM_application/DEM_application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
#include "custom_constitutive/DEM_KDEM_Rankine_CL.h"
#include "custom_constitutive/DEM_ExponentialHC_CL.h"
#include "custom_constitutive/DEM_D_Hertz_viscous_Coulomb_Nestle_CL.h"
#include "custom_constitutive/DEM_compound_constitutive_law.h"

#include "custom_strategies/schemes/dem_integration_scheme.h"
#include "custom_strategies/schemes/forward_euler_scheme.h"
Expand Down Expand Up @@ -416,6 +417,12 @@ KratosDEMApplication::KratosDEMApplication() : KratosApplication("DEMApplication
mSingleSphereCluster3D(0, Element::GeometryType::Pointer(new Sphere3D1<Node<3> >(Element::GeometryType::PointsArrayType(1)))),
mMapCon3D3N(0, Element::GeometryType::Pointer(new Triangle3D3<Node<3> >(Element::GeometryType::PointsArrayType(3)))) {}

// Explicit instantiation of composed constituive laws
template class DEM_compound_constitutive_law<DEM_D_Hertz_viscous_Coulomb, DEM_D_JKR_Cohesive_Law>;
template class DEM_compound_constitutive_law<DEM_D_Hertz_viscous_Coulomb, DEM_D_DMT_Cohesive_Law>;
template class DEM_compound_constitutive_law<DEM_D_Linear_viscous_Coulomb, DEM_D_JKR_Cohesive_Law>;
template class DEM_compound_constitutive_law<DEM_D_Linear_viscous_Coulomb, DEM_D_DMT_Cohesive_Law>;

void KratosDEMApplication::Register() {
// Calling base class register to register Kratos components

Expand Down
2 changes: 1 addition & 1 deletion applications/DEM_application/DEM_application.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
namespace Kratos
{

class KratosDEMApplication : public KratosApplication
class KRATOS_API(DEM_APPLICATION) KratosDEMApplication : public KratosApplication
{
public:
///@name Type Definitions
Expand Down
480 changes: 240 additions & 240 deletions applications/DEM_application/DEM_application_variables.h

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace Kratos {

class DEM_D_DMT_Cohesive_Law : public DEMDiscontinuumConstitutiveLaw {
class KRATOS_API(DEM_APPLICATION) DEM_D_DMT_Cohesive_Law : public DEMDiscontinuumConstitutiveLaw {

public:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace Kratos {

class SphericParticle;

class DEM_D_Hertz_confined : public DEM_D_Hertz_viscous_Coulomb {
class KRATOS_API(DEM_APPLICATION) DEM_D_Hertz_confined : public DEM_D_Hertz_viscous_Coulomb {

public:
KRATOS_CLASS_POINTER_DEFINITION(DEM_D_Hertz_confined);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace Kratos {

class SphericParticle;

class DEM_D_Hertz_dependent_friction : public DEMDiscontinuumConstitutiveLaw {
class KRATOS_API(DEM_APPLICATION) DEM_D_Hertz_dependent_friction : public DEMDiscontinuumConstitutiveLaw {

public:
using DEMDiscontinuumConstitutiveLaw::CalculateNormalForce;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace Kratos {

class SphericParticle;

class DEM_D_Hertz_viscous_Coulomb2D : public DEM_D_Hertz_viscous_Coulomb {
class KRATOS_API(DEM_APPLICATION) DEM_D_Hertz_viscous_Coulomb2D : public DEM_D_Hertz_viscous_Coulomb {
public:

KRATOS_CLASS_POINTER_DEFINITION(DEM_D_Hertz_viscous_Coulomb2D);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace Kratos {

class SphericParticle;

class DEM_D_Hertz_viscous_Coulomb : public DEMDiscontinuumConstitutiveLaw {
class KRATOS_API(DEM_APPLICATION) DEM_D_Hertz_viscous_Coulomb : public DEMDiscontinuumConstitutiveLaw {

public:
using DEMDiscontinuumConstitutiveLaw::CalculateNormalForce;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Kratos {

class SphericParticle;

class DEM_D_Hertz_viscous_Coulomb_Nestle : public DEM_D_Hertz_viscous_Coulomb {
class KRATOS_API(DEM_APPLICATION) DEM_D_Hertz_viscous_Coulomb_Nestle : public DEM_D_Hertz_viscous_Coulomb {

public:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace Kratos {

class DEM_D_JKR_Cohesive_Law : public DEMDiscontinuumConstitutiveLaw {
class KRATOS_API(DEM_APPLICATION) DEM_D_JKR_Cohesive_Law : public DEMDiscontinuumConstitutiveLaw {

public:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace Kratos {

class SphericParticle;

class DEM_D_Linear_confined : public DEM_D_Linear_viscous_Coulomb {
class KRATOS_API(DEM_APPLICATION) DEM_D_Linear_confined : public DEM_D_Linear_viscous_Coulomb {

public:
KRATOS_CLASS_POINTER_DEFINITION(DEM_D_Linear_confined);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace Kratos {

class DEM_D_Linear_viscous_Coulomb2D : public DEM_D_Linear_viscous_Coulomb {
class KRATOS_API(DEM_APPLICATION) DEM_D_Linear_viscous_Coulomb2D : public DEM_D_Linear_viscous_Coulomb {
public:

KRATOS_CLASS_POINTER_DEFINITION(DEM_D_Linear_viscous_Coulomb2D);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace Kratos {

class SphericParticle;

class DEM_D_Linear_viscous_Coulomb : public DEMDiscontinuumConstitutiveLaw {
class KRATOS_API(DEM_APPLICATION) DEM_D_Linear_viscous_Coulomb : public DEMDiscontinuumConstitutiveLaw {

public:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace Kratos {

class DEM_Dempack2D : public DEM_Dempack {
class KRATOS_API(DEM_APPLICATION) DEM_Dempack2D : public DEM_Dempack {
public:

KRATOS_CLASS_POINTER_DEFINITION(DEM_Dempack2D);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace Kratos {

class DEM_Dempack2D_dev : public DEM_Dempack_dev {
class KRATOS_API(DEM_APPLICATION) DEM_Dempack2D_dev : public DEM_Dempack_dev {
public:

KRATOS_CLASS_POINTER_DEFINITION(DEM_Dempack2D_dev);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

namespace Kratos {

class DEM_Dempack : public DEMContinuumConstitutiveLaw {
class KRATOS_API(DEM_APPLICATION) DEM_Dempack : public DEMContinuumConstitutiveLaw {
public:

KRATOS_CLASS_POINTER_DEFINITION(DEM_Dempack);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace Kratos {

class DEM_Dempack_dev : public DEM_Dempack {
class KRATOS_API(DEM_APPLICATION) DEM_Dempack_dev : public DEM_Dempack {
public:

KRATOS_CLASS_POINTER_DEFINITION(DEM_Dempack_dev);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace Kratos {

class DEM_Dempack_torque : public DEM_Dempack {
class KRATOS_API(DEM_APPLICATION) DEM_Dempack_torque : public DEM_Dempack {
public:

KRATOS_CLASS_POINTER_DEFINITION(DEM_Dempack_torque);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace Kratos {

class DEM_ExponentialHC : public DEMContinuumConstitutiveLaw {
class KRATOS_API(DEM_APPLICATION) DEM_ExponentialHC : public DEMContinuumConstitutiveLaw {
public:

KRATOS_CLASS_POINTER_DEFINITION(DEM_ExponentialHC);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace Kratos {

class DEM_KDEM : public DEMContinuumConstitutiveLaw {
class KRATOS_API(DEM_APPLICATION) DEM_KDEM : public DEMContinuumConstitutiveLaw {
public:

KRATOS_CLASS_POINTER_DEFINITION(DEM_KDEM);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace Kratos {

class DEM_KDEM_Mohr_Coulomb : public DEM_KDEM_Rankine {
class KRATOS_API(DEM_APPLICATION) DEM_KDEM_Mohr_Coulomb : public DEM_KDEM_Rankine {
public:

KRATOS_CLASS_POINTER_DEFINITION(DEM_KDEM_Mohr_Coulomb);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace Kratos {

class DEM_KDEM_Rankine : public DEM_KDEM {
class KRATOS_API(DEM_APPLICATION) DEM_KDEM_Rankine : public DEM_KDEM {
public:

KRATOS_CLASS_POINTER_DEFINITION(DEM_KDEM_Rankine);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace Kratos {

class DEM_KDEMFabric : public DEM_KDEM {
class KRATOS_API(DEM_APPLICATION) DEM_KDEMFabric : public DEM_KDEM {

public:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace Kratos {

template <class MainCL, class CohesionCL>

class DEM_compound_constitutive_law : public MainCL {
class KRATOS_API(DEM_APPLICATION) DEM_compound_constitutive_law : public MainCL {

public:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace Kratos {
class Properties; //forward declaration
class SphericContinuumParticle; // forward declaration of spheric cont particle

class /*__declspec( dllexport )*/ DEMContinuumConstitutiveLaw : public Flags {
class KRATOS_API(DEM_APPLICATION) DEMContinuumConstitutiveLaw : public Flags {

public:

Expand Down Expand Up @@ -202,7 +202,7 @@ namespace Kratos {
};

//This definition is done here to avoid recursive inclusion of header files
KRATOS_DEFINE_VARIABLE(DEMContinuumConstitutiveLaw::Pointer, DEM_CONTINUUM_CONSTITUTIVE_LAW_POINTER)
KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, DEMContinuumConstitutiveLaw::Pointer, DEM_CONTINUUM_CONSTITUTIVE_LAW_POINTER)

} /* namespace Kratos.*/
#endif /* DEM_CONSTITUTIVE_LAW_H_INCLUDED defined */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ namespace Kratos {
};

//This definition is done here to avoid recursive inclusion of header files
KRATOS_DEFINE_VARIABLE(DEMDiscontinuumConstitutiveLaw::Pointer, DEM_DISCONTINUUM_CONSTITUTIVE_LAW_POINTER)
KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, DEMDiscontinuumConstitutiveLaw::Pointer, DEM_DISCONTINUUM_CONSTITUTIVE_LAW_POINTER)

} /* namespace Kratos.*/
#endif /* DEM_CONSTITUTIVE_LAW_H_INCLUDED defined */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace Kratos {

class DEM_sintering_continuum : public DEM_KDEM {
class KRATOS_API(DEM_APPLICATION) DEM_sintering_continuum : public DEM_KDEM {
public:

KRATOS_CLASS_POINTER_DEFINITION(DEM_sintering_continuum);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace Kratos {

class DEM_D_Linear_Custom_Constants : public DEM_D_Linear_viscous_Coulomb {
class KRATOS_API(DEM_APPLICATION) DEM_D_Linear_Custom_Constants : public DEM_D_Linear_viscous_Coulomb {

public:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Kratos {

class DEM_KDEM2D : public DEM_KDEM {
class KRATOS_API(DEM_APPLICATION) DEM_KDEM2D : public DEM_KDEM {

public:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Kratos {

class DEM_KDEMFabric2D : public DEM_KDEM2D {
class KRATOS_API(DEM_APPLICATION) DEM_KDEMFabric2D : public DEM_KDEM2D {

public:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

namespace Kratos {

class ForwardEulerScheme : public DEMIntegrationScheme {
class KRATOS_API(DEM_APPLICATION) ForwardEulerScheme : public DEMIntegrationScheme {
public:

typedef ModelPart::NodesContainerType NodesArrayType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

namespace Kratos {

class QuaternionIntegrationScheme : public DEMIntegrationScheme {
class KRATOS_API(DEM_APPLICATION) QuaternionIntegrationScheme : public DEMIntegrationScheme {
public:

typedef ModelPart::NodesContainerType NodesArrayType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

namespace Kratos {

class RungeKuttaScheme : public DEMIntegrationScheme {
class KRATOS_API(DEM_APPLICATION) RungeKuttaScheme : public DEMIntegrationScheme {
public:

typedef ModelPart::NodesContainerType NodesArrayType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

namespace Kratos {

class TaylorScheme : public DEMIntegrationScheme {
class KRATOS_API(DEM_APPLICATION) TaylorScheme : public DEMIntegrationScheme {
public:

typedef ModelPart::NodesContainerType NodesArrayType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

namespace Kratos {

class VelocityVerletScheme : public DEMIntegrationScheme {
class KRATOS_API(DEM_APPLICATION) VelocityVerletScheme : public DEMIntegrationScheme {
public:

typedef ModelPart::NodesContainerType NodesArrayType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

namespace Kratos {

class ContinuumExplicitSolverStrategy : public ExplicitSolverStrategy {
class KRATOS_API(DEM_APPLICATION) ContinuumExplicitSolverStrategy : public ExplicitSolverStrategy {
public:

typedef ExplicitSolverStrategy BaseType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

namespace Kratos
{
class AnalyticFaceWatcher {
class KRATOS_API(DEM_APPLICATION) AnalyticFaceWatcher {

public:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

namespace Kratos
{
class AnalyticModelPartFiller
class KRATOS_API(DEM_APPLICATION) AnalyticModelPartFiller
{

public:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

namespace Kratos
{
class AnalyticParticleWatcher {
class KRATOS_API(DEM_APPLICATION) AnalyticParticleWatcher {

public:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

namespace Kratos
{
class ParticlesHistoryWatcher: public AnalyticWatcher {
class KRATOS_API(DEM_APPLICATION) ParticlesHistoryWatcher: public AnalyticWatcher {

public:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

namespace Kratos {

class ParticleCreatorDestructor {
class KRATOS_API(DEM_APPLICATION) ParticleCreatorDestructor {
friend class ExplicitSolverStrategy;

public:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
namespace Kratos
{

class DEMFEMUtilities {
class KRATOS_API(DEM_APPLICATION) DEMFEMUtilities {



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace Kratos {

class ExcavatorUtility {
class KRATOS_API(DEM_APPLICATION) ExcavatorUtility {

public:

Expand Down
Loading