comparison Discovery/Src/base.c @ 249:cefee1448ea6

Merged in janlmulder/ostc4/bm-1 (pull request #16) Replace Relative GF by saturation
author heinrichsweikamp <bitbucket@heinrichsweikamp.com>
date Thu, 11 Apr 2019 10:26:22 +0000
parents ac2b06b5d09f
children 822416168585
comparison
equal deleted inserted replaced
245:c282f9e88c66 249:cefee1448ea6
1705 decoLock = DECO_CALC_FINSHED_Futurevpm; 1705 decoLock = DECO_CALC_FINSHED_Futurevpm;
1706 return; 1706 return;
1707 case CALC_BUEHLMANN: 1707 case CALC_BUEHLMANN:
1708 buehlmann_calc_deco(&stateDeco.lifeData,&stateDeco.diveSettings,&stateDeco.decolistBuehlmann); 1708 buehlmann_calc_deco(&stateDeco.lifeData,&stateDeco.diveSettings,&stateDeco.decolistBuehlmann);
1709 buehlmann_ceiling_calculator(&stateDeco.lifeData,&stateDeco.diveSettings,&stateDeco.decolistBuehlmann); 1709 buehlmann_ceiling_calculator(&stateDeco.lifeData,&stateDeco.diveSettings,&stateDeco.decolistBuehlmann);
1710 buehlmann_relative_gradient_calculator(&stateDeco.lifeData,&stateDeco.diveSettings,&stateDeco.decolistBuehlmann); 1710 buehlmann_super_saturation_calculator(&stateDeco.lifeData,&stateDeco.decolistBuehlmann);
1711 decoLock = DECO_CALC_FINSHED_Buehlmann; 1711 decoLock = DECO_CALC_FINSHED_Buehlmann;
1712 return; 1712 return;
1713 case CALC_BUEHLMANN_FUTURE: 1713 case CALC_BUEHLMANN_FUTURE:
1714 decom_tissues_exposure(stateDeco.diveSettings.future_TTS_minutes * 60,&stateDeco.lifeData); 1714 decom_tissues_exposure(stateDeco.diveSettings.future_TTS_minutes * 60,&stateDeco.lifeData);
1715 buehlmann_calc_deco(&stateDeco.lifeData,&stateDeco.diveSettings,&stateDeco.decolistFutureBuehlmann); 1715 buehlmann_calc_deco(&stateDeco.lifeData,&stateDeco.diveSettings,&stateDeco.decolistFutureBuehlmann);