Skip to content

Commit 9d50c64

Browse files
committed
vacuum minimization
1 parent 1c2284e commit 9d50c64

19 files changed

+193
-56
lines changed

cwl_adapters/combine_structure.cwl

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ baseCommand: ['python', '/combine_structure.py']
1212

1313
hints:
1414
DockerRequirement:
15-
dockerPull: ndonyapour/combine_structure
15+
dockerPull: ndonyapour/combine_structure_zip
1616

1717
inputs:
1818
input_structure1:
@@ -40,6 +40,20 @@ inputs:
4040
- edam:format_3877
4141
inputBinding:
4242
prefix: --input_structure2
43+
44+
input_top_zip_path:
45+
label: Input zip file
46+
doc: |-
47+
Input zip file
48+
Type: string
49+
File type: input
50+
Accepted formats: zip
51+
Example file: https://github.com/bioexcel/biobb_md/blob/master/biobb_md/test/data/gromacs/genion.zip
52+
type: File
53+
format:
54+
- edam:format_3987
55+
inputBinding:
56+
prefix: --input_top_zip_path
4357

4458
output_structure_path:
4559
label: Output combined PDB file path

examples/docking/docking.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ steps:
9090
in:
9191
input_structure1: '*receptor.xyz' # '*receptor_hydrogens.pdb'
9292
input_structure2: '*pose_ligand.xyz'
93+
input_top_zip_path: '*complex_vac.zip'
9394
output_structure_path: '&complex_vac.pdb'
9495

9596
wic:

examples/docking/dsb.yml

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,17 @@ steps:
99
sdf_path: ~sdf_path
1010
- stability.yml:
1111
in:
12-
# NOTE: crd_path and top_zip_path are currently only necessary
13-
# due to a limitation of the inlineing implementation.
14-
# Moreover, crd_path and top_zip_path are overridden below
1512
crd_path: '*complex_vac.pdb'
1613
top_zip_path: '*complex_vac.zip'
17-
nsteps: 100000
14+
nsteps: 10000
1815
dt: 0.002
1916
temperature: 298.0
2017
pressure: 1.0
2118
- stability.yml:
2219
in:
23-
# NOTE: crd_path and top_zip_path are currently only necessary
24-
# due to a limitation of the inlineing implementation.
25-
# Moreover, crd_path and top_zip_path are overridden below
26-
crd_path: '*complex_vac.pdb'
27-
top_zip_path: '*complex_vac.zip'
28-
nsteps: 100000
20+
crd_path: '*ligand_GMX.gro'
21+
top_zip_path: '*ligand_GMX.zip'
22+
nsteps: 10000
2923
dt: 0.002
3024
temperature: 298.0
3125
pressure: 1.0
@@ -41,13 +35,18 @@ wic:
4135
environment:
4236
action: checkpoint
4337
steps:
44-
(1, setup.yml):
38+
(1, setup_vac_min.yml):
4539
wic:
4640
steps:
47-
(4, genion):
48-
in:
49-
output_top_zip_path: '&genion_complex.zip'
41+
(3, solv_ion.yml):
42+
wic:
43+
steps:
44+
(4, genion):
45+
in:
46+
output_top_zip_path: '&genion_complex.zip'
5047
(2, basic.yml):
48+
in:
49+
top_zip_path: '*genion_complex.zip'
5150
wic:
5251
steps:
5352
(3, prod.yml):
@@ -82,13 +81,24 @@ wic:
8281
action: restore
8382
save_defs: ['genion_complex.zip', 'prod_complex.gro']
8483
steps:
85-
(1, setup.yml):
84+
(1, setup_vac_min.yml):
8685
wic:
8786
steps:
88-
(4, genion):
89-
in:
90-
output_top_zip_path: '&genion_ligand.zip'
87+
(1, topology.yml):
88+
wic:
89+
steps:
90+
(1, editconf):
91+
in:
92+
output_crd_path: '&ligand_box.g96'
93+
(3, solv_ion.yml):
94+
wic:
95+
steps:
96+
(4, genion):
97+
in:
98+
output_top_zip_path: '&genion_ligand.zip'
9199
(2, basic.yml):
100+
in:
101+
top_zip_path: '*genion_ligand.zip'
92102
wic:
93103
steps:
94104
(3, prod.yml):

