Commit 4af5f8ae authored by jouke's avatar jouke
Browse files

reducing code repetition

parent f98cd2ba

OpenSimRoot/src/modules/CarbonModule/SeedReserves.cpp

+1 −2
Original line number Diff line number Diff line
@@ -145,15 +145,14 @@ void ReservesSinkBased::calculate(const Time &t, double& reserve){ 
		reserve=0;

		return;

	}

	if(t-pSD->getStartTime()>mt){

	pSD->get(t,reserve);

	if(t-pSD->getStartTime()>mt){

		///@todo hard coded value here. this could be relative to initial reserves, but not if garbage collector was on

		if(reserve>0.05*mr) msg::warning("ReservesSinkBased: Expiring seed reserves at "+std::to_string(mt)+" d.a.g. with "+std::to_string(100*reserve/mr)+"% of the initial "+std::to_string(mr)+"g left.");

		reserve=0;

		sink=nullptr;

	}else{

		//max reserve

		pSD->get(t,reserve);

		if(mr<reserve) mr=reserve;

		//std::cout<<"seed re "<<t<<'t'<<reserve<<'\t';

		if(reserve<=1e-7){