diff options
| author | Thomas White <taw@physics.org> | 2023-11-07 17:06:00 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2023-11-07 17:22:43 +0100 |
| commit | 3b5fd2d07163def85c8ef17ba250bf4f056ec34f (patch) | |
| tree | e6e762d4bc0855de78c0a9edcefb249283ed37e1 /src/gui_merge.c | |
| parent | dd26ceb0feaeedb8c1d5672ce70426c0572f30ba (diff) | |
SLURM: Move all sbatch parameters into script
This allows the user to re-run any job, if they want, or at least easily
use the GUI's work as a template.
Diffstat (limited to 'src/gui_merge.c')
| -rw-r--r-- | src/gui_merge.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/gui_merge.c b/src/gui_merge.c index 391957d7..604f2591 100644 --- a/src/gui_merge.c +++ b/src/gui_merge.c @@ -355,7 +355,8 @@ static int write_partialator_script(const char *filename, const char *stdout_filename, const char *stderr_filename, const char *harvest_filename, - const char *log_folder) + const char *log_folder, + const char *prologue) { FILE *fh; int i; @@ -364,6 +365,7 @@ static int write_partialator_script(const char *filename, if ( fh == NULL ) return 1; fprintf(fh, "#!/bin/sh\n"); + fprintf(fh, "%s", prologue); fprintf(fh, "partialator \\\n"); @@ -461,7 +463,8 @@ static int write_process_hkl_script(const char *filename, struct merging_params *params, const char *out_hkl, const char *stdout_filename, - const char *stderr_filename) + const char *stderr_filename, + const char *prologue) { FILE *fh; @@ -469,6 +472,7 @@ static int write_process_hkl_script(const char *filename, if ( fh == NULL ) return 1; fprintf(fh, "#!/bin/sh\n"); + fprintf(fh, "%s", prologue); add_process_hkl(fh, input, params, out_hkl, stdout_filename, stderr_filename, "", ""); @@ -490,20 +494,23 @@ int write_merge_script(const char *filename, const char *stdout_filename, const char *stderr_filename, const char *harvest_filename, - const char *log_folder) + const char *log_folder, + const char *prologue) { if ( strcmp(params->model, "process_hkl") == 0 ) { return write_process_hkl_script(filename, input, params, out_hkl, stdout_filename, - stderr_filename); + stderr_filename, + prologue); } else { return write_partialator_script(filename, input, n_thread_str, params, out_hkl, stdout_filename, stderr_filename, harvest_filename, - log_folder); + log_folder, + prologue); } } |