diff --git a/solvers/DPStokes/mobility.h b/solvers/DPStokes/mobility.h index ca42c27..a65e115 100644 --- a/solvers/DPStokes/mobility.h +++ b/solvers/DPStokes/mobility.h @@ -50,6 +50,15 @@ class DPStokes: public libmobility::Mobility{ this->temperature = ipar.temperature; this->lanczosTolerance = ipar.tolerance; this->dppar.mode = this->wallmode; + this->dppar.hydrodynamicRadius = ipar.hydrodynamicRadius; //a + this->dppar.w = 6; + this->dppar.beta = 1.714*this->dppar.w; + this->dppar.alpha = this->dppar.w/2.0; + real h = this->dppar.hydrodynamicRadius/1.554; + this->dppar.nx = this->dppar.Lx/h; + this->dppar.ny = this->dppar.Ly/h; + real Lz = this->dppar.zmax - this->dppar.zmin; + this->dppar.nz = M_PI*Lz/h; dpstokes->initialize(dppar, this->numberParticles); Mobility::initialize(ipar); } diff --git a/solvers/DPStokes/python_wrapper.cpp b/solvers/DPStokes/python_wrapper.cpp index 3ca90a0..8762248 100644 --- a/solvers/DPStokes/python_wrapper.cpp +++ b/solvers/DPStokes/python_wrapper.cpp @@ -31,12 +31,6 @@ MOBILITY_PYTHONIFY_WITH_EXTRA_CODE(DPStokes, params.Ly = Ly; params.zmin = zmin; params.zmax = zmax; - params.w = 6; - // params.w_d = w_d; - params.beta = 1.714*params.w; - // params.beta_d = beta_d; - params.alpha = params.w/2.0; - // params.alpha_d = alpha_d; self.setParametersDPStokes(params); }, "dt"_a, "Lx"_a, "Ly"_a, "zmin"_a,