Commit 55f6d7ea authored by jouke's avatar jouke
Browse files

Correcting situation in which zeroflux and depth of the water table are

defined in the input file
parent ed1f97e4
Loading
Loading
Loading
Loading
+6 −7
Original line number Diff line number Diff line
@@ -136,17 +136,16 @@ oldDeltat_(-1)
	//bottom boundary condition is by default free drainage, but here we switch based on user input
	depthWaterTable_ = ORIGIN->existingPath("environment/soil/water/depthOfWaterTable");
	SimulaBase* zeroFlux = ORIGIN->existingPath("environment/soil/water/zeroFluxBottomBoundary");
	if(depthWaterTable_) {
		if(zeroFluxBottomBoundary_) msg::error("Watflow: Both depthOfWaterTable and zeroFluBottomBoundary set. Use one of the two.");
		msg::warning("Watflow: Using Dirichlet bottom boundary based on specified depthOfWaterTable.",3);
		FreeD=false; ///todo enumerator would be better, so we can simply switch between various boundaries
	}else{
	if(zeroFlux) {
			zeroFlux->get(zeroFluxBottomBoundary_);
			if(zeroFluxBottomBoundary_) msg::warning("Watflow: Using zero flux bottom boundary condition.",3);
	}else{
			msg::warning("Watflow: Using Free drainage bottom boundary.",3);
	}
	if(depthWaterTable_) {
		if(zeroFluxBottomBoundary_) msg::error("Watflow: Both depthOfWaterTable and zeroFluBottomBoundary set. Use one of the two.");
		msg::warning("Watflow: Using Dirichlet bottom boundary based on specified depthOfWaterTable.",3);
		FreeD=false; ///todo enumerator would be better, so we can simply switch between various boundaries
	}

	p = ORIGIN->existingPath("environment/soil/water/allowOutflow");