Skip to content
Snippets Groups Projects

Stf output times

Merged Stuart McAlpine requested to merge stf_output_times into master
  1. When dealing with a property that uses an output_list (snapshots, stats, stf), now only outputs those quantities at the selected output_times (i.e., it no longer outputs on the first and last timestep if an output_list is selected).

  2. Also captures the case where an output is requested on the last timestep (which is common for z=0, a=1) which would of been done previously by always outputting at the last timestep in main.c (but not for stf).

  3. If invoke_stf is selected, an output_list for StructureFinding cannot also be selected, pick either or. (Don't want to run stf twice).

  4. stf outputs always use the StructureFinding: basename for their outputs, even when using invoke_stf.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Matthieu Schaller
  • Stuart McAlpine added 3 commits

    added 3 commits

    • 3dd67a94 - Changed final_step_dump from char to int
    • d05e5c3d - Now outputs message for last timestep in non-cosmo case
    • f4337fa4 - Updated logic check for doing a snapshot on the last timestep to remove repitition

    Compare with previous version

  • added 1 commit

    • 7fb2e606 - Now you can only run with invoke_stf is you don't have duplicate time entries…

    Compare with previous version

  • Stuart McAlpine resolved all discussions

    resolved all discussions

  • Stuart McAlpine resolved all discussions

    resolved all discussions

  • added 1 commit

    • 499dedf1 - Code formatting tool and GCC brackets warning.

    Compare with previous version

  • Stuart McAlpine added 81 commits

    added 81 commits

    • 499dedf1...472b326f - 75 commits from branch master
    • 66ab3368 - Rather that checking for duplicate times the snapshot and stf output_lists.
    • 5557835e - Added duplicate logic for final timestep in main.c
    • 3d5e7670 - When invoke_stf is enabled, the indexing will always follow the stf_count.
    • ce0813f8 - Was not counting the stf_output_count correctly, fixed.
    • 11e50a53 - Merge branch 'master' of https://gitlab.cosma.dur.ac.uk/swift/swiftsim into stf_output_times
    • e103b8c0 - Merge branch 'stf_output_times' of https://gitlab.cosma.dur.ac.uk/swift/swiftsim…

    Compare with previous version

  • Is the point (3) in your list at the top still the case in this latest version?

  • @rttw52 any updates on the question above?

  • Matthieu Schaller added 375 commits

    added 375 commits

    Compare with previous version

  • no point (3) is no longer true, you can choose invoke_stf and have a stf_output list together.

    the engine->stf_this_timestep should ensure that no matter what combination of requests are done (say you had invoke and a output time on the same timestep) it only ever performs stf a maximum of once per timestep.

  • Great. Thanks. Was there anything else that you wanted to add here on that front?

  • No I think that should be it doing the behaviour we want.

  • Matthieu Schaller added 51 commits

    added 51 commits

    Compare with previous version

  • added 1 commit

    • c6b36c04 - Memory leak fix and code formatting.

    Compare with previous version

  • Can we also make the changes to single_io.c? Otherwise the MPI and non-MPI versions will have a different behaviour.

  • added 1 commit

    Compare with previous version

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading