From 8929b16bf23f28e9caf0d518a2c539518e765010 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Tue, 22 Jul 2008 17:00:40 +0000 Subject: [PATCH] Passed INIT_MODEL() alterations on to the utility programs. git-svn-id: svn://abax.physics.drexel.edu/sawsim/trunk@12 865a22a6-13cc-4084-8aa6-876098d8aa20 --- sawsim.nw | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sawsim.nw b/sawsim.nw index 6ec8e2b..17db3d8 100644 --- a/sawsim.nw +++ b/sawsim.nw @@ -818,7 +818,7 @@ int index_k_model(int n_models, k_model_getopt_t *models, char *name) <>= /* requires int num_param_args and char **param_args in the current scope * usage: - * INIT_MODEL("folded", folded_model, folded_params); + * INIT_MODEL("folded", folded_model, folded_param_string, folded_params); * defined as a macro, so it can work on both tension_model_getopt_t and k_model_getopt_t types. */ #define INIT_MODEL(role, model, param_string, param_pointer) \ @@ -3633,7 +3633,7 @@ int main(int argc, char **argv) if (flags & VFLAG) { printf("#initializing model %s with parameters %s\n", model->name, model->params); } - INIT_MODEL("utility", model, params); + INIT_MODEL("utility", model, model->params, params); tdata.group = NULL; push(&tdata.group, params, 1); tdata.env = &env; @@ -4810,7 +4810,7 @@ int main(int argc, char **argv) if (flags & VFLAG) { printf("#initializing model %s with parameters %s\n", model->name, model->params); } - INIT_MODEL("utility", model, params); + INIT_MODEL("utility", model, model->params, params); switch (mode) { case M_K_OF_F : if (model->k == NULL) { -- 2.26.2