Unverified Commit 4a7cafd1 authored by Kai Szuttor's avatar Kai Szuttor Committed by GitHub

Merge pull request #2406 from KaiSzuttor/features

build in container without external dependencies.
parents d608a147 bbb1b47f
Pipeline #4514 passed with stages
in 66 minutes and 44 seconds
......@@ -205,6 +205,16 @@ empty:
- linux
- cuda
ubuntu:wo-dependencies:
stage: build
image: gitlab.icp.uni-stuttgart.de:4567/espressomd/docker/$CI_JOB_NAME
script:
- export myconfig=maxset make_check=false
- bash maintainer/CI/build_cmake.sh
tags:
- docker
- linux
### Builds with ROCm
rocm-maxset:
......
......@@ -71,7 +71,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define SOFT_SPHERE
#define INTER_RF
#define OVERLAPPED
#ifdef P3M
#define THOLE
#endif
#define BOND_ANGLE
......
......@@ -2045,7 +2045,7 @@ void mpi_send_fluid_populations_slave(int node, int index) {
/****************************************************/
void mpi_bcast_max_mu() {
#ifdef DIPOLES
#if defined(DIPOLES) and defined(DP3M)
mpi_call(mpi_bcast_max_mu_slave, -1, 0);
calc_mu_max();
......@@ -2054,7 +2054,7 @@ void mpi_bcast_max_mu() {
}
void mpi_bcast_max_mu_slave(int node, int dummy) {
#ifdef DIPOLES
#if defined(DIPOLES) and defined(DP3M)
calc_mu_max();
......
......@@ -44,7 +44,7 @@
#include "particle_data.hpp"
#include "utils.hpp"
#ifdef DIPOLES
#if defined(DIPOLES) && defined(DP3M)
DLC_struct dlc_params = {1e100, 0, 0, 0, 0};
......
......@@ -42,7 +42,7 @@
#include "config.hpp"
#ifdef DIPOLES
#if defined(DIPOLES) && defined(DP3M)
/** parameters for the MDLC method */
typedef struct {
......
......@@ -245,10 +245,12 @@ void calc_long_range_energies() {
case DIPOLAR_ALL_WITH_ALL_AND_NO_REPLICA:
energy.dipolar[1] = dawaanr_calculations(0, 1);
break;
#ifdef DP3M
case DIPOLAR_MDLC_DS:
energy.dipolar[1] = magnetic_dipolar_direct_sum_calculations(0, 1);
energy.dipolar[2] = add_mdlc_energy_corrections();
break;
#endif
case DIPOLAR_DS:
energy.dipolar[1] = magnetic_dipolar_direct_sum_calculations(0, 1);
break;
......
......@@ -292,9 +292,11 @@ void calc_long_range_forces() {
case DIPOLAR_ALL_WITH_ALL_AND_NO_REPLICA:
dawaanr_calculations(1, 0);
break;
#ifdef DP3M
case DIPOLAR_MDLC_DS:
add_mdlc_force_corrections();
// fall through
// fall through
#endif
case DIPOLAR_DS:
magnetic_dipolar_direct_sum_calculations(1, 0);
break;
......
......@@ -472,9 +472,8 @@ int interactions_sanity_checks() {
}
#endif /* ifdef ELECTROSTATICS */
#ifdef DIPOLES
#if defined(DIPOLES) and defined(DP3M)
switch (coulomb.Dmethod) {
#ifdef DP3M
case DIPOLAR_MDLC_P3M:
if (mdlc_sanity_checks())
state = 0; // fall through
......@@ -482,7 +481,6 @@ int interactions_sanity_checks() {
if (dp3m_sanity_checks())
state = 0;
break;
#endif
case DIPOLAR_MDLC_DS:
if (mdlc_sanity_checks())
state = 0; // fall through
......
......@@ -23,7 +23,7 @@ include "myconfig.pxi"
from espressomd.system cimport *
from espressomd.utils cimport *
IF DIPOLES == 1:
IF DIPOLES and DP3M:
cdef extern from "electrostatics_magnetostatics/mdlc_correction.hpp":
ctypedef struct dlc_struct "DLC_struct":
......
......@@ -22,7 +22,7 @@ from . cimport utils
include "myconfig.pxi"
from .actors import Actor
IF DIPOLES == 1:
IF DIPOLES and DP3M:
class MagnetostaticExtension(Actor):
pass
......
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