Skip to content

Remove merge_ts #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lispandfound merged 3 commits into from
Jan 6, 2026
Merged

Remove merge_ts #79

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d81532
Remove merge_ts
claudio525 Dec 16, 2025
4d117ed
Remove plan_workflow.py
claudio525 Dec 17, 2025
ddd1631
Remove templates folder, fix dependencies
claudio525 Dec 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion pyproject.toml
View file
Open in desktop
Copy link
Contributor

@lispandfound lispandfound Dec 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You also need to remove the cython requirement at the top of the pyproject.toml file. This is added to build merge-ts but is no longer needed.

Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ generate-rupture-propagation = "workflow.scripts.generate_rupture_propagation:ap
copy-domain-parameters = "workflow.scripts.copy_velocity_model_parameters:app"
create-e3d-par = "workflow.scripts.create_e3d_par:app"
generate-stoch = "workflow.scripts.generate_stoch:app"
merge-ts = "workflow.scripts.merge_ts:app"
hf-sim = "workflow.scripts.hf_sim:app"
bb-sim = "workflow.scripts.bb_sim:app"
im-calc = "workflow.scripts.im_calc:app"
Expand Down
14 changes: 0 additions & 14 deletions setup.py
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions wiki/Stages.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,20 +219,6 @@ Can be run in the cybershake container. Can also be run from your own computer u
See the output of `create-e3d-par --help` or [create_e3d_par.py](https://github.com/ucgmsim/workflow/blob/pegasus/workflow/scripts/create_e3d_par.py).
See our description of the [EMOD3D Parameters](https://wiki.canterbury.ac.nz/pages/viewpage.action?pageId=100794983) for documentation on the EMOD3D parameter file format.

## Merge Timeslices
### Description
Merge the output timeslice files of EMOD3D.
### Inputs
1. A directory containing EMOD3D timeslice files.
### Outputs
1. A merged output timeslice file.
### Environment
Can be run in the cybershake container. Can also be run from your own computer using the `merge-ts` command which is installed after running `pip install workflow@git+https://github.com/ucgmsim/workflow`.
### Usage
`merge_ts XYTS_DIRECTORY XYTS_DIRECTORY/output.e3d`
### For More Help
See the output of `merge-ts --help` or [merge_ts.py](https://github.com/ucgmsim/workflow/blob/pegasus/merge_ts/merge_ts.py).

## Create Simulation Video
### Description
Create a simulation video from the low frequency simulation output.
Expand Down
1 change: 0 additions & 1 deletion workflow/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
| EMOD3D | See below. |
| High Frequency Simulation | `workflow.scripts.hf_sim` |
| Broadband Simulation | `workflow.scripts.bb_sim` |
| Merge Timeslices | `merge_ts.merge_ts` |
| Create Simulation Video | `workflow.scripts.plot_ts` |
| Intensity Measure Calculation | `workflow.scripts.im_calc` |

Expand Down
288 changes: 0 additions & 288 deletions workflow/scripts/merge_ts.py
View file
Open in desktop

This file was deleted.

Loading
Loading