bauer/xdrfile
1
0
Fork 0
mirror of https://github.com/dnlbauer/xdrfile.git synced 2026-09-11 14:45:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Format with rustfmt

Browse Source
This commit is contained in:
Josh Mitchell
2020-11-07 20:03:05 +11:00
parent 042f0f82c6
commit e30a175d0d
9 changed files with 204 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/c_abi/mod.rs
View File

@@ -1,5 +1,5 @@
pub mod xdr_seek;
#[allow(non_upper_case_globals)]
pub mod xdrfile;
pub mod xdrfile_trr;
pub mod xdrfile_xtc;
pub mod xdr_seek;

26
src/c_abi/xdr_seek.rs
View File

@@ -103,12 +103,11 @@ extern "C" {
pub fn xdr_flush(xd: *mut XDRFILE) -> ::std::os::raw::c_int;
}
#[cfg(test)]
mod tests {
use super::*;
use super::super::xdrfile_xtc::*;
use super::*;
use std::ffi::CString;
#[test]
@@ -119,8 +118,8 @@ mod tests {
let mut step: i32 = 5;
let box_vec = [[0.0; 3]; 3];
let x_p = std::ptr::null_mut();
let mut prec: f32 = 0.0;
let mut prec: f32 = 0.0;
unsafe {
let mode = CString::new("r").unwrap();
let xdr = xdrfile_open(path.as_ptr(), mode.as_ptr());
@@ -129,20 +128,25 @@ mod tests {
let tell = xdr_tell(xdr);
assert!(tell == 0, "{}", tell);
read_xtc(xdr, num_atoms, &mut step, &mut time,
read_xtc(
xdr,
num_atoms,
&mut step,
&mut time,
box_vec.as_ptr() as *mut Matrix,
x_p,
&mut prec);
&mut prec,
);
let tell = xdr_tell(xdr);
assert!(tell > 0, "{}", tell);
}
}
}
#[test]
fn test_xdr_seek() {
let path = CString::new("tests/1l2y.xtc").unwrap();
unsafe {
let mode = CString::new("r").unwrap();
let xdr = xdrfile_open(path.as_ptr(), mode.as_ptr());
@@ -152,9 +156,9 @@ mod tests {
assert!(tell == 0, "{}", tell);
xdr_seek(xdr, 500, 0);
let tell = xdr_tell(xdr);
assert!(tell == 500, "{}", tell);
}
}
}
}
}

2
src/c_abi/xdrfile.rs
View File

@@ -1,4 +1,3 @@
pub const DIM: u32 = 3;
#[repr(C)]
@@ -7,7 +6,6 @@ pub struct XDRFILE {
_unused: [u8; 0],
}
pub type BindgenTy1 = u32;
pub const exdrOK: BindgenTy1 = 0;
pub const exdrHEADER: BindgenTy1 = 1;

38
src/c_abi/xdrfile_trr.rs
View File

