diff options
| author | Thomas White <taw@physics.org> | 2014-06-26 16:34:59 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2014-06-27 15:44:28 +0200 |
| commit | 8bcc2f1fd10f5c1efdf89c00d04af1f0de948741 (patch) | |
| tree | 4caae4331b505cae573923dd71e014b7e7148052 /tests | |
| parent | 19f977c6d62ffca9f13bcdefef32b5b27a326b7a (diff) | |
Add Thin Ewald Sphere model
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/pr_l_gradient_check.c | 1 | ||||
| -rw-r--r-- | tests/pr_p_gradient_check.c | 9 | ||||
| -rw-r--r-- | tests/pr_pl_gradient_check.c | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/tests/pr_l_gradient_check.c b/tests/pr_l_gradient_check.c index b707629f..7342d5f8 100644 --- a/tests/pr_l_gradient_check.c +++ b/tests/pr_l_gradient_check.c @@ -350,6 +350,7 @@ int main(int argc, char *argv[]) pmodel = PMODEL_GAUSSIAN; STATUS("Testing Gaussian model:\n"); } + /* No point testing TES model, because it has no Lorentz factor */ orientation = random_quaternion(rng); rot = cell_rotate(cell, orientation); diff --git a/tests/pr_p_gradient_check.c b/tests/pr_p_gradient_check.c index 8f7a66e4..14a2b579 100644 --- a/tests/pr_p_gradient_check.c +++ b/tests/pr_p_gradient_check.c @@ -174,6 +174,7 @@ static Crystal *new_shifted_crystal(Crystal *cr, int refine, double incr_val) return cr_new; } + static void calc_either_side(Crystal *cr, double incr_val, int *valid, long double *vals[3], int refine, PartialityModel pmodel) @@ -225,7 +226,6 @@ static void calc_either_side(Crystal *cr, double incr_val, } - static double test_gradients(Crystal *cr, double incr_val, int refine, const char *str, const char *file, PartialityModel pmodel, int quiet, int plot) @@ -450,7 +450,7 @@ int main(int argc, char *argv[]) rng = gsl_rng_alloc(gsl_rng_mt19937); - for ( i=0; i<2; i++ ) { + for ( i=0; i<3; i++ ) { UnitCell *rot; double val; @@ -459,9 +459,12 @@ int main(int argc, char *argv[]) if ( i == 0 ) { pmodel = PMODEL_SPHERE; STATUS("Testing flat sphere model:\n"); - } else { + } else if ( i == 1 ) { pmodel = PMODEL_GAUSSIAN; STATUS("Testing Gaussian model:\n"); + } else { + pmodel = PMODEL_THIN; + STATUS("Testing thin Ewald sphere model:\n"); } orientation = random_quaternion(rng); diff --git a/tests/pr_pl_gradient_check.c b/tests/pr_pl_gradient_check.c index f83af335..69087a4b 100644 --- a/tests/pr_pl_gradient_check.c +++ b/tests/pr_pl_gradient_check.c @@ -174,6 +174,7 @@ static Crystal *new_shifted_crystal(Crystal *cr, int refine, double incr_val) return cr_new; } + static void calc_either_side(Crystal *cr, double incr_val, int *valid, long double *vals[3], int refine, PartialityModel pmodel) @@ -225,7 +226,6 @@ static void calc_either_side(Crystal *cr, double incr_val, } - static double test_gradients(Crystal *cr, double incr_val, int refine, const char *str, const char *file, PartialityModel pmodel, int quiet, int plot) @@ -465,6 +465,7 @@ int main(int argc, char *argv[]) pmodel = PMODEL_GAUSSIAN; STATUS("Testing Gaussian model:\n"); } + /* No point testing TES model */ orientation = random_quaternion(rng); rot = cell_rotate(cell, orientation); |