Skip to content

Fix API for the surface function NumPy save/load functions #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 25, 2017
Merged

Fix API for the surface function NumPy save/load functions #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
50dab85
Fix erroneous loop construct in loadCavity
robertodr Apr 11, 2017
cc7abb5
Merge remote-tracking branch 'upstream/release/1.Y' into release/1.Y
robertodr Apr 21, 2017
f3fd8f9
Merge remote-tracking branch 'upstream/release/1.Y' into release/1.Y
robertodr Apr 22, 2017
653e92f
[Backport from ReSpect] Fix Fortran API functions for string passing
robertodr Apr 11, 2017
bdb2783
Fix inconsistency betwen NumPy surface function save and load functions
robertodr Apr 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/interface/Meddle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!");
Expand Down
3 changes: 2 additions & 1 deletion tests/C_host/C_host.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
3 changes: 3 additions & 0 deletions tests/Fortran_host/Fortran_host.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down