@@ -1,6 +1,5 @@
use super::xdrfile::*;
extern "C" {
pub fn read_trr_natoms(
fn_: *const ::std::os::raw::c_char,
@@ -10,7 +9,7 @@ extern "C" {
extern "C" {
pub fn read_trr_nframes(
fn_: *const ::std::os::raw::c_char,
nframes: *const ::std::os::raw::c_ulong,
nframes: *const ::std::os::raw::c_ulong,
) -> ::std::os::raw::c_int;
}
extern "C" {
@@ -61,7 +60,7 @@ mod tests {
#[test]
fn test_read_trr_nframes() {
let path = CString::new("tests/1l2y.trr").unwrap();
let mut nframes: u64 = 0;
let mut nframes: u64 = 0;
unsafe {
let code = read_trr_nframes(path.as_ptr() as *const i8, &mut nframes);
@@ -83,19 +82,25 @@ mod tests {
let box_vec: Matrix = [[1.0, 2.0, 3.0], [2.0, 1.0, 3.0], [3.0, 2.0, 1.0]];
let x: Vec<Rvec> = vec![[1.0, 1.0, 1.0], [1.0, 1.0, 1.0]];
let v: Vec<Rvec> = vec![[1.0, 1.0, 1.0], [1.0, 1.0, 1.0]];
let v: Vec<Rvec> = vec![[1.0, 1.0, 1.0], [1.0, 1.0, 1.0]];
let f: Vec<Rvec> = vec![[1.0, 1.0, 1.0], [1.0, 1.0, 1.0]];
unsafe {
let mode = CString::new("w").unwrap();
let xdr = xdrfile_open(tmp_path.as_ptr(), mode.as_ptr());
let write_code = write_trr(xdr, natoms, step, time, lambda,
let write_code = write_trr(
xdr,
natoms,
step,
time,
lambda,
box_vec.as_ptr() as *mut Matrix,
x.as_ptr() as *mut Rvec,
v.as_ptr() as *mut Rvec,
f.as_ptr() as *mut Rvec);
f.as_ptr() as *mut Rvec,
);
assert!(write_code as u32 == exdrOK);
xdrfile_close(xdr);
xdrfile_close(xdr);
}
// read atoms from tempfile
@@ -111,13 +116,19 @@ mod tests {
unsafe {
let mode = CString::new("r").unwrap();
let xdr = xdrfile_open(tmp_path.as_ptr(), mode.as_ptr());
let read_code = read_trr(xdr, natoms, &mut step2, &mut time2,
&mut lambda2, box_vec2.as_ptr() as *mut Matrix,
let read_code = read_trr(
xdr,
natoms,
&mut step2,
&mut time2,
&mut lambda2,
box_vec2.as_ptr() as *mut Matrix,
x2.as_ptr() as *mut Rvec,
v2.as_ptr() as *mut Rvec,
f2.as_ptr() as *mut Rvec);
f2.as_ptr() as *mut Rvec,
);
assert!(read_code as u32 == exdrOK);
xdrfile_close(xdr);
xdrfile_close(xdr);
}
// make sure everything is still the same
@@ -129,5 +140,4 @@ mod tests {
assert!(v2 == v);
assert!(f2 == f);
}
}
}

37
src/c_abi/xdrfile_xtc.rs
View File

@@ -1,6 +1,5 @@
use super::xdrfile::*;
extern "C" {
pub fn read_xtc_natoms(
fn_: *const ::std::os::raw::c_char,
@@ -10,7 +9,7 @@ extern "C" {
extern "C" {
pub fn read_xtc_nframes(
fn_: *const ::std::os::raw::c_char,
nframes: *const ::std::os::raw::c_ulong,
nframes: *const ::std::os::raw::c_ulong,
) -> ::std::os::raw::c_int;
}
extern "C" {
@@ -57,7 +56,7 @@ mod tests {
#[test]
fn test_read_xtc_nframes() {
let path = CString::new("tests/1l2y.xtc").unwrap();
let mut nframes: u64 = 0;
let mut nframes: u64 = 0;
unsafe {
let code = read_xtc_nframes(path.as_ptr() as *const i8, &mut nframes);
@@ -77,15 +76,21 @@ mod tests {
let step: i32 = 5;
let box_vec: Matrix = [[1.0, 2.0, 3.0], [2.0, 1.0, 3.0], [3.0, 2.0, 1.0]];
let x: Vec<Rvec> = vec![[1.0, 1.0, 1.0], [1.0, 1.0, 1.0]];
unsafe {
let mode = CString::new("w").unwrap();
let xdr = xdrfile_open(tmp_path.as_ptr(), mode.as_ptr());
let write_code = write_xtc(xdr, natoms, step, time,
box_vec.as_ptr() as *mut Matrix, x.as_ptr() as *mut Rvec,
1000.0);
let write_code = write_xtc(
xdr,
natoms,
step,
time,
box_vec.as_ptr() as *mut Matrix,
x.as_ptr() as *mut Rvec,
1000.0,
);
assert!(write_code as u32 == exdrOK);
xdrfile_close(xdr);
xdrfile_close(xdr);
}
// read atoms from tempfile
@@ -98,11 +103,17 @@ mod tests {
unsafe {
let mode = CString::new("r").unwrap();
let xdr = xdrfile_open(tmp_path.as_ptr(), mode.as_ptr());
let read_code = read_xtc(xdr, natoms, &mut step2, &mut time2,
box_vec2.as_ptr() as *mut Matrix, x2.as_ptr() as *mut Rvec,
&mut prec);
let read_code = read_xtc(
xdr,
natoms,
&mut step2,
&mut time2,
box_vec2.as_ptr() as *mut Matrix,
x2.as_ptr() as *mut Rvec,
&mut prec,
);
assert!(read_code as u32 == exdrOK);
xdrfile_close(xdr);
xdrfile_close(xdr);
}
// make sure everything is still the same
@@ -111,4 +122,4 @@ mod tests {
assert!(box_vec2 == box_vec);
assert!(x2 == x);
}
}
}