Merge branch 'io_fixes' into 'master'

Fixes to output list usage after restart dump

See merge request !1296

src/engine.c

@@ -3192,6 +3192,7 @@ void engine_clean(struct engine *e, const int fof, const int restart) {
   output_list_clean(&e->output_list_snapshots);
   output_list_clean(&e->output_list_stats);
   output_list_clean(&e->output_list_stf);
+  output_list_clean(&e->output_list_los);
 
   output_options_clean(e->output_options);
 
@@ -3314,10 +3315,6 @@ void engine_struct_dump(struct engine *e, FILE *stream) {
   los_struct_dump(e->los_properties, stream);
   parser_struct_dump(e->parameter_file, stream);
   output_options_struct_dump(e->output_options, stream);
-  if (e->output_list_snapshots) output_list_clean(&e->output_list_snapshots);
-  if (e->output_list_stats) output_list_clean(&e->output_list_stats);
-  if (e->output_list_stf) output_list_clean(&e->output_list_stf);
-  if (e->output_list_los) output_list_clean(&e->output_list_los);
 
 #ifdef WITH_LOGGER
   if (e->policy & engine_policy_logger) {

src/output_list.c

@@ -367,7 +367,15 @@ void output_list_init(struct output_list **list, const struct engine *e,
   output_list_read_file(*list, filename, cosmo);
 
   if ((*list)->size < 2)
-    error("You need to provide more snapshots in '%s'", filename);
+    error("You need to provide more entries in '%s'", filename);
+
+  if (strcmp(name, "Snapshots") == 0) {
+    if ((*list)->select_output_on &&
+        e->output_options->select_output->paramCount == 0)
+      error(
+          "Cannot use an output list with individual output selection entries "
+          "if 'Snapshots:select_output_on' is set to 0.");
+  }
 
   /* Set data for later checks */
   if (cosmo) {