examples/docking/gen_topol_params.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ steps:
7070
in:
7171
input_structure1: ~input_receptor_xyz_path
7272
input_structure2: '*pose_ligand.xyz'
73+
input_top_zip_path: '*complex_vac.zip'
7374
output_structure_path: '&complex_vac.pdb'
7475

7576
wic:

examples/docking/vs_demo_2.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,13 +146,18 @@ wic:
146146
wic:
147147
inlineable: False
148148
steps:
149-
(1, setup.yml):
149+
(1, setup_vac_min.yml):
150150
wic:
151151
steps:
152-
(4, genion):
153-
in:
154-
output_top_zip_path: '&genion_complex.zip'
152+
(3, solv_ion.yml):
153+
wic:
154+
steps:
155+
(4, genion):
156+
in:
157+
output_top_zip_path: '&genion_complex.zip'
155158
(2, basic.yml):
159+
in:
160+
top_zip_path: '*genion_complex.zip'
156161
wic:
157162
steps:
158163
(3, prod.yml):

examples/docking/vs_demo_3.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,18 @@ wic:
124124
wic:
125125
inlineable: False
126126
steps:
127-
(1, setup.yml):
127+
(1, setup_vac_min.yml):
128128
wic:
129129
steps:
130-
(4, genion):
131-
in:
132-
output_top_zip_path: '&genion_complex.zip'
130+
(3, solv_ion.yml):
131+
wic:
132+
steps:
133+
(4, genion):
134+
in:
135+
output_top_zip_path: '&genion_complex.zip'
133136
(2, basic.yml):
137+
in:
138+
top_zip_path: '*genion_complex.zip'
134139
wic:
135140
steps:
136141
(3, prod.yml):

examples/docking/vs_demo_4.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,13 +191,18 @@ wic:
191191
wic:
192192
inlineable: False
193193
steps:
194-
(1, setup.yml):
194+
(1, setup_vac_min.yml):
195195
wic:
196196
steps:
197-
(4, genion):
198-
in:
199-
output_top_zip_path: '&genion_complex.zip'
197+
(3, solv_ion.yml):
198+
wic:
199+
steps:
200+
(4, genion):
201+
in:
202+
output_top_zip_path: '&genion_complex.zip'
200203
(2, basic.yml):
204+
in:
205+
top_zip_path: '*genion_complex.zip'
201206
wic:
202207
steps:
203208
(3, prod.yml):

examples/gromacs/basic.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
inputs:
2+
top_zip_path:
3+
type: File
4+
format:
5+
- edam:format_3987
26
nsteps:
37
type: int
48
dt:
@@ -16,6 +20,8 @@ steps:
1620
# to this level and use the following syntax to pass it to only one call site.
1721
# (Moreover, the former will create multiple definitions of &min.tpr, which is not allowed.)
1822
- min.yml:
23+
in:
24+
top_zip_path: ~top_zip_path
1925
- equil.yml:
2026
- prod.yml:
2127
in:

examples/gromacs/cg.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
1+
inputs:
2+
top_zip_path:
3+
type: File
4+
format:
5+
- edam:format_3987
6+
17
steps:
28
- grompp:
39
in:
10+
input_top_zip_path: ~top_zip_path
411
config:
512
mdp:
613
integrator: cg

examples/gromacs/min.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
1+
inputs:
2+
top_zip_path:
3+
type: File
4+
format:
5+
- edam:format_3987
6+
17
steps:
28
- steep.yml:
9+
in:
10+
top_zip_path: ~top_zip_path
311
# Fatal error:
412
# The coordinates could not be constrained. Minimizer 'cg' can not handle
513
# constraint failures, use minimizer 'steep' before using 'cg'.
614
- cg.yml:
15+
in:
16+
top_zip_path: ~top_zip_path
717
# Fatal error:
818
# The combination of constraints and L-BFGS minimization is not implemented.
919
# Either do not use constraints, or use another minimizer (e.g. steepest

0 commit comments

Comments
 (0)