Fix inconsistency betwen NumPy surface function save and load functions

This commit also adds calls to the API functions pcmsolver_save_surface_functions,
pcmsolver_save_surface_function and pcmsolver_load_surface_function in the C_host and
Fortran_host executables. This makes sure that these functions get exercised
and provide a test against trivial API breakages.

Author: robertodr

api/pcmsolver.f90

@@ -47,7 +47,6 @@ module pcmsolver
   public pcmsolver_print_surface_function
   public pcmsolver_save_surface_functions
   public pcmsolver_save_surface_function
-  public pcmsolver_save_surface_function_to_npz
   public pcmsolver_load_surface_function
   public pcmsolver_write_timings
 
@@ -202,14 +201,6 @@ subroutine pcmsolver_save_surface_function(context, name) bind(C)
       character(kind=c_char, len=1), intent(in) :: name(*)
     end subroutine pcmsolver_save_surface_function
 
-    subroutine pcmsolver_save_surface_function_to_npz(context, npz_name, name, suffix) bind(C)
-      import
-      type(c_ptr), value :: context
-      character(kind=c_char, len=1), intent(in) :: npz_name(*)
-      character(kind=c_char, len=1), intent(in) :: name(*)
-      character(kind=c_char, len=1), intent(in) :: suffix(*)
-    end subroutine pcmsolver_save_surface_function_to_npz
-
     subroutine pcmsolver_load_surface_function(context, name) bind(C)
       import
       type(c_ptr), value :: context

src/interface/Meddle.cpp

@@ -351,8 +351,7 @@ void pcmsolver_load_surface_function(pcmsolver_context_t * context,
 void pcm::Meddle::loadSurfaceFunction(const char * name) const {
   std::string functionName(name);
   hostWriter_("\nLoading surface function " + functionName + " from .npy file");
-  std::string fname = functionName + ".npy";
-  Eigen::VectorXd values = cnpy::custom::npy_load<double>(fname);
+  Eigen::VectorXd values = cnpy::custom::npy_load<double>(functionName + ".npy");
   if (values.size() != cavity_->size())
     PCMSOLVER_ERROR("The loaded " + functionName +
                     " surface function is bigger than the cavity!");

tests/C_host/C_host.c

@@ -157,8 +157,9 @@ int main() {
   test_surface_functions(
       output, grid_size, mep, asc_Ag, asc_B3g, asc_neq_B3g, areas);
 
-  pcmsolver_save_surface_function(pcm_context, mep_lbl);
+  pcmsolver_save_surface_functions(pcm_context);
   pcmsolver_save_surface_function(pcm_context, asc_lbl);
+  pcmsolver_load_surface_function(pcm_context, mep_lbl);
 
   pcmsolver_write_timings(pcm_context);
 

tests/Fortran_host/Fortran_host.f90

@@ -168,6 +168,9 @@ program pcm_fortran_host
       ! Surface functions
       call test_surface_functions(grid_size, mep, asc_Ag, asc_B3g, asc_neq_B3g, areas)
 
+      call pcmsolver_save_surface_function(pcm_context, mep_lbl)
+      call pcmsolver_load_surface_function(pcm_context, mep_lbl)
+
       call pcmsolver_write_timings(pcm_context)
 
       call pcmsolver_delete(pcm_context)