From 99cbd5f18e3675d70d0a7d3aff5520f3fdeb0803 Mon Sep 17 00:00:00 2001 From: roigcarlo Date: Tue, 10 Apr 2018 11:06:10 +0200 Subject: [PATCH 1/3] Fixing dem linking problems --- .../DEM_application/DEM_application.cpp | 7 + .../DEM_application/DEM_application.h | 2 +- .../DEM_application_variables.h | 472 +++++++++--------- .../DEM_D_DMT_cohesive_law.h | 2 +- .../DEM_D_Hertz_confined_CL.h | 2 +- .../DEM_D_Hertz_dependent_friction_CL.h | 2 +- .../DEM_D_Hertz_viscous_Coulomb_2D_CL.h | 2 +- .../DEM_D_Hertz_viscous_Coulomb_CL.h | 2 +- .../DEM_D_Hertz_viscous_Coulomb_Nestle_CL.h | 2 +- .../DEM_D_JKR_cohesive_law.h | 2 +- .../DEM_D_Linear_confined_CL.h | 2 +- .../DEM_D_Linear_viscous_Coulomb_2D_CL.h | 2 +- .../DEM_D_Linear_viscous_Coulomb_CL.h | 2 +- .../custom_constitutive/DEM_Dempack_2D_CL.h | 2 +- .../DEM_Dempack_2D_dev_CL.h | 2 +- .../custom_constitutive/DEM_Dempack_CL.h | 2 +- .../custom_constitutive/DEM_Dempack_dev_CL.h | 2 +- .../DEM_Dempack_torque_CL.h | 2 +- .../DEM_ExponentialHC_CL.h | 2 +- .../custom_constitutive/DEM_KDEM_CL.h | 2 +- .../DEM_KDEM_Mohr_Coulomb_CL.h | 2 +- .../custom_constitutive/DEM_KDEM_Rankine_CL.h | 2 +- .../custom_constitutive/DEM_KDEM_fabric_CL.h | 2 +- .../DEM_compound_constitutive_law.h | 2 +- .../DEM_continuum_constitutive_law.h | 4 +- .../DEM_discontinuum_constitutive_law.h | 2 +- .../DEM_sintering_continuum_CL.h | 2 +- .../dem_d_linear_custom_constants_cl.h | 2 +- .../custom_constitutive/dem_kdem_2d_cl.h | 2 +- .../dem_kdem_fabric_2d_cl.h | 2 +- .../schemes/forward_euler_scheme.h | 2 +- .../schemes/quaternion_integration_scheme.h | 2 +- .../schemes/runge_kutta_scheme.h | 2 +- .../custom_strategies/schemes/taylor_scheme.h | 2 +- .../schemes/velocity_verlet_scheme.h | 2 +- .../strategies/explicit_solver_continuum.h | 2 +- .../analytic_tools/analytic_face_watcher.h | 2 +- .../analytic_model_part_filler.h | 2 +- .../analytic_particle_watcher.h | 2 +- .../particles_history_watcher.h | 2 +- .../custom_utilities/create_and_destroy.h | 2 +- .../custom_utilities/dem_fem_utilities.h | 2 +- .../custom_utilities/excavator_utility.h | 2 +- 43 files changed, 285 insertions(+), 278 deletions(-) diff --git a/applications/DEM_application/DEM_application.cpp b/applications/DEM_application/DEM_application.cpp index e24c59312dab..35fd680e8985 100644 --- a/applications/DEM_application/DEM_application.cpp +++ b/applications/DEM_application/DEM_application.cpp @@ -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" @@ -416,6 +417,12 @@ KratosDEMApplication::KratosDEMApplication() : KratosApplication("DEMApplication mSingleSphereCluster3D(0, Element::GeometryType::Pointer(new Sphere3D1 >(Element::GeometryType::PointsArrayType(1)))), mMapCon3D3N(0, Element::GeometryType::Pointer(new Triangle3D3 >(Element::GeometryType::PointsArrayType(3)))) {} +// Explicit instantiation of composed constituive laws +template class DEM_compound_constitutive_law; +template class DEM_compound_constitutive_law; +template class DEM_compound_constitutive_law; +template class DEM_compound_constitutive_law; + void KratosDEMApplication::Register() { // Calling base class register to register Kratos components diff --git a/applications/DEM_application/DEM_application.h b/applications/DEM_application/DEM_application.h index be5a5fbc04b4..719e7b27f6a9 100755 --- a/applications/DEM_application/DEM_application.h +++ b/applications/DEM_application/DEM_application.h @@ -38,7 +38,7 @@ namespace Kratos { -class KratosDEMApplication : public KratosApplication +class KRATOS_API(DEM_APPLICATION) KratosDEMApplication : public KratosApplication { public: ///@name Type Definitions diff --git a/applications/DEM_application/DEM_application_variables.h b/applications/DEM_application/DEM_application_variables.h index 66217d243bcf..b281c1b7e03f 100644 --- a/applications/DEM_application/DEM_application_variables.h +++ b/applications/DEM_application/DEM_application_variables.h @@ -36,226 +36,226 @@ namespace Kratos #define DEM_DETERMINANT_3x3(a0, a1, a2) (a0[0] * (a1[1] * a2[2] - a1[2] * a2[1]) - a0[1] * (a1[0] * a2[2] - a1[2] * a2[0]) + a0[2] * (a1[0] * a2[1] - a1[1] * a2[0])) - KRATOS_DEFINE_VARIABLE(WeakPointerVector< Element >, CONTINUUM_INI_NEIGHBOUR_ELEMENTS) - KRATOS_DEFINE_VARIABLE(WeakPointerVector< Element >, NODE_TO_NEIGH_ELEMENT_POINTER) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, WeakPointerVector< Element >, CONTINUUM_INI_NEIGHBOUR_ELEMENTS) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, WeakPointerVector< Element >, NODE_TO_NEIGH_ELEMENT_POINTER) //constitutive law - KRATOS_DEFINE_VARIABLE(std::string, DEM_CONTINUUM_CONSTITUTIVE_LAW_NAME) - KRATOS_DEFINE_VARIABLE(std::string, DEM_DISCONTINUUM_CONSTITUTIVE_LAW_NAME) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, std::string, DEM_CONTINUUM_CONSTITUTIVE_LAW_NAME) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, std::string, DEM_DISCONTINUUM_CONSTITUTIVE_LAW_NAME) //scheme - KRATOS_DEFINE_VARIABLE(std::string, DEM_TRANSLATIONAL_INTEGRATION_SCHEME_NAME) - KRATOS_DEFINE_VARIABLE(std::string, DEM_ROTATIONAL_INTEGRATION_SCHEME_NAME) - KRATOS_DEFINE_VARIABLE(DEMIntegrationScheme::Pointer, DEM_TRANSLATIONAL_INTEGRATION_SCHEME_POINTER) - KRATOS_DEFINE_VARIABLE(DEMIntegrationScheme::Pointer, DEM_ROTATIONAL_INTEGRATION_SCHEME_POINTER) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, std::string, DEM_TRANSLATIONAL_INTEGRATION_SCHEME_NAME) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, std::string, DEM_ROTATIONAL_INTEGRATION_SCHEME_NAME) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, DEMIntegrationScheme::Pointer, DEM_TRANSLATIONAL_INTEGRATION_SCHEME_POINTER) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, DEMIntegrationScheme::Pointer, DEM_ROTATIONAL_INTEGRATION_SCHEME_POINTER) - KRATOS_DEFINE_VARIABLE(std::string, PROBABILITY_DISTRIBUTION) - KRATOS_DEFINE_VARIABLE(std::string, EXCENTRICITY_PROBABILITY_DISTRIBUTION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, std::string, PROBABILITY_DISTRIBUTION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, std::string, EXCENTRICITY_PROBABILITY_DISTRIBUTION) // OPTIONS AND FLAGS - KRATOS_DEFINE_VARIABLE(int, TOP) - KRATOS_DEFINE_VARIABLE(int, BOTTOM) - KRATOS_DEFINE_VARIABLE(int, FORCE_INTEGRATION_GROUP) - KRATOS_DEFINE_VARIABLE(int, TABLE_NUMBER) - KRATOS_DEFINE_VARIABLE(int, TABLE_VELOCITY_COMPONENT) - KRATOS_DEFINE_VARIABLE(int, BOUNDING_BOX_OPTION) - KRATOS_DEFINE_VARIABLE(int, ROTATION_OPTION) - KRATOS_DEFINE_VARIABLE(int, CRITICAL_TIME_OPTION) - KRATOS_DEFINE_VARIABLE(int, VIRTUAL_MASS_OPTION) - KRATOS_DEFINE_VARIABLE(int, SEARCH_CONTROL) - KRATOS_DEFINE_VARIABLE(double, COORDINATION_NUMBER) - KRATOS_DEFINE_VARIABLE(double, MAX_AMPLIFICATION_RATIO_OF_THE_SEARCH_RADIUS) - KRATOS_DEFINE_VARIABLE(vector, SEARCH_CONTROL_VECTOR) - KRATOS_DEFINE_VARIABLE(int, CLEAN_INDENT_OPTION) - KRATOS_DEFINE_VARIABLE(int, TRIHEDRON_OPTION) - KRATOS_DEFINE_VARIABLE(int, ROLLING_FRICTION_OPTION) - KRATOS_DEFINE_VARIABLE(int, POISSON_EFFECT_OPTION) - KRATOS_DEFINE_VARIABLE(int, SHEAR_STRAIN_PARALLEL_TO_BOND_OPTION) - KRATOS_DEFINE_VARIABLE(int, NEIGH_INITIALIZED) - KRATOS_DEFINE_VARIABLE(int, TRIAXIAL_TEST_OPTION) - KRATOS_DEFINE_VARIABLE(int, FIX_VELOCITIES_FLAG) - KRATOS_DEFINE_VARIABLE(int, COMPUTE_STRESS_TENSOR_OPTION) - KRATOS_DEFINE_VARIABLE(int, PARTICLE_ID) - KRATOS_DEFINE_VARIABLE(bool, CONTAINS_CLUSTERS) - KRATOS_DEFINE_VARIABLE(bool, RANDOM_ORIENTATION) - KRATOS_DEFINE_VARIABLE(int, LOCAL_RESOLUTION_METHOD) - KRATOS_DEFINE_VARIABLE(int, COMPUTE_FEM_RESULTS_OPTION) - KRATOS_DEFINE_VARIABLE(int, BREAKABLE_CLUSTER) - KRATOS_DEFINE_VARIABLE(ClusterInformation, CLUSTER_INFORMATION) - KRATOS_DEFINE_VARIABLE(std::string, CLUSTER_FILE_NAME) - KRATOS_DEFINE_VARIABLE(std::string, INJECTOR_ELEMENT_TYPE) - KRATOS_DEFINE_VARIABLE(int, CONTINUUM_OPTION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, TOP) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, BOTTOM) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, FORCE_INTEGRATION_GROUP) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, TABLE_NUMBER) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, TABLE_VELOCITY_COMPONENT) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, BOUNDING_BOX_OPTION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, ROTATION_OPTION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, CRITICAL_TIME_OPTION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, VIRTUAL_MASS_OPTION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, SEARCH_CONTROL) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, COORDINATION_NUMBER) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, MAX_AMPLIFICATION_RATIO_OF_THE_SEARCH_RADIUS) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, vector, SEARCH_CONTROL_VECTOR) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, CLEAN_INDENT_OPTION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, TRIHEDRON_OPTION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, ROLLING_FRICTION_OPTION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, POISSON_EFFECT_OPTION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, SHEAR_STRAIN_PARALLEL_TO_BOND_OPTION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, NEIGH_INITIALIZED) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, TRIAXIAL_TEST_OPTION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, FIX_VELOCITIES_FLAG) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, COMPUTE_STRESS_TENSOR_OPTION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, PARTICLE_ID) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, bool, CONTAINS_CLUSTERS) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, bool, RANDOM_ORIENTATION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, LOCAL_RESOLUTION_METHOD) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, COMPUTE_FEM_RESULTS_OPTION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, BREAKABLE_CLUSTER) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, ClusterInformation, CLUSTER_INFORMATION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, std::string, CLUSTER_FILE_NAME) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, std::string, INJECTOR_ELEMENT_TYPE) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, CONTINUUM_OPTION) - KRATOS_DEFINE_VARIABLE(double, INITIAL_VELOCITY_X_VALUE) - KRATOS_DEFINE_VARIABLE(double, INITIAL_VELOCITY_Y_VALUE) - KRATOS_DEFINE_VARIABLE(double, INITIAL_VELOCITY_Z_VALUE) - KRATOS_DEFINE_VARIABLE(double, INITIAL_ANGULAR_VELOCITY_X_VALUE) - KRATOS_DEFINE_VARIABLE(double, INITIAL_ANGULAR_VELOCITY_Y_VALUE) - KRATOS_DEFINE_VARIABLE(double, INITIAL_ANGULAR_VELOCITY_Z_VALUE) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, INITIAL_VELOCITY_X_VALUE) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, INITIAL_VELOCITY_Y_VALUE) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, INITIAL_VELOCITY_Z_VALUE) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, INITIAL_ANGULAR_VELOCITY_X_VALUE) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, INITIAL_ANGULAR_VELOCITY_Y_VALUE) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, INITIAL_ANGULAR_VELOCITY_Z_VALUE) // *************** Continuum only BEGIN ************* - KRATOS_DEFINE_VARIABLE(bool, DELTA_OPTION) - KRATOS_DEFINE_VARIABLE(int, CASE_OPTION) - KRATOS_DEFINE_VARIABLE(double, SKIN_SPHERE) - KRATOS_DEFINE_VARIABLE(double, PARTICLE_COHESION) - KRATOS_DEFINE_VARIABLE(double, PARTICLE_TENSION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, bool, DELTA_OPTION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, CASE_OPTION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, SKIN_SPHERE) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, PARTICLE_COHESION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, PARTICLE_TENSION) - KRATOS_DEFINE_VARIABLE(int, PROPERTIES_ID) - KRATOS_DEFINE_VARIABLE(int, CONTACT_MESH_OPTION) - //KRATOS_DEFINE_VARIABLE(int, FAILURE_CRITERION_OPTION) - KRATOS_DEFINE_VARIABLE(int, CONCRETE_TEST_OPTION) - KRATOS_DEFINE_VARIABLE(int, COHESIVE_GROUP) - KRATOS_DEFINE_VARIABLE(int, IF_BOUNDARY_ELEMENT) - KRATOS_DEFINE_VARIABLE(Vector, IF_BOUNDARY_FACE) - KRATOS_DEFINE_VARIABLE(vector, PARTICLE_CONTACT_FAILURE_ID) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, PROPERTIES_ID) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, CONTACT_MESH_OPTION) + //KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, FAILURE_CRITERION_OPTION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, CONCRETE_TEST_OPTION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, COHESIVE_GROUP) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, IF_BOUNDARY_ELEMENT) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, Vector, IF_BOUNDARY_FACE) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, vector, PARTICLE_CONTACT_FAILURE_ID) // *************** Continuum only END *************** // MATERIAL PARAMETERS - KRATOS_DEFINE_VARIABLE(std::vector, VECTOR_OF_PROPERTIES_PROXIES) - KRATOS_DEFINE_VARIABLE(double, NODAL_MASS_COEFF) - KRATOS_DEFINE_VARIABLE(double, PARTICLE_MOMENT_OF_INERTIA) - KRATOS_DEFINE_VARIABLE(double, ROLLING_FRICTION) - KRATOS_DEFINE_VARIABLE(double, ROLLING_FRICTION_WITH_WALLS) - KRATOS_DEFINE_VARIABLE(double, HISTORICAL_MIN_K) - KRATOS_DEFINE_VARIABLE(double, PARTICLE_INERTIA) - KRATOS_DEFINE_VARIABLE(double, PARTICLE_DENSITY) - KRATOS_DEFINE_VARIABLE(double, PARTICLE_FRICTION) - KRATOS_DEFINE_VARIABLE(double, PARTICLE_STATIC_FRICTION_COEF) - KRATOS_DEFINE_VARIABLE(double, PARTICLE_DYNAMIC_FRICTION_COEF) - KRATOS_DEFINE_VARIABLE(double, COEFFICIENT_OF_RESTITUTION) - KRATOS_DEFINE_VARIABLE(double, PARTICLE_ROTATION_DAMP_RATIO) - KRATOS_DEFINE_VARIABLE(double, DAMPING_GAMMA) - KRATOS_DEFINE_VARIABLE(double, K_NORMAL) - KRATOS_DEFINE_VARIABLE(double, K_TANGENTIAL) - KRATOS_DEFINE_VARIABLE(double, CONTACT_RADIUS) - KRATOS_DEFINE_VARIABLE(double, MAX_STRESS) - KRATOS_DEFINE_VARIABLE(double, GAMMA) - KRATOS_DEFINE_VARIABLE(double, EXCENTRICITY) - KRATOS_DEFINE_VARIABLE(double, EXCENTRICITY_STANDARD_DEVIATION) - KRATOS_DEFINE_VARIABLE(double, FABRIC_COEFFICIENT) - KRATOS_DEFINE_VARIABLE(double, POISSON_VALUE) - KRATOS_DEFINE_VARIABLE(double, INTERNAL_COHESION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, std::vector, VECTOR_OF_PROPERTIES_PROXIES) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, NODAL_MASS_COEFF) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, PARTICLE_MOMENT_OF_INERTIA) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, ROLLING_FRICTION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, ROLLING_FRICTION_WITH_WALLS) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, HISTORICAL_MIN_K) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, PARTICLE_INERTIA) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, PARTICLE_DENSITY) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, PARTICLE_FRICTION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, PARTICLE_STATIC_FRICTION_COEF) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, PARTICLE_DYNAMIC_FRICTION_COEF) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, COEFFICIENT_OF_RESTITUTION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, PARTICLE_ROTATION_DAMP_RATIO) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, DAMPING_GAMMA) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, K_NORMAL) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, K_TANGENTIAL) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, CONTACT_RADIUS) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, MAX_STRESS) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, GAMMA) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, EXCENTRICITY) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, EXCENTRICITY_STANDARD_DEVIATION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, FABRIC_COEFFICIENT) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, POISSON_VALUE) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, INTERNAL_COHESION) // *************** Continuum only BEGIN ************* - KRATOS_DEFINE_VARIABLE(double, SLOPE_FRACTION_N1) - KRATOS_DEFINE_VARIABLE(double, SLOPE_FRACTION_N2) - KRATOS_DEFINE_VARIABLE(double, SLOPE_FRACTION_N3) - KRATOS_DEFINE_VARIABLE(double, SLOPE_LIMIT_COEFF_C1) - KRATOS_DEFINE_VARIABLE(double, SLOPE_LIMIT_COEFF_C2) - KRATOS_DEFINE_VARIABLE(double, SLOPE_LIMIT_COEFF_C3) - KRATOS_DEFINE_VARIABLE(double, YOUNG_MODULUS_PLASTIC) - KRATOS_DEFINE_VARIABLE(double, PLASTIC_YIELD_STRESS) - KRATOS_DEFINE_VARIABLE(double, DAMAGE_FACTOR) - KRATOS_DEFINE_VARIABLE(double, SHEAR_ENERGY_COEF) - KRATOS_DEFINE_VARIABLE(double, DONZE_G1) - KRATOS_DEFINE_VARIABLE(double, DONZE_G2) - KRATOS_DEFINE_VARIABLE(double, DONZE_G3) - KRATOS_DEFINE_VARIABLE(double, DONZE_MAX_DEF) - KRATOS_DEFINE_VARIABLE(double, CONTACT_FAILURE) - KRATOS_DEFINE_VARIABLE(double, CONTACT_ORIENTATION) - KRATOS_DEFINE_VARIABLE(double, CONTACT_SIGMA) - KRATOS_DEFINE_VARIABLE(double, CONTACT_TAU) - KRATOS_DEFINE_VARIABLE(double, FAILURE_CRITERION_STATE) - KRATOS_DEFINE_VARIABLE(double, UNIDIMENSIONAL_DAMAGE) - KRATOS_DEFINE_VARIABLE(double, CONTACT_SIGMA_MIN) - KRATOS_DEFINE_VARIABLE(double, CONTACT_TAU_ZERO) - KRATOS_DEFINE_VARIABLE(double, CONTACT_INTERNAL_FRICC) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, SLOPE_FRACTION_N1) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, SLOPE_FRACTION_N2) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, SLOPE_FRACTION_N3) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, SLOPE_LIMIT_COEFF_C1) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, SLOPE_LIMIT_COEFF_C2) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, SLOPE_LIMIT_COEFF_C3) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, YOUNG_MODULUS_PLASTIC) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, PLASTIC_YIELD_STRESS) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, DAMAGE_FACTOR) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, SHEAR_ENERGY_COEF) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, DONZE_G1) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, DONZE_G2) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, DONZE_G3) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, DONZE_MAX_DEF) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, CONTACT_FAILURE) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, CONTACT_ORIENTATION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, CONTACT_SIGMA) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, CONTACT_TAU) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, FAILURE_CRITERION_STATE) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, UNIDIMENSIONAL_DAMAGE) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, CONTACT_SIGMA_MIN) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, CONTACT_TAU_ZERO) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, CONTACT_INTERNAL_FRICC) // *************** Continuum only END ************* // GEOMETRIC PARAMETERS // *************** Continuum only BEGIN ************* - KRATOS_DEFINE_VARIABLE(double, LOCAL_CONTACT_AREA_HIGH) - KRATOS_DEFINE_VARIABLE(double, LOCAL_CONTACT_AREA_LOW) - KRATOS_DEFINE_VARIABLE(double, MEAN_CONTACT_AREA) - KRATOS_DEFINE_VARIABLE(double, REPRESENTATIVE_VOLUME) - KRATOS_DEFINE_VARIABLE(boost::numeric::ublas::vector, NEIGHBOUR_IDS) - KRATOS_DEFINE_VARIABLE(Vector, NEIGHBOURS_CONTACT_AREAS) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, LOCAL_CONTACT_AREA_HIGH) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, LOCAL_CONTACT_AREA_LOW) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, MEAN_CONTACT_AREA) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, REPRESENTATIVE_VOLUME) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, boost::numeric::ublas::vector, NEIGHBOUR_IDS) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, Vector, NEIGHBOURS_CONTACT_AREAS) // *************** Continuum only END *************** // INLET PARAMETERS - KRATOS_DEFINE_VARIABLE(double,INLET_START_TIME) - KRATOS_DEFINE_VARIABLE(double,INLET_STOP_TIME) - KRATOS_DEFINE_VARIABLE(double,INLET_NUMBER_OF_PARTICLES) - KRATOS_DEFINE_VARIABLE(double,STANDARD_DEVIATION) - KRATOS_DEFINE_VARIABLE(double,MAX_RAND_DEVIATION_ANGLE) - KRATOS_DEFINE_VARIABLE(bool,IMPOSED_MASS_FLOW_OPTION) - KRATOS_DEFINE_VARIABLE(double,MASS_FLOW) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(LINEAR_VELOCITY) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(INLET_INITIAL_VELOCITY) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(INLET_INITIAL_PARTICLES_VELOCITY) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double,INLET_START_TIME) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double,INLET_STOP_TIME) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double,INLET_NUMBER_OF_PARTICLES) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double,STANDARD_DEVIATION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double,MAX_RAND_DEVIATION_ANGLE) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, bool,IMPOSED_MASS_FLOW_OPTION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double,MASS_FLOW) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, LINEAR_VELOCITY) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, INLET_INITIAL_VELOCITY) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, INLET_INITIAL_PARTICLES_VELOCITY) // KINEMATICS - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(PARTICLE_ROTATION_ANGLE) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(EULER_ANGLES) - KRATOS_DEFINE_VARIABLE(bool, DOMAIN_IS_PERIODIC) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(DOMAIN_MIN_CORNER) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(DOMAIN_MAX_CORNER) - KRATOS_DEFINE_VARIABLE(Quaternion, ORIENTATION) - KRATOS_DEFINE_VARIABLE(double,ORIENTATION_REAL) // JIG: SHOULD BE REMOVED IN THE FUTURE - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(ORIENTATION_IMAG) // JIG: SHOULD BE REMOVED IN THE FUTURE - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(DELTA_DISPLACEMENT) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(DELTA_ROTA_DISPLACEMENT) - KRATOS_DEFINE_VARIABLE(double, VELOCITY_START_TIME) - KRATOS_DEFINE_VARIABLE(double, VELOCITY_STOP_TIME) - KRATOS_DEFINE_VARIABLE(double, ANGULAR_VELOCITY_START_TIME) - KRATOS_DEFINE_VARIABLE(double, ANGULAR_VELOCITY_STOP_TIME) - KRATOS_DEFINE_VARIABLE(int, RIGID_BODY_MOTION) - KRATOS_DEFINE_VARIABLE(int, FREE_BODY_MOTION) - KRATOS_DEFINE_VARIABLE(double, RIGID_BODY_MASS) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(RIGID_BODY_CENTER_OF_MASS) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(RIGID_BODY_INERTIAS) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, PARTICLE_ROTATION_ANGLE) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, EULER_ANGLES) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, bool, DOMAIN_IS_PERIODIC) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, DOMAIN_MIN_CORNER) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, DOMAIN_MAX_CORNER) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, Quaternion, ORIENTATION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double,ORIENTATION_REAL) // JIG: SHOULD BE REMOVED IN THE FUTURE + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, ORIENTATION_IMAG) // JIG: SHOULD BE REMOVED IN THE FUTURE + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, DELTA_DISPLACEMENT) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, DELTA_ROTA_DISPLACEMENT) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, VELOCITY_START_TIME) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, VELOCITY_STOP_TIME) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, ANGULAR_VELOCITY_START_TIME) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, ANGULAR_VELOCITY_STOP_TIME) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, RIGID_BODY_MOTION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, FREE_BODY_MOTION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, RIGID_BODY_MASS) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, RIGID_BODY_CENTER_OF_MASS) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, RIGID_BODY_INERTIAS) // ****************** Quaternion Integration BEGIN ****************** - KRATOS_DEFINE_VARIABLE(Quaternion, AUX_ORIENTATION) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(LOCAL_AUX_ANGULAR_VELOCITY) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, Quaternion, AUX_ORIENTATION) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, LOCAL_AUX_ANGULAR_VELOCITY) // ******************* Quaternion Integration END ******************* // FORCE AND MOMENTUM - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(PARTICLE_MOMENT) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(ROLLING_RESISTANCE_MOMENT) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(MAX_ROTA_MOMENT) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(ELASTIC_FORCES) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(CONTACT_FORCES) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(RIGID_ELEMENT_FORCE) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(TANGENTIAL_ELASTIC_FORCES) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(FORCE_REACTION) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(MOMENT_REACTION) - KRATOS_DEFINE_VARIABLE(double, DEM_PRESSURE) - KRATOS_DEFINE_VARIABLE(double, DEM_NODAL_AREA) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, PARTICLE_MOMENT) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, ROLLING_RESISTANCE_MOMENT) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, MAX_ROTA_MOMENT) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, ELASTIC_FORCES) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, CONTACT_FORCES) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, RIGID_ELEMENT_FORCE) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, TANGENTIAL_ELASTIC_FORCES) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, FORCE_REACTION) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, MOMENT_REACTION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, DEM_PRESSURE) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, DEM_NODAL_AREA) // ENERGY - KRATOS_DEFINE_VARIABLE(double, PARTICLE_ELASTIC_ENERGY) - KRATOS_DEFINE_VARIABLE(double, PARTICLE_TRANSLATIONAL_KINEMATIC_ENERGY) - KRATOS_DEFINE_VARIABLE(double, PARTICLE_ROTATIONAL_KINEMATIC_ENERGY) - KRATOS_DEFINE_VARIABLE(double, PARTICLE_GRAVITATIONAL_ENERGY) - KRATOS_DEFINE_VARIABLE(double, PARTICLE_INELASTIC_VISCODAMPING_ENERGY) - KRATOS_DEFINE_VARIABLE(double, PARTICLE_INELASTIC_FRICTIONAL_ENERGY) - KRATOS_DEFINE_VARIABLE(int, COMPUTE_ENERGY_OPTION) - KRATOS_DEFINE_VARIABLE(double, GLOBAL_DAMPING) - KRATOS_DEFINE_VARIABLE(double, NORMAL_IMPACT_VELOCITY) - KRATOS_DEFINE_VARIABLE(double, TANGENTIAL_IMPACT_VELOCITY) - KRATOS_DEFINE_VARIABLE(double, FACE_NORMAL_IMPACT_VELOCITY) - KRATOS_DEFINE_VARIABLE(double, FACE_TANGENTIAL_IMPACT_VELOCITY) - KRATOS_DEFINE_VARIABLE(double, LINEAR_IMPULSE) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, PARTICLE_ELASTIC_ENERGY) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, PARTICLE_TRANSLATIONAL_KINEMATIC_ENERGY) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, PARTICLE_ROTATIONAL_KINEMATIC_ENERGY) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, PARTICLE_GRAVITATIONAL_ENERGY) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, PARTICLE_INELASTIC_VISCODAMPING_ENERGY) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, PARTICLE_INELASTIC_FRICTIONAL_ENERGY) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, COMPUTE_ENERGY_OPTION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, GLOBAL_DAMPING) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, NORMAL_IMPACT_VELOCITY) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, TANGENTIAL_IMPACT_VELOCITY) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, FACE_NORMAL_IMPACT_VELOCITY) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, FACE_TANGENTIAL_IMPACT_VELOCITY) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, LINEAR_IMPULSE) // *************** Continuum only BEGIN ************* - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(INITIAL_ROTA_MOMENT) - KRATOS_DEFINE_VARIABLE(Vector, PARTICLE_BLOCK_CONTACT_FORCE) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(LOCAL_CONTACT_FORCE) - KRATOS_DEFINE_VARIABLE(VectorArray3Double, PARTICLE_CONTACT_FORCES ) - KRATOS_DEFINE_VARIABLE(double, NEIGHBOUR_SIZE) - KRATOS_DEFINE_VARIABLE(double, NEIGHBOUR_RATIO) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, INITIAL_ROTA_MOMENT) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, Vector, PARTICLE_BLOCK_CONTACT_FORCE) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, LOCAL_CONTACT_FORCE) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, VectorArray3Double, PARTICLE_CONTACT_FORCES ) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, NEIGHBOUR_SIZE) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, NEIGHBOUR_RATIO) // CONCRETE TEST - KRATOS_DEFINE_VARIABLE(double, FIXED_VEL_TOP) - KRATOS_DEFINE_VARIABLE(double, FIXED_VEL_BOT) - KRATOS_DEFINE_VARIABLE(double, AREA_VERTICAL_TAPA) - KRATOS_DEFINE_VARIABLE(double, AREA_VERTICAL_CENTRE) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, FIXED_VEL_TOP) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, FIXED_VEL_BOT) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, AREA_VERTICAL_TAPA) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, AREA_VERTICAL_CENTRE) // TENSION @@ -263,96 +263,96 @@ namespace Kratos // APPLIED LOADS - KRATOS_DEFINE_VARIABLE(double, BLAST_RADIUS) - KRATOS_DEFINE_VARIABLE(int , BLAST_CURVE) - KRATOS_DEFINE_VARIABLE(double, BLAST_PRESSURE_MAX) - KRATOS_DEFINE_VARIABLE(double, BLAST_TIME_PRESSURE_MAX) - KRATOS_DEFINE_VARIABLE(double, BLAST_SHAPE_FACTOR) - KRATOS_DEFINE_VARIABLE(double, BLAST_TIME_DELAY) - KRATOS_DEFINE_VARIABLE(int , BLAST_BOREHOLE) - KRATOS_DEFINE_VARIABLE(int , BLAST_NPOINTS) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(BLAST_COORDINATES_1) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(BLAST_COORDINATES_2) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(BLAST_COORDINATES_3) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(BLAST_COORDINATES_4) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(BLAST_COORDINATES_5) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(BLAST_COORDINATES_6) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(BLAST_COORDINATES_7) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(BLAST_COORDINATES_8) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, BLAST_RADIUS) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int , BLAST_CURVE) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, BLAST_PRESSURE_MAX) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, BLAST_TIME_PRESSURE_MAX) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, BLAST_SHAPE_FACTOR) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, BLAST_TIME_DELAY) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int , BLAST_BOREHOLE) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int , BLAST_NPOINTS) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, BLAST_COORDINATES_1) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, BLAST_COORDINATES_2) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, BLAST_COORDINATES_3) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, BLAST_COORDINATES_4) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, BLAST_COORDINATES_5) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, BLAST_COORDINATES_6) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, BLAST_COORDINATES_7) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, BLAST_COORDINATES_8) // *************** Continuum only END ************* // Possible future blocks (no FEM) interaction - KRATOS_DEFINE_VARIABLE(Vector, PARTICLE_BLOCK_CONTACT_FAILURE_ID) - KRATOS_DEFINE_VARIABLE(Vector, PARTICLE_BLOCK_IF_INITIAL_CONTACT) - KRATOS_DEFINE_VARIABLE(WeakPointerVector, NEIGHBOUR_PARTICLE_BLOCK_ELEMENTS) - KRATOS_DEFINE_VARIABLE(WeakPointerVector, NEIGHBOUR_RIGID_FACES) - KRATOS_DEFINE_VARIABLE(WeakPointerVector, NEIGHBOUR_PARTICLE_OF_RIGID_FACE) - KRATOS_DEFINE_VARIABLE(Vector, NEIGHBOUR_RIGID_FACES_PRAM) - KRATOS_DEFINE_VARIABLE(Vector, NEIGHBOUR_RIGID_FACES_ELASTIC_CONTACT_FORCE) - KRATOS_DEFINE_VARIABLE(Vector, NEIGHBOUR_RIGID_FACES_TOTAL_CONTACT_FORCE) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, Vector, PARTICLE_BLOCK_CONTACT_FAILURE_ID) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, Vector, PARTICLE_BLOCK_IF_INITIAL_CONTACT) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, WeakPointerVector, NEIGHBOUR_PARTICLE_BLOCK_ELEMENTS) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, WeakPointerVector, NEIGHBOUR_RIGID_FACES) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, WeakPointerVector, NEIGHBOUR_PARTICLE_OF_RIGID_FACE) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, Vector, NEIGHBOUR_RIGID_FACES_PRAM) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, Vector, NEIGHBOUR_RIGID_FACES_ELASTIC_CONTACT_FORCE) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, Vector, NEIGHBOUR_RIGID_FACES_TOTAL_CONTACT_FORCE) // DUMMIES INT AND DOUBLE VARIABLES - KRATOS_DEFINE_VARIABLE(int, DUMMY_SWITCH) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, DUMMY_SWITCH) // EXPORTS - KRATOS_DEFINE_VARIABLE(double, EXPORT_ID) - KRATOS_DEFINE_VARIABLE(double, EXPORT_PARTICLE_FAILURE_ID) - KRATOS_DEFINE_VARIABLE(int, PRINT_EXPORT_ID) - KRATOS_DEFINE_VARIABLE(int, PRINT_STRESS_TENSOR_OPTION) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, EXPORT_ID) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, EXPORT_PARTICLE_FAILURE_ID) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, PRINT_EXPORT_ID) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, PRINT_STRESS_TENSOR_OPTION) // For DEM_FEM Element - KRATOS_DEFINE_VARIABLE(double, LOCAL_DAMP_RATIO) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, LOCAL_DAMP_RATIO) // For the DEM_Clusters Element - KRATOS_DEFINE_VARIABLE(double, CLUSTER_VOLUME) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(PRINCIPAL_MOMENTS_OF_INERTIA) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(LOCAL_ANGULAR_VELOCITY) - KRATOS_DEFINE_VARIABLE(double, CHARACTERISTIC_LENGTH) - KRATOS_DEFINE_VARIABLE(double, SPRAYED_MATERIAL) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, CLUSTER_VOLUME) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, PRINCIPAL_MOMENTS_OF_INERTIA) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, LOCAL_ANGULAR_VELOCITY) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, CHARACTERISTIC_LENGTH) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, SPRAYED_MATERIAL) // DUMMY VARIABLES FOR CALCULATE - KRATOS_DEFINE_VARIABLE(double, CALCULATE_COMPUTE_NEW_NEIGHBOURS_HISTORICAL_DATA) - KRATOS_DEFINE_VARIABLE(double, CALCULATE_COMPUTE_NEW_RIGID_FACE_NEIGHBOURS_HISTORICAL_DATA) - KRATOS_DEFINE_VARIABLE(double, CALCULATE_SET_INITIAL_DEM_CONTACTS) - KRATOS_DEFINE_VARIABLE(double, CALCULATE_SET_INITIAL_FEM_CONTACTS) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, CALCULATE_COMPUTE_NEW_NEIGHBOURS_HISTORICAL_DATA) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, CALCULATE_COMPUTE_NEW_RIGID_FACE_NEIGHBOURS_HISTORICAL_DATA) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, CALCULATE_SET_INITIAL_DEM_CONTACTS) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, CALCULATE_SET_INITIAL_FEM_CONTACTS) //Cfeng,131013,RigidFace - KRATOS_DEFINE_VARIABLE(double, RIGID_FACE_ROTA_SPEED) - KRATOS_DEFINE_VARIABLE(double, RIGID_FACE_AXIAL_SPEED) - KRATOS_DEFINE_VARIABLE(int, RIGID_FACE_PROP_ID) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(RIGID_FACE_ROTA_ORIGIN_COORD) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(RIGID_FACE_ROTA_AXIAL_DIR) - KRATOS_DEFINE_3D_VARIABLE_WITH_COMPONENTS(RIGID_FACE_ROTA_GLOBAL_VELOCITY) - KRATOS_DEFINE_VARIABLE(double, RIGID_FACE_BEGIN_TIME) - KRATOS_DEFINE_VARIABLE(double, RIGID_FACE_END_TIME) - KRATOS_DEFINE_VARIABLE(int, RIGID_FACE_FLAG) - KRATOS_DEFINE_VARIABLE(Vector, RIGID_FACE_COMPUTE_MOVEMENT) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, RIGID_FACE_ROTA_SPEED) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, RIGID_FACE_AXIAL_SPEED) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, RIGID_FACE_PROP_ID) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, RIGID_FACE_ROTA_ORIGIN_COORD) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, RIGID_FACE_ROTA_AXIAL_DIR) + KRATOS_DEFINE_3D_APPLICATION_VARIABLE_WITH_COMPONENTS(DEM_APPLICATION, RIGID_FACE_ROTA_GLOBAL_VELOCITY) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, RIGID_FACE_BEGIN_TIME) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, RIGID_FACE_END_TIME) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, RIGID_FACE_FLAG) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, Vector, RIGID_FACE_COMPUTE_MOVEMENT) //SLS DEM-FEM KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, WALL_FRICTION) - KRATOS_DEFINE_VARIABLE(double, SHEAR_STRESS) - KRATOS_DEFINE_VARIABLE(double, NON_DIMENSIONAL_VOLUME_WEAR) - KRATOS_DEFINE_VARIABLE(double, IMPACT_WEAR) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, SHEAR_STRESS) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, NON_DIMENSIONAL_VOLUME_WEAR) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, IMPACT_WEAR) KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, SEVERITY_OF_WEAR) KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION,double, BRINELL_HARDNESS) KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, bool, COMPUTE_WEAR) KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION,double, IMPACT_WEAR_SEVERITY) KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION,double, WALL_COHESION) //BOUNDING BOX - KRATOS_DEFINE_VARIABLE(double, BOUNDING_BOX_START_TIME) - KRATOS_DEFINE_VARIABLE(double, BOUNDING_BOX_STOP_TIME) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, BOUNDING_BOX_START_TIME) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, BOUNDING_BOX_STOP_TIME) //OPTIMIZATION - KRATOS_DEFINE_VARIABLE(double, TOTAL_CONTACT_DISTANCES) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, TOTAL_CONTACT_DISTANCES) // *************** Thermal only BEGIN ************* - KRATOS_DEFINE_VARIABLE(double, HEATFLUX) - KRATOS_DEFINE_VARIABLE(double, THERMAL_CONDUCTIVITY) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, HEATFLUX) + KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, THERMAL_CONDUCTIVITY) // *************** Thermal only END *************** class DEMFlags diff --git a/applications/DEM_application/custom_constitutive/DEM_D_DMT_cohesive_law.h b/applications/DEM_application/custom_constitutive/DEM_D_DMT_cohesive_law.h index 976048c19fdc..61400ed00bea 100644 --- a/applications/DEM_application/custom_constitutive/DEM_D_DMT_cohesive_law.h +++ b/applications/DEM_application/custom_constitutive/DEM_D_DMT_cohesive_law.h @@ -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: diff --git a/applications/DEM_application/custom_constitutive/DEM_D_Hertz_confined_CL.h b/applications/DEM_application/custom_constitutive/DEM_D_Hertz_confined_CL.h index 1dbb260f0d23..cc0d9df660fb 100644 --- a/applications/DEM_application/custom_constitutive/DEM_D_Hertz_confined_CL.h +++ b/applications/DEM_application/custom_constitutive/DEM_D_Hertz_confined_CL.h @@ -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); diff --git a/applications/DEM_application/custom_constitutive/DEM_D_Hertz_dependent_friction_CL.h b/applications/DEM_application/custom_constitutive/DEM_D_Hertz_dependent_friction_CL.h index c127407973b3..46d3b395e2e2 100755 --- a/applications/DEM_application/custom_constitutive/DEM_D_Hertz_dependent_friction_CL.h +++ b/applications/DEM_application/custom_constitutive/DEM_D_Hertz_dependent_friction_CL.h @@ -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; diff --git a/applications/DEM_application/custom_constitutive/DEM_D_Hertz_viscous_Coulomb_2D_CL.h b/applications/DEM_application/custom_constitutive/DEM_D_Hertz_viscous_Coulomb_2D_CL.h index e26628dd53f8..f0b6cef1de6e 100644 --- a/applications/DEM_application/custom_constitutive/DEM_D_Hertz_viscous_Coulomb_2D_CL.h +++ b/applications/DEM_application/custom_constitutive/DEM_D_Hertz_viscous_Coulomb_2D_CL.h @@ -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); diff --git a/applications/DEM_application/custom_constitutive/DEM_D_Hertz_viscous_Coulomb_CL.h b/applications/DEM_application/custom_constitutive/DEM_D_Hertz_viscous_Coulomb_CL.h index ff1984ef6e33..cf50db46faf8 100644 --- a/applications/DEM_application/custom_constitutive/DEM_D_Hertz_viscous_Coulomb_CL.h +++ b/applications/DEM_application/custom_constitutive/DEM_D_Hertz_viscous_Coulomb_CL.h @@ -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; diff --git a/applications/DEM_application/custom_constitutive/DEM_D_Hertz_viscous_Coulomb_Nestle_CL.h b/applications/DEM_application/custom_constitutive/DEM_D_Hertz_viscous_Coulomb_Nestle_CL.h index 4cffd37eb258..25746ae08bc7 100644 --- a/applications/DEM_application/custom_constitutive/DEM_D_Hertz_viscous_Coulomb_Nestle_CL.h +++ b/applications/DEM_application/custom_constitutive/DEM_D_Hertz_viscous_Coulomb_Nestle_CL.h @@ -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: diff --git a/applications/DEM_application/custom_constitutive/DEM_D_JKR_cohesive_law.h b/applications/DEM_application/custom_constitutive/DEM_D_JKR_cohesive_law.h index 9e9177a78afb..123d94582b8e 100644 --- a/applications/DEM_application/custom_constitutive/DEM_D_JKR_cohesive_law.h +++ b/applications/DEM_application/custom_constitutive/DEM_D_JKR_cohesive_law.h @@ -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: diff --git a/applications/DEM_application/custom_constitutive/DEM_D_Linear_confined_CL.h b/applications/DEM_application/custom_constitutive/DEM_D_Linear_confined_CL.h index 6bb4b6627948..7c6dddb0ebd9 100644 --- a/applications/DEM_application/custom_constitutive/DEM_D_Linear_confined_CL.h +++ b/applications/DEM_application/custom_constitutive/DEM_D_Linear_confined_CL.h @@ -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); diff --git a/applications/DEM_application/custom_constitutive/DEM_D_Linear_viscous_Coulomb_2D_CL.h b/applications/DEM_application/custom_constitutive/DEM_D_Linear_viscous_Coulomb_2D_CL.h index 7b945bf86a65..f5de2eeef4ce 100644 --- a/applications/DEM_application/custom_constitutive/DEM_D_Linear_viscous_Coulomb_2D_CL.h +++ b/applications/DEM_application/custom_constitutive/DEM_D_Linear_viscous_Coulomb_2D_CL.h @@ -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); diff --git a/applications/DEM_application/custom_constitutive/DEM_D_Linear_viscous_Coulomb_CL.h b/applications/DEM_application/custom_constitutive/DEM_D_Linear_viscous_Coulomb_CL.h index a1b0e7ce8d7f..dc9d9d3c6386 100644 --- a/applications/DEM_application/custom_constitutive/DEM_D_Linear_viscous_Coulomb_CL.h +++ b/applications/DEM_application/custom_constitutive/DEM_D_Linear_viscous_Coulomb_CL.h @@ -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: diff --git a/applications/DEM_application/custom_constitutive/DEM_Dempack_2D_CL.h b/applications/DEM_application/custom_constitutive/DEM_Dempack_2D_CL.h index bd7be8d9f2ab..6c26be7e79e5 100644 --- a/applications/DEM_application/custom_constitutive/DEM_Dempack_2D_CL.h +++ b/applications/DEM_application/custom_constitutive/DEM_Dempack_2D_CL.h @@ -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); diff --git a/applications/DEM_application/custom_constitutive/DEM_Dempack_2D_dev_CL.h b/applications/DEM_application/custom_constitutive/DEM_Dempack_2D_dev_CL.h index 9c095abdcdf7..f73996a47963 100755 --- a/applications/DEM_application/custom_constitutive/DEM_Dempack_2D_dev_CL.h +++ b/applications/DEM_application/custom_constitutive/DEM_Dempack_2D_dev_CL.h @@ -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); diff --git a/applications/DEM_application/custom_constitutive/DEM_Dempack_CL.h b/applications/DEM_application/custom_constitutive/DEM_Dempack_CL.h index ca5d26dbc6c0..521f76822ca4 100644 --- a/applications/DEM_application/custom_constitutive/DEM_Dempack_CL.h +++ b/applications/DEM_application/custom_constitutive/DEM_Dempack_CL.h @@ -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); diff --git a/applications/DEM_application/custom_constitutive/DEM_Dempack_dev_CL.h b/applications/DEM_application/custom_constitutive/DEM_Dempack_dev_CL.h index 7bed263c1d82..ef319e2d8455 100644 --- a/applications/DEM_application/custom_constitutive/DEM_Dempack_dev_CL.h +++ b/applications/DEM_application/custom_constitutive/DEM_Dempack_dev_CL.h @@ -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); diff --git a/applications/DEM_application/custom_constitutive/DEM_Dempack_torque_CL.h b/applications/DEM_application/custom_constitutive/DEM_Dempack_torque_CL.h index f0dd199cc548..6a85fc0bc600 100644 --- a/applications/DEM_application/custom_constitutive/DEM_Dempack_torque_CL.h +++ b/applications/DEM_application/custom_constitutive/DEM_Dempack_torque_CL.h @@ -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); diff --git a/applications/DEM_application/custom_constitutive/DEM_ExponentialHC_CL.h b/applications/DEM_application/custom_constitutive/DEM_ExponentialHC_CL.h index b28d47eee9c7..80c57a1a5398 100644 --- a/applications/DEM_application/custom_constitutive/DEM_ExponentialHC_CL.h +++ b/applications/DEM_application/custom_constitutive/DEM_ExponentialHC_CL.h @@ -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); diff --git a/applications/DEM_application/custom_constitutive/DEM_KDEM_CL.h b/applications/DEM_application/custom_constitutive/DEM_KDEM_CL.h index d302da6baf03..f8bed9914d74 100644 --- a/applications/DEM_application/custom_constitutive/DEM_KDEM_CL.h +++ b/applications/DEM_application/custom_constitutive/DEM_KDEM_CL.h @@ -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); diff --git a/applications/DEM_application/custom_constitutive/DEM_KDEM_Mohr_Coulomb_CL.h b/applications/DEM_application/custom_constitutive/DEM_KDEM_Mohr_Coulomb_CL.h index 0929ea82222f..a3c615e56d32 100644 --- a/applications/DEM_application/custom_constitutive/DEM_KDEM_Mohr_Coulomb_CL.h +++ b/applications/DEM_application/custom_constitutive/DEM_KDEM_Mohr_Coulomb_CL.h @@ -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); diff --git a/applications/DEM_application/custom_constitutive/DEM_KDEM_Rankine_CL.h b/applications/DEM_application/custom_constitutive/DEM_KDEM_Rankine_CL.h index e6384e8d78d6..876ad849953d 100644 --- a/applications/DEM_application/custom_constitutive/DEM_KDEM_Rankine_CL.h +++ b/applications/DEM_application/custom_constitutive/DEM_KDEM_Rankine_CL.h @@ -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); diff --git a/applications/DEM_application/custom_constitutive/DEM_KDEM_fabric_CL.h b/applications/DEM_application/custom_constitutive/DEM_KDEM_fabric_CL.h index 67d4e9ded971..3b989ed3c1ee 100644 --- a/applications/DEM_application/custom_constitutive/DEM_KDEM_fabric_CL.h +++ b/applications/DEM_application/custom_constitutive/DEM_KDEM_fabric_CL.h @@ -9,7 +9,7 @@ namespace Kratos { - class DEM_KDEMFabric : public DEM_KDEM { + class KRATOS_API(DEM_APPLICATION) DEM_KDEMFabric : public DEM_KDEM { public: diff --git a/applications/DEM_application/custom_constitutive/DEM_compound_constitutive_law.h b/applications/DEM_application/custom_constitutive/DEM_compound_constitutive_law.h index fcf307f4e931..b59963ecd821 100644 --- a/applications/DEM_application/custom_constitutive/DEM_compound_constitutive_law.h +++ b/applications/DEM_application/custom_constitutive/DEM_compound_constitutive_law.h @@ -10,7 +10,7 @@ namespace Kratos { template -class DEM_compound_constitutive_law : public MainCL { +class KRATOS_API(DEM_APPLICATION) DEM_compound_constitutive_law : public MainCL { public: diff --git a/applications/DEM_application/custom_constitutive/DEM_continuum_constitutive_law.h b/applications/DEM_application/custom_constitutive/DEM_continuum_constitutive_law.h index 791b82791773..ddc9f4c2ace4 100644 --- a/applications/DEM_application/custom_constitutive/DEM_continuum_constitutive_law.h +++ b/applications/DEM_application/custom_constitutive/DEM_continuum_constitutive_law.h @@ -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: @@ -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 */ diff --git a/applications/DEM_application/custom_constitutive/DEM_discontinuum_constitutive_law.h b/applications/DEM_application/custom_constitutive/DEM_discontinuum_constitutive_law.h index 3df82fa4df07..1a9ac9f98697 100644 --- a/applications/DEM_application/custom_constitutive/DEM_discontinuum_constitutive_law.h +++ b/applications/DEM_application/custom_constitutive/DEM_discontinuum_constitutive_law.h @@ -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 */ diff --git a/applications/DEM_application/custom_constitutive/DEM_sintering_continuum_CL.h b/applications/DEM_application/custom_constitutive/DEM_sintering_continuum_CL.h index e5897822a51f..1bca27179017 100644 --- a/applications/DEM_application/custom_constitutive/DEM_sintering_continuum_CL.h +++ b/applications/DEM_application/custom_constitutive/DEM_sintering_continuum_CL.h @@ -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); diff --git a/applications/DEM_application/custom_constitutive/dem_d_linear_custom_constants_cl.h b/applications/DEM_application/custom_constitutive/dem_d_linear_custom_constants_cl.h index a28535efb9c0..f423aecc8281 100644 --- a/applications/DEM_application/custom_constitutive/dem_d_linear_custom_constants_cl.h +++ b/applications/DEM_application/custom_constitutive/dem_d_linear_custom_constants_cl.h @@ -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: diff --git a/applications/DEM_application/custom_constitutive/dem_kdem_2d_cl.h b/applications/DEM_application/custom_constitutive/dem_kdem_2d_cl.h index ce33e0d07640..ab9dbd9036aa 100644 --- a/applications/DEM_application/custom_constitutive/dem_kdem_2d_cl.h +++ b/applications/DEM_application/custom_constitutive/dem_kdem_2d_cl.h @@ -6,7 +6,7 @@ namespace Kratos { - class DEM_KDEM2D : public DEM_KDEM { + class KRATOS_API(DEM_APPLICATION) DEM_KDEM2D : public DEM_KDEM { public: diff --git a/applications/DEM_application/custom_constitutive/dem_kdem_fabric_2d_cl.h b/applications/DEM_application/custom_constitutive/dem_kdem_fabric_2d_cl.h index 111c8c9dd2d6..9047f0c4ef32 100644 --- a/applications/DEM_application/custom_constitutive/dem_kdem_fabric_2d_cl.h +++ b/applications/DEM_application/custom_constitutive/dem_kdem_fabric_2d_cl.h @@ -6,7 +6,7 @@ namespace Kratos { - class DEM_KDEMFabric2D : public DEM_KDEM2D { + class KRATOS_API(DEM_APPLICATION) DEM_KDEMFabric2D : public DEM_KDEM2D { public: diff --git a/applications/DEM_application/custom_strategies/schemes/forward_euler_scheme.h b/applications/DEM_application/custom_strategies/schemes/forward_euler_scheme.h index bb9381762750..04cad757d7c4 100644 --- a/applications/DEM_application/custom_strategies/schemes/forward_euler_scheme.h +++ b/applications/DEM_application/custom_strategies/schemes/forward_euler_scheme.h @@ -20,7 +20,7 @@ namespace Kratos { - class ForwardEulerScheme : public DEMIntegrationScheme { + class KRATOS_API(DEM_APPLICATION) ForwardEulerScheme : public DEMIntegrationScheme { public: typedef ModelPart::NodesContainerType NodesArrayType; diff --git a/applications/DEM_application/custom_strategies/schemes/quaternion_integration_scheme.h b/applications/DEM_application/custom_strategies/schemes/quaternion_integration_scheme.h index 9ebef8511451..5d957fc1e243 100644 --- a/applications/DEM_application/custom_strategies/schemes/quaternion_integration_scheme.h +++ b/applications/DEM_application/custom_strategies/schemes/quaternion_integration_scheme.h @@ -20,7 +20,7 @@ namespace Kratos { - class QuaternionIntegrationScheme : public DEMIntegrationScheme { + class KRATOS_API(DEM_APPLICATION) QuaternionIntegrationScheme : public DEMIntegrationScheme { public: typedef ModelPart::NodesContainerType NodesArrayType; diff --git a/applications/DEM_application/custom_strategies/schemes/runge_kutta_scheme.h b/applications/DEM_application/custom_strategies/schemes/runge_kutta_scheme.h index be750a5e72f9..9db4548e6e48 100644 --- a/applications/DEM_application/custom_strategies/schemes/runge_kutta_scheme.h +++ b/applications/DEM_application/custom_strategies/schemes/runge_kutta_scheme.h @@ -20,7 +20,7 @@ namespace Kratos { - class RungeKuttaScheme : public DEMIntegrationScheme { + class KRATOS_API(DEM_APPLICATION) RungeKuttaScheme : public DEMIntegrationScheme { public: typedef ModelPart::NodesContainerType NodesArrayType; diff --git a/applications/DEM_application/custom_strategies/schemes/taylor_scheme.h b/applications/DEM_application/custom_strategies/schemes/taylor_scheme.h index bb3cc2451f78..6a546a01dfdf 100644 --- a/applications/DEM_application/custom_strategies/schemes/taylor_scheme.h +++ b/applications/DEM_application/custom_strategies/schemes/taylor_scheme.h @@ -20,7 +20,7 @@ namespace Kratos { - class TaylorScheme : public DEMIntegrationScheme { + class KRATOS_API(DEM_APPLICATION) TaylorScheme : public DEMIntegrationScheme { public: typedef ModelPart::NodesContainerType NodesArrayType; diff --git a/applications/DEM_application/custom_strategies/schemes/velocity_verlet_scheme.h b/applications/DEM_application/custom_strategies/schemes/velocity_verlet_scheme.h index 08cdb05d2971..514a60c379a4 100644 --- a/applications/DEM_application/custom_strategies/schemes/velocity_verlet_scheme.h +++ b/applications/DEM_application/custom_strategies/schemes/velocity_verlet_scheme.h @@ -20,7 +20,7 @@ namespace Kratos { - class VelocityVerletScheme : public DEMIntegrationScheme { + class KRATOS_API(DEM_APPLICATION) VelocityVerletScheme : public DEMIntegrationScheme { public: typedef ModelPart::NodesContainerType NodesArrayType; diff --git a/applications/DEM_application/custom_strategies/strategies/explicit_solver_continuum.h b/applications/DEM_application/custom_strategies/strategies/explicit_solver_continuum.h index 14b4eb53dac8..a4c035cfcd79 100644 --- a/applications/DEM_application/custom_strategies/strategies/explicit_solver_continuum.h +++ b/applications/DEM_application/custom_strategies/strategies/explicit_solver_continuum.h @@ -10,7 +10,7 @@ namespace Kratos { - class ContinuumExplicitSolverStrategy : public ExplicitSolverStrategy { + class KRATOS_API(DEM_APPLICATION) ContinuumExplicitSolverStrategy : public ExplicitSolverStrategy { public: typedef ExplicitSolverStrategy BaseType; diff --git a/applications/DEM_application/custom_utilities/analytic_tools/analytic_face_watcher.h b/applications/DEM_application/custom_utilities/analytic_tools/analytic_face_watcher.h index 82fc54bbd2da..4685462a9edf 100644 --- a/applications/DEM_application/custom_utilities/analytic_tools/analytic_face_watcher.h +++ b/applications/DEM_application/custom_utilities/analytic_tools/analytic_face_watcher.h @@ -20,7 +20,7 @@ namespace Kratos { -class AnalyticFaceWatcher { +class KRATOS_API(DEM_APPLICATION) AnalyticFaceWatcher { public: diff --git a/applications/DEM_application/custom_utilities/analytic_tools/analytic_model_part_filler.h b/applications/DEM_application/custom_utilities/analytic_tools/analytic_model_part_filler.h index 40d72726aa01..6e0554342ae1 100644 --- a/applications/DEM_application/custom_utilities/analytic_tools/analytic_model_part_filler.h +++ b/applications/DEM_application/custom_utilities/analytic_tools/analytic_model_part_filler.h @@ -24,7 +24,7 @@ namespace Kratos { -class AnalyticModelPartFiller +class KRATOS_API(DEM_APPLICATION) AnalyticModelPartFiller { public: diff --git a/applications/DEM_application/custom_utilities/analytic_tools/analytic_particle_watcher.h b/applications/DEM_application/custom_utilities/analytic_tools/analytic_particle_watcher.h index a4d4139e25d4..de072467e770 100644 --- a/applications/DEM_application/custom_utilities/analytic_tools/analytic_particle_watcher.h +++ b/applications/DEM_application/custom_utilities/analytic_tools/analytic_particle_watcher.h @@ -20,7 +20,7 @@ namespace Kratos { -class AnalyticParticleWatcher { +class KRATOS_API(DEM_APPLICATION) AnalyticParticleWatcher { public: diff --git a/applications/DEM_application/custom_utilities/analytic_tools/particles_history_watcher.h b/applications/DEM_application/custom_utilities/analytic_tools/particles_history_watcher.h index 8ffaef576070..a41fa0547512 100644 --- a/applications/DEM_application/custom_utilities/analytic_tools/particles_history_watcher.h +++ b/applications/DEM_application/custom_utilities/analytic_tools/particles_history_watcher.h @@ -20,7 +20,7 @@ namespace Kratos { -class ParticlesHistoryWatcher: public AnalyticWatcher { +class KRATOS_API(DEM_APPLICATION) ParticlesHistoryWatcher: public AnalyticWatcher { public: diff --git a/applications/DEM_application/custom_utilities/create_and_destroy.h b/applications/DEM_application/custom_utilities/create_and_destroy.h index 4bf3bb9ce56e..d05d9a8775f6 100755 --- a/applications/DEM_application/custom_utilities/create_and_destroy.h +++ b/applications/DEM_application/custom_utilities/create_and_destroy.h @@ -28,7 +28,7 @@ namespace Kratos { -class ParticleCreatorDestructor { +class KRATOS_API(DEM_APPLICATION) ParticleCreatorDestructor { friend class ExplicitSolverStrategy; public: diff --git a/applications/DEM_application/custom_utilities/dem_fem_utilities.h b/applications/DEM_application/custom_utilities/dem_fem_utilities.h index f57d7bce6c0f..61b438e5a19d 100644 --- a/applications/DEM_application/custom_utilities/dem_fem_utilities.h +++ b/applications/DEM_application/custom_utilities/dem_fem_utilities.h @@ -22,7 +22,7 @@ namespace Kratos { -class DEMFEMUtilities { +class KRATOS_API(DEM_APPLICATION) DEMFEMUtilities { diff --git a/applications/DEM_application/custom_utilities/excavator_utility.h b/applications/DEM_application/custom_utilities/excavator_utility.h index dfda9c703c26..316e56f7f083 100644 --- a/applications/DEM_application/custom_utilities/excavator_utility.h +++ b/applications/DEM_application/custom_utilities/excavator_utility.h @@ -5,7 +5,7 @@ namespace Kratos { - class ExcavatorUtility { + class KRATOS_API(DEM_APPLICATION) ExcavatorUtility { public: From c974bdc1d7c6134edb757955645f14e69196184a Mon Sep 17 00:00:00 2001 From: roigcarlo Date: Tue, 10 Apr 2018 14:28:52 +0200 Subject: [PATCH 2/3] Added exportable flags --- applications/DEM_application/DEM_application_variables.h | 8 ++++---- kratos/includes/define.h | 7 +++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/applications/DEM_application/DEM_application_variables.h b/applications/DEM_application/DEM_application_variables.h index b281c1b7e03f..11291563b741 100644 --- a/applications/DEM_application/DEM_application_variables.h +++ b/applications/DEM_application/DEM_application_variables.h @@ -362,13 +362,13 @@ class DEMFlags KRATOS_DEFINE_LOCAL_FLAG(IS_SINTERING); KRATOS_DEFINE_LOCAL_FLAG(HAS_ROLLING_FRICTION); KRATOS_DEFINE_LOCAL_FLAG(HAS_CRITICAL_TIME); - KRATOS_DEFINE_LOCAL_FLAG(FIXED_VEL_X); - KRATOS_DEFINE_LOCAL_FLAG(FIXED_VEL_Y); - KRATOS_DEFINE_LOCAL_FLAG(FIXED_VEL_Z); + KRATOS_DEFINE_LOCAL_APPLICATION_FLAG(DEM_APPLICATION, FIXED_VEL_X); + KRATOS_DEFINE_LOCAL_APPLICATION_FLAG(DEM_APPLICATION, FIXED_VEL_Y); + KRATOS_DEFINE_LOCAL_APPLICATION_FLAG(DEM_APPLICATION, FIXED_VEL_Z); KRATOS_DEFINE_LOCAL_FLAG(FIXED_ANG_VEL_X); KRATOS_DEFINE_LOCAL_FLAG(FIXED_ANG_VEL_Y); KRATOS_DEFINE_LOCAL_FLAG(FIXED_ANG_VEL_Z); - KRATOS_DEFINE_LOCAL_FLAG(BELONGS_TO_A_CLUSTER); + KRATOS_DEFINE_LOCAL_APPLICATION_FLAG(DEM_APPLICATION, BELONGS_TO_A_CLUSTER); KRATOS_DEFINE_LOCAL_FLAG(HAS_STRESS_TENSOR); KRATOS_DEFINE_LOCAL_FLAG(COPIED_STRESS_TENSOR); KRATOS_DEFINE_LOCAL_FLAG(COPIED_STRESS_TENSOR2); diff --git a/kratos/includes/define.h b/kratos/includes/define.h index fccd88dd6f5a..5829231e442a 100644 --- a/kratos/includes/define.h +++ b/kratos/includes/define.h @@ -235,6 +235,13 @@ catch(...) { Block KRATOS_THROW_ERROR(std::runtime_error, "Unknown error", MoreI static const Kratos::Flags name; \ static const Kratos::Flags NOT_##name +#ifdef KRATOS_DEFINE_LOCAL_APPLICATION_FLAG +#undef KRATOS_DEFINE_LOCAL_APPLICATION_FLAG +#endif +#define KRATOS_DEFINE_LOCAL_APPLICATION_FLAG(application, name) \ + static KRATOS_API(DEM_APPLICATION) const Kratos::Flags name; \ + static KRATOS_API(DEM_APPLICATION) const Kratos::Flags NOT_##name + #ifdef KRATOS_CREATE_LOCAL_FLAG #undef KRATOS_CREATE_LOCAL_FLAG #endif From 65e7e855e02568d45d80f61e14fb93a67761b00a Mon Sep 17 00:00:00 2001 From: roigcarlo Date: Tue, 10 Apr 2018 14:29:11 +0200 Subject: [PATCH 3/3] Exporting prism --- .../custom_processes/prism_neighbours_process.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/StructuralMechanicsApplication/custom_processes/prism_neighbours_process.h b/applications/StructuralMechanicsApplication/custom_processes/prism_neighbours_process.h index ed41ac7fcd14..fe840c6921a0 100644 --- a/applications/StructuralMechanicsApplication/custom_processes/prism_neighbours_process.h +++ b/applications/StructuralMechanicsApplication/custom_processes/prism_neighbours_process.h @@ -51,7 +51,7 @@ namespace Kratos * @details For that pourpose if builds an unordered map of the surrounding elements and nodes and performs different checks * @author Vicente Mataix Ferrandiz */ -class PrismNeighboursProcess +class KRATOS_API(STRUCTURAL_MECHANICS_APPLICATION) PrismNeighboursProcess : public Process { public: