Skip to content

Commit 3c40acc

Browse files
committed
DOC: added new parameters to the documentation
1 parent c8005c6 commit 3c40acc

File tree

3 files changed

+16
-0
lines changed

3 files changed

+16
-0
lines changed

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@ main = calisto.add_parachute(
262262
sampling_rate=105,
263263
lag=1.5,
264264
noise=(0, 8.3, 0.5),
265+
<<<<<<< HEAD
265266
radius=1.5,
266267
height=1.5,
267268
porosity=0.0432,
@@ -274,8 +275,13 @@ drogue = calisto.add_parachute(
274275
sampling_rate=105,
275276
lag=1.5,
276277
noise=(0, 8.3, 0.5),
278+
<<<<<<< HEAD
277279
radius=1.5,
278280
height=1.5,
281+
=======
282+
parachute_radius=1.5,
283+
parachute_height=1.5,
284+
>>>>>>> 7defc38c (DOC: added new parameters to the documentation)
279285
porosity=0.0432,
280286
)
281287
```

docs/user/first_simulation.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,13 @@ Finally, we can add any number of Parachutes to the ``Rocket`` object.
276276
sampling_rate=105,
277277
lag=1.5,
278278
noise=(0, 8.3, 0.5),
279+
<<<<<<< HEAD
279280
radius=1.5,
280281
height=1.5,
282+
=======
283+
parachute_radius=1.5,
284+
parachute_height=1.5,
285+
>>>>>>> 7defc38c (DOC: added new parameters to the documentation)
281286
porosity=0.0432,
282287
)
283288

docs/user/rocket/rocket_usage.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,13 @@ apogee and another that will be deployed at 800 meters above ground level:
314314
sampling_rate=105,
315315
lag=1.5,
316316
noise=(0, 8.3, 0.5),
317+
<<<<<<< HEAD
317318
radius=1.5,
318319
height=1.5,
320+
=======
321+
parachute_radius=1.5,
322+
parachute_height=1.5,
323+
>>>>>>> 7defc38c (DOC: added new parameters to the documentation)
319324
porosity=0.0432,
320325
)
321326

0 commit comments

Comments
 (0)