Change names

Author: Roberto Di Remigio

src/green/MetalSphere.cpp renamed to src/green/MetalNP.cpp

@@ -23,7 +23,7 @@
  */
 /* pcmsolver_copyright_end */
 
-#include "MetalSphere.hpp"
+#include "MetalNP.hpp"
 
 #include <cmath>
 #include <ostream>
@@ -43,7 +43,7 @@ extern "C" void greens_function(const double * epssol, const double * epsre,
                                 const double * sphRadius, const double * ps, const double * p1, const double * p2,
                                 double * greenre, double * greenim);
 
-double MetalSphere::operator()(double * source, double * probe) const
+double MetalNP::operator()(double * source, double * probe) const
 {
     // Calculation of the value of the Green's Function
     double epsre, epsim;
@@ -67,13 +67,13 @@ double MetalSphere::operator()(double * source, double * probe) const
     return greenre;
 }
 
-double MetalSphere::derivative(const Eigen::Vector3d & direction,
+double MetalNP::derivative(const Eigen::Vector3d & direction,
                                const Eigen::Vector3d & p1, const Eigen::Vector3d & p2) const
 {
     return epsSolvent_ * (this->derivativeProbe(direction, p1, p2));
 }
 
-std::ostream & MetalSphere::printObject(std::ostream & os)
+std::ostream & MetalNP::printObject(std::ostream & os)
 {
     os << "Green's function type: metal sphere" << std::endl;
     os << "Permittivity (real part)      = " << epsMetal_.real() << std::endl;

src/green/MetalSphere.hpp renamed to src/green/MetalNP.hpp

@@ -23,8 +23,8 @@
  */
 /* pcmsolver_copyright_end */
 
-#ifndef METALSPHERE_HPP
-#define METALSPHERE_HPP
+#ifndef METALNP_HPP
+#define METALNP_HPP
 
 #include <complex>
 #include <iosfwd>
@@ -41,8 +41,8 @@ class Element;
 #include "GreensFunction.hpp"
 #include "GreensFunctionFactory.hpp"
 
-/*! \file MetalSphere.hpp
- *  \class MetalSphere
+/*! \file MetalNP.hpp
+ *  \class MetalNP
  *  \brief Class to describe spherical metal nanoparticles.
  *  \author Stefano Corni, Luca Frediani, Roberto Di Remigio
  *  \date 2011, 2014
@@ -56,20 +56,20 @@ class Element;
  *  http://dx.doi.org/10.1063/1.1558036
  */
 
-class MetalSphere : public GreensFunction<double>
+class MetalNP : public GreensFunction<double>
 {
 private:
     typedef std::complex<double> dcomplex;
 public:
-    MetalSphere(double eps, double epsRe, double epsIm,
+    MetalNP(double eps, double epsRe, double epsIm,
                 const Eigen::Vector3d & pos, double radius)
         : GreensFunction<double>(false), epsSolvent_(eps), epsMetal_(dcomplex(epsRe, epsIm)),
           sphPosition_(pos), sphRadius_(radius) {}
-    MetalSphere(double eps, double epsRe, double epsIm,
+    MetalNP(double eps, double epsRe, double epsIm,
                 const Eigen::Vector3d & pos, double radius, DiagonalIntegrator * diag)
         : GreensFunction<double>(false, diag), epsSolvent_(eps), epsMetal_(dcomplex(epsRe, epsIm)),
           sphPosition_(pos), sphRadius_(radius) {}
-    virtual ~MetalSphere() {}
+    virtual ~MetalNP() {}
     /*!
      *  Returns value of the directional derivative of the
      *  Greens's function for the pair of points p1, p2:
@@ -93,7 +93,7 @@ class MetalSphere : public GreensFunction<double>
 
     virtual double epsilon() const { return epsSolvent_; } // This is just to get it to compile...
 
-    friend std::ostream & operator<<(std::ostream & os, MetalSphere & gf) {
+    friend std::ostream & operator<<(std::ostream & os, MetalNP & gf) {
         return gf.printObject(os);
     }
     EIGEN_MAKE_ALIGNED_OPERATOR_NEW /* See http://eigen.tuxfamily.org/dox/group__TopicStructHavingEigenMembers.html */
@@ -114,21 +114,21 @@ class MetalSphere : public GreensFunction<double>
 
 namespace
 {
-    // The build functor and use of for_id are not necessary as MetalSphere
+    // The build functor and use of for_id are not necessary as MetalNP
     // inherits from a GreensFunction<double>
-    IGreensFunction * createMetalSphere(const greenData & _data)
+    IGreensFunction * createMetalNP(const greenData & _data)
     {
 	// The NP center is in a std::vector<double> but we need an Eigen::Vector3d
 	// We are currently assuming that there is only one spherical metal NP
 	Eigen::Vector3d center = Eigen::Vector3d::Zero();
 	for (int i = 0; i < 3; ++i) {
 		center(i) = _data.NPspheres[i];
 	}
-        return new MetalSphere(_data.epsilon, _data.epsilonReal, _data.epsilonImaginary, center, _data.NPradii, _data.integrator);
+        return new MetalNP(_data.epsilon, _data.epsilonReal, _data.epsilonImaginary, center, _data.NPradii, _data.integrator);
     }
-    const std::string METALSPHERE("MetalSphere");
-    const bool registeredMetalSphere =
+    const std::string METALNP("MetalNP");
+    const bool registeredMetalNP =
         GreensFunctionFactory::TheGreensFunctionFactory().registerGreensFunction(
-            METALSPHERE, createMetalSphere);
+            METALNP, createMetalNP);
 }
-#endif // METALSPHERE_HPP
+#endif // METALNP_HPP