Skip to content
Permalink
Browse files

maintainer: Removed AFFINITY feature

  • Loading branch information...
fweik committed Oct 1, 2019
1 parent b9e1c30 commit cbfe10a23efc9f8f76b3224f3ee7f8ed5f30a0ee
@@ -444,8 +444,6 @@ Fluid dynamics and fluid structure interaction
- ``LB_BOUNDARIES_GPU``
- ``AFFINITY``
- ``LB_ELECTROHYDRODYNAMICS`` Enables the implicit calculation of electro-hydrodynamics for charged
particles and salt ions in an electric field.
@@ -77,6 +77,5 @@
#define OIF_GLOBAL_FORCES
#define OIF_LOCAL_FORCES
#define MEMBRANE_COLLISION
#define AFFINITY

#define ADDITIONAL_CHECKS
@@ -92,7 +92,6 @@ THOLE requires ELECTROSTATICS
/* Fluid-Structure Interactions (object in fluid) */
OIF_LOCAL_FORCES
OIF_GLOBAL_FORCES
AFFINITY requires EXPERIMENTAL_FEATURES
MEMBRANE_COLLISION requires EXPERIMENTAL_FEATURES

/* Immersed-Boundary Bayreuth version */
@@ -115,7 +115,6 @@ set(EspressoCore_SRC
nonbonded_interactions/smooth_step.cpp
nonbonded_interactions/thole.cpp
nonbonded_interactions/wca.cpp
object-in-fluid/affinity.cpp
object-in-fluid/membrane_collision.cpp
object-in-fluid/oif_global_forces.cpp
object-in-fluid/oif_local_forces.cpp
@@ -56,7 +56,6 @@
#include "nonbonded_interactions/thole.hpp"
#include "nonbonded_interactions/wca.hpp"
#include "npt.hpp"
#include "object-in-fluid/affinity.hpp"
#include "object-in-fluid/membrane_collision.hpp"
#include "object-in-fluid/oif_global_forces.hpp"
#include "object-in-fluid/oif_local_forces.hpp"
@@ -135,17 +135,6 @@ struct SoftSphere_Parameters {
double offset = 0.0;
};

/** affinity potential */
struct Affinity_Parameters {
int type = -1;
double kappa = INACTIVE_CUTOFF;
double r0 = INACTIVE_CUTOFF;
double Kon = INACTIVE_CUTOFF;
double Koff = INACTIVE_CUTOFF;
double maxBond = INACTIVE_CUTOFF;
double cut = INACTIVE_CUTOFF;
};

/** membrane collision potential */
struct Membrane_Parameters {
double a = 0.0;

This file was deleted.

This file was deleted.

This file was deleted.

@@ -123,15 +123,6 @@ cdef extern from "nonbonded_interactions/nonbonded_interaction_data.hpp":
double cut
double offset

cdef struct Affinity_Parameters:
int type
double kappa
double r0
double Kon
double Koff
double maxBond
double cut

cdef struct Membrane_Parameters:
double a
double n
@@ -178,8 +169,6 @@ cdef extern from "nonbonded_interactions/nonbonded_interaction_data.hpp":

LJGen_Parameters ljgen

Affinity_Parameters affinity

Membrane_Parameters membrane

SoftSphere_Parameters soft_sphere

0 comments on commit cbfe10a

Please sign in to comment.
You can’t perform that action at this time.