Skip to content

Commit b2ca260

Browse files
committed
Remove SphericalDiffuse Green's function
This work lives on in V1 and in the rk4 branch
1 parent 8791873 commit b2ca260

33 files changed

+261
-2864
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
.venv
3636
.direnv
3737
Pipfile.lock
38+
.mypy_cache
3839

3940
# Autocmake stuff
4041
cmake/lib/*.pyc

src/green/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ target_sources(pcm-object
22
PRIVATE
33
${CMAKE_CURRENT_SOURCE_DIR}/AnisotropicLiquid.cpp
44
${CMAKE_CURRENT_SOURCE_DIR}/IonicLiquid.cpp
5-
${CMAKE_CURRENT_SOURCE_DIR}/SphericalDiffuse.cpp # Deactivate temporarily when Boost goes away
65
${CMAKE_CURRENT_SOURCE_DIR}/UniformDielectric.cpp
76
${CMAKE_CURRENT_SOURCE_DIR}/Vacuum.cpp
87
${CMAKE_CURRENT_SOURCE_DIR}/SphericalSharp.cpp
@@ -17,9 +16,7 @@ list(APPEND headers_list
1716
GreenUtils.hpp
1817
GreensFunction.hpp
1918
IGreensFunction.hpp
20-
InterfacesImpl.hpp
2119
IonicLiquid.hpp
22-
SphericalDiffuse.hpp
2320
SphericalSharp.hpp
2421
UniformDielectric.hpp
2522
Vacuum.hpp

src/green/Green.hpp

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,20 @@
2828
#include "GreenData.hpp"
2929
#include "IGreensFunction.hpp"
3030
#include "IonicLiquid.hpp"
31-
#include "SphericalDiffuse.hpp"
3231
#include "SphericalSharp.hpp"
3332
#include "UniformDielectric.hpp"
3433
#include "Vacuum.hpp"
35-
#include "dielectric_profile/OneLayerErf.hpp"
36-
#include "dielectric_profile/OneLayerTanh.hpp"
34+
3735
#include "utils/Factory.hpp"
3836

3937
/*!
40-
* \file Solver.hpp
41-
* \brief Top-level include file for solvers
38+
* \file Green.hpp
39+
* \brief Top-level include file for Green's functions
4240
* \author Roberto Di Remigio
4341
* \date 2016
4442
*
4543
* Includes all solver-related headers and defines the bootstrap function
46-
* for the Factory<ISolver, SolverData>
44+
* for the Factory<IGreensFunction, GreenData>
4745
*/
4846

4947
namespace pcm {
@@ -83,13 +81,6 @@ inline Factory<detail::CreateGreensFunction> bootstrapFactory() {
8381
factory_.subscribe("ANISOTROPICLIQUID_HESSIAN",
8482
createAnisotropicLiquid<AD_hessian>);
8583

86-
factory_.subscribe("SPHERICALDIFFUSE_NUMERICAL_TANH",
87-
createSphericalDiffuse<dielectric_profile::OneLayerTanh>);
88-
factory_.subscribe("SPHERICALDIFFUSE_NUMERICAL_ERF",
89-
createSphericalDiffuse<dielectric_profile::OneLayerErf>);
90-
factory_.subscribe("SPHERICALDIFFUSE_NUMERICAL_LOG",
91-
createSphericalDiffuse<dielectric_profile::OneLayerLog>);
92-
9384
factory_.subscribe("SPHERICALSHARP_NUMERICAL", createSphericalSharp<Stencil>);
9485
factory_.subscribe("SPHERICALSHARP_DERIVATIVE",
9586
createSphericalSharp<AD_directional>);

src/green/GreenData.hpp

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,12 @@ struct GreenData {
5151
double epsilon1;
5252
/*! Permittivity outside the interface */
5353
double epsilon2;
54-
/*! Center of the diffuse/sharp layer aka the radius of diffuse/sharp sphere */
54+
/*! Center of the sharp layer aka the radius of sharp sphere */
5555
double center;
56-
/*! Width of the diffuse layer */
57-
double width;
58-
/*! Origin of the dielectric diffuse/sharp layer aka the center of the
59-
* diffuse/sharp sphere.
56+
/*! Origin of the dielectric sharp layer aka the center of the sharp sphere.
6057
*/
6158
Eigen::Vector3d origin;
62-
/*! Maximum angular momentum in the spherical diffuse/sharp Green's function
59+
/*! Maximum angular momentum in the spherical sharp Green's function
6360
* summation.
6461
*/
6562
int maxL;
@@ -72,7 +69,6 @@ struct GreenData {
7269
double e1 = 1.0,
7370
double e2 = 1.0,
7471
double c = 100.0,
75-
double w = 5.0,
7672
const Eigen::Vector3d & o = Eigen::Vector3d::Zero(),
7773
int l = 50)
7874
: greensFunctionType(type),
@@ -83,7 +79,6 @@ struct GreenData {
8379
epsilon1(e1),
8480
epsilon2(e2),
8581
center(c),
86-
width(w),
8782
origin(o),
8883
maxL(l) {}
8984
EIGEN_MAKE_ALIGNED_OPERATOR_NEW

0 commit comments

Comments
 (0)