Remove the cnpyPimpl.hpp header

src/bin/run_pcm.cpp

@@ -50,7 +50,7 @@
 #include "RegisterSolverToFactory.hpp"
 #include "Atom.hpp"
 #include "Citation.hpp"
-#include "cnpyPimpl.hpp"
+#include "cnpy.hpp"
 #include "PhysicalConstants.hpp"
 #include "Solvent.hpp"
 #include "Sphere.hpp"

src/cavity/Cavity.cpp

@@ -2,22 +2,22 @@
 /*
  *     PCMSolver, an API for the Polarizable Continuum Model
  *     Copyright (C) 2013-2015 Roberto Di Remigio, Luca Frediani and contributors
- *     
+ *
  *     This file is part of PCMSolver.
- *     
+ *
  *     PCMSolver is free software: you can redistribute it and/or modify
  *     it under the terms of the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- *     
+ *
  *     PCMSolver is distributed in the hope that it will be useful,
  *     but WITHOUT ANY WARRANTY; without even the implied warranty of
  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *     GNU Lesser General Public License for more details.
- *     
+ *
  *     You should have received a copy of the GNU Lesser General Public License
  *     along with PCMSolver.  If not, see <http://www.gnu.org/licenses/>.
- *     
+ *
  *     For information on the complete list of contributors to the
  *     PCMSolver API, see: <http://pcmsolver.github.io/pcmsolver-doc>
  */
@@ -33,7 +33,7 @@
 #include "Config.hpp"
 
 #include <Eigen/Core>
-#include "cnpyPimpl.hpp"
+#include "cnpy.hpp"
 
 #include "MathUtils.hpp"
 #include "Symmetry.hpp"

src/interface/Meddle.cpp

@@ -43,7 +43,7 @@
 #include "RegisterSolverToFactory.hpp"
 #include "Atom.hpp"
 #include "Citation.hpp"
-#include "cnpyPimpl.hpp"
+#include "cnpy.hpp"
 #include "PhysicalConstants.hpp"
 #include "Solvent.hpp"
 #include "Sphere.hpp"

src/utils/CMakeLists.txt

@@ -1,8 +1,10 @@
 # List of headers
-list(APPEND headers_list Atom.hpp CavityData.hpp Citation.hpp Cxx11Workarounds.hpp ErrorHandling.hpp Exception.hpp Factory.hpp ForId.hpp GeneralPurpose.hpp GreenData.hpp Input.hpp Interpolation.hpp Logger.hpp LoggerImpl.hpp LoggerInterface.hpp MathUtils.hpp Molecule.hpp PhysicalConstants.hpp QuadratureRules.hpp RadialFunction.hpp Solvent.hpp SolverData.hpp Sphere.hpp SplineFunction.hpp Stencils.hpp SurfaceFunction.hpp Symmetry.hpp TestingMolecules.hpp Timer.hpp TimerInterface.hpp Vector2.hpp Vector3.hpp cnpy.hpp cnpyPimpl.hpp)
+list(APPEND headers_list Atom.hpp CavityData.hpp Citation.hpp Cxx11Workarounds.hpp ErrorHandling.hpp Exception.hpp Factory.hpp ForId.hpp GeneralPurpose.hpp GreenData.hpp Input.hpp Interpolation.hpp Logger.hpp LoggerImpl.hpp LoggerInterface.hpp MathUtils.hpp Molecule.hpp PhysicalConstants.hpp QuadratureRules.hpp RadialFunction.hpp Solvent.hpp SolverData.hpp Sphere.hpp SplineFunction.hpp Stencils.hpp SurfaceFunction.hpp Symmetry.hpp TestingMolecules.hpp Timer.hpp TimerInterface.hpp Vector2.hpp Vector3.hpp cnpy.hpp)
+set_source_files_properties(cnpy.hpp PROPERTIES COMPILE_FLAGS -w)
 
 # List of sources
 list(APPEND sources_list Atom.cpp Exception.cpp Input.cpp Interpolation.cpp Molecule.cpp Solvent.cpp Sphere.cpp SurfaceFunction.cpp Symmetry.cpp cnpy.cpp)
+set_source_files_properties(cnpy.cpp PROPERTIES COMPILE_FLAGS -w)
 
 # Update bar chart
 if(BUILD_CHARTS)

src/utils/cnpy.cpp

@@ -2,7 +2,7 @@
 //Released under MIT License
 //license available in LICENSE file, or at http://www.opensource.org/licenses/mit-license.php
 
-#include "cnpyPimpl.hpp"
+#include "cnpy.hpp"
 
 #include <iomanip>
 #include <algorithm>

src/utils/cnpy.hpp

@@ -268,4 +268,6 @@ namespace cnpy
 
 } // closes namespace
 
+cnpy::NpyArray load_the_npy_file(FILE * fp);
+
 #endif // LIBCNPY_H_

tests/bi_operators/bi_operators_collocation.cpp.in

@@ -34,7 +34,7 @@
 
 #include <Eigen/Core>
 
-#include "cnpyPimpl.hpp"
+#include "cnpy.hpp"
 #include "DerivativeTypes.hpp"
 #include "IntegratorTypes.hpp"
 #include "Element.hpp"

tests/bi_operators/bi_operators_numerical.cpp.in

@@ -35,7 +35,7 @@
 
 #include <Eigen/Core>
 
-#include "cnpyPimpl.hpp"
+#include "cnpy.hpp"
 #include "DerivativeTypes.hpp"
 #include "AnisotropicLiquid.hpp"
 #include "Element.hpp"

tests/bi_operators/bi_operators_purisima.cpp.in

@@ -34,7 +34,7 @@
 
 #include <Eigen/Core>
 
-#include "cnpyPimpl.hpp"
+#include "cnpy.hpp"
 #include "DerivativeTypes.hpp"
 #include "IntegratorTypes.hpp"
 #include "Element.hpp"

tests/bi_operators/update_reference_files.cpp

@@ -33,7 +33,7 @@
 
 #include <Eigen/Core>
 
-#include "cnpyPimpl.hpp"
+#include "cnpy.hpp"
 #include "CollocationIntegrator.hpp"
 #include "PurisimaIntegrator.hpp"
 #include "NumericalIntegrator.hpp"

tests/numerical_quadrature/numerical_quadrature.cpp.in

@@ -33,7 +33,7 @@
 
 #include <Eigen/Core>
 
-#include "cnpyPimpl.hpp"
+#include "cnpy.hpp"
 #include "Element.hpp"
 #include "GePolCavity.hpp"
 #include "IntegratorHelperFunctions.hpp"