From c9efb31b81fc5047dad568959c43e9ea06277473 Mon Sep 17 00:00:00 2001 From: Tim Segers Date: Sun, 16 Oct 2022 16:49:13 +0200 Subject: Merge calc_stoplen_rough into deco_stop --- src/schedule.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/schedule.c b/src/schedule.c index 8f15813..18ab946 100644 --- a/src/schedule.c +++ b/src/schedule.c @@ -92,11 +92,13 @@ double calc_ndl(decostate_t *ds, const double depth, const double ascrate, const return ndl; } -double calc_stoplen_rough(const decostate_t *ds, const double depth, const double current_gf, const gas_t *gas) +double deco_stop(decostate_t *ds, const double depth, const double current_gf, const gas_t *gas) { - decostate_t ds_ = *ds; double stoplen = 0; + /* rough steps */ + decostate_t ds_ = *ds; + for (;;) { double tmp = add_segment_const(&ds_, depth, STOPLEN_ROUGH, gas); @@ -106,20 +108,8 @@ double calc_stoplen_rough(const decostate_t *ds, const double depth, const doubl stoplen += tmp; } - return stoplen; -} - -double deco_stop(decostate_t *ds, const double depth, const double current_gf, const gas_t *gas) -{ - double stoplen = 0; - - /* rough steps */ - double stoplen_rough = calc_stoplen_rough(ds, depth, current_gf, gas); - - if (stoplen_rough) { - add_segment_const(ds, depth, stoplen_rough, gas); - stoplen += stoplen_rough; - } + if (stoplen) + add_segment_const(ds, depth, stoplen, gas); /* fine steps */ while (ceiling(ds, current_gf) == depth) -- cgit v1.2.3-70-g09d2