Merge branch 'fortran-tinkering' of github.com:hammondkd/lammps into fortran-tinkering
Finishing the edits
This commit is contained in:
@ -83,6 +83,8 @@ MODULE LIBLAMMPS
|
|||||||
PROCEDURE :: memory_usage => lmp_memory_usage
|
PROCEDURE :: memory_usage => lmp_memory_usage
|
||||||
PROCEDURE :: get_mpi_comm => lmp_get_mpi_comm
|
PROCEDURE :: get_mpi_comm => lmp_get_mpi_comm
|
||||||
PROCEDURE :: extract_setting => lmp_extract_setting
|
PROCEDURE :: extract_setting => lmp_extract_setting
|
||||||
|
PROCEDURE, PRIVATE :: lmp_extract_global_int
|
||||||
|
GENERIC :: extract_global => lmp_extract_global_int ! TODO
|
||||||
|
|
||||||
PROCEDURE :: version => lmp_version
|
PROCEDURE :: version => lmp_version
|
||||||
END TYPE lammps
|
END TYPE lammps
|
||||||
@ -541,6 +543,7 @@ CONTAINS
|
|||||||
datatype = lammps_extract_global_datatype(Cname)
|
datatype = lammps_extract_global_datatype(Cname)
|
||||||
IF ( datatype /= LAMMPS_INT ) THEN
|
IF ( datatype /= LAMMPS_INT ) THEN
|
||||||
! throw an exception or something; data type doesn't match!
|
! throw an exception or something; data type doesn't match!
|
||||||
|
WRITE(0,*) 'WARNING: global data type is inconsistent'
|
||||||
END IF
|
END IF
|
||||||
Cptr = lammps_extract_global(self%handle, Cname)
|
Cptr = lammps_extract_global(self%handle, Cname)
|
||||||
CALL c_f_pointer(Cptr, ptr)
|
CALL c_f_pointer(Cptr, ptr)
|
||||||
|
|||||||
Reference in New Issue
Block a user