Skip to content

Commit 51d2d45

Browse files
author
Roberto Di Remigio
committed
Merge branch 'master' of gitlab.com:PCMSolver/pcmsolver; branch 'master' of github.com:PCMSolver/pcmsolver
Conflicts: doc/gfx/bi_operators.png doc/gfx/interface.png
2 parents 22c782b + ddb1394 commit 51d2d45

File tree

3 files changed

+15
-16
lines changed

3 files changed

+15
-16
lines changed

api/pcmsolver.F90

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module pcmsolver
2-
2+
33
use, intrinsic :: iso_c_binding
44

55
implicit none
@@ -55,12 +55,12 @@ module pcmsolver
5555
interface pcmsolver_new
5656
function pcmsolver_new(input_reading, nr_nuclei, charges, coordinates, symmetry_info, host_input) result(context) bind(C)
5757
import
58-
integer(c_int), value :: input_reading
59-
integer(c_int), value :: nr_nuclei
60-
real(c_double), intent(in) :: charges(*)
61-
real(c_double), intent(in) :: coordinates(*)
62-
integer(c_int), intent(in) :: symmetry_info(*)
63-
type(PCMInput), intent(in) :: host_input
58+
integer(c_int), intent(in), value :: input_reading
59+
integer(c_int), intent(in), value :: nr_nuclei
60+
real(c_double), intent(in) :: charges(*)
61+
real(c_double), intent(in) :: coordinates(*)
62+
integer(c_int), intent(in) :: symmetry_info(*)
63+
type(PCMInput), intent(in), value :: host_input
6464
type(c_ptr) :: context
6565
end function pcmsolver_new
6666
end interface pcmsolver_new
@@ -145,7 +145,7 @@ function pcmsolver_compute_polarization_energy(context, mep_name, asc_name) resu
145145
real(c_double) :: energy
146146
end function pcmsolver_compute_polarization_energy
147147
end interface pcmsolver_compute_polarization_energy
148-
148+
149149
interface pcmsolver_get_surface_function
150150
subroutine pcmsolver_get_surface_function(context, f_size, values, name) bind(C)
151151
import

api/pcmsolver.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ typedef enum
3939
void host_writer(const char *);
4040

4141
PCMSOLVER_API pcmsolver_context_t * pcmsolver_new(pcmsolver_reader_t input_reading,
42-
int nr_nuclei,
43-
double charges[],
44-
double coordinates[],
45-
int symmetry_info[],
46-
PCMInput * host_input);
42+
int nr_nuclei,
43+
double charges[],
44+
double coordinates[],
45+
int symmetry_info[],
46+
PCMInput host_input);
4747

4848
PCMSOLVER_API void pcmsolver_delete(pcmsolver_context_t * context);
4949

src/interface/Meddle.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@
5858
#endif
5959

6060
PCMSOLVER_API
61-
pcmsolver_context_t * pcmsolver_new(pcmsolver_reader_t input_reading, int nr_nuclei, double charges[], double coordinates[], int symmetry_info[], PCMInput * host_input)
61+
pcmsolver_context_t * pcmsolver_new(pcmsolver_reader_t input_reading, int nr_nuclei, double charges[], double coordinates[], int symmetry_info[], PCMInput host_input)
6262
{
63-
return AS_TYPE(pcmsolver_context_t, new pcm::Meddle(input_reading, nr_nuclei, charges, coordinates, symmetry_info, *host_input));
63+
return AS_TYPE(pcmsolver_context_t, new pcm::Meddle(input_reading, nr_nuclei, charges, coordinates, symmetry_info, host_input));
6464
}
6565

6666
PCMSOLVER_API
@@ -354,7 +354,6 @@ namespace pcm {
354354
void Meddle::initInput(pcmsolver_reader_t input_reading, int nr_nuclei, double charges[], double coordinates[], int symmetry_info[], const PCMInput & host_input)
355355
{
356356
if (input_reading) {
357-
//trim(host_input);
358357
input_ = Input(host_input);
359358
} else {
360359
input_ = Input("@pcmsolver.inp");

0 commit comments

Comments
 (0)