aboutsummaryrefslogtreecommitdiff
path: root/src/refine.c
diff options
context:
space:
mode:
authortaw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1>2008-08-13 14:27:07 +0000
committertaw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1>2008-08-13 14:27:07 +0000
commita695694114f4b52d8dd015e2376f4aee5d4074b4 (patch)
tree901ba65856d733356bc38cd4aaf0157c99b69492 /src/refine.c
parent04667dc68a17a5a5bc12237cfc3462d9b628c350 (diff)
Restore working refinement...
git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@288 bf6ca9ba-c028-0410-8290-897cf20841d1
Diffstat (limited to 'src/refine.c')
-rw-r--r--src/refine.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/refine.c b/src/refine.c
index 987fba1..5de8df3 100644
--- a/src/refine.c
+++ b/src/refine.c
@@ -33,10 +33,10 @@
#define DISPFACTOR 1.0e9
/* Number of parameters */
-#define NUM_PARAMS 4
+#define NUM_PARAMS 9
/* Refine debug */
-#define REFINE_DEBUG 1
+#define REFINE_DEBUG 0
/* A simplex is an array of ten of these */
typedef struct {
@@ -408,8 +408,6 @@ double refine_do_cell(ControlContext *ctx) {
d[f].dy = dly;
d[f].dz = dlz;
- printf("Feature %3i: %8f %8f %8f\n", f, dlx/DISPFACTOR, dly/DISPFACTOR, dlz/DISPFACTOR);
-
f++;
}
@@ -434,7 +432,7 @@ double refine_do_cell(ControlContext *ctx) {
memcpy(&s[9], &s[0], sizeof(SimplexVertex)); s[9].dcz = delta;
/* Iterate */
- maxiter = 5000;
+ maxiter = 500;
for ( it=0; it<maxiter; it++ ) {
double conv;