Loading OpenSimRoot/src/modules/Soil/Watflow.cpp +6 −7 Original line number Diff line number Diff line Loading @@ -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"); Loading Loading
OpenSimRoot/src/modules/Soil/Watflow.cpp +6 −7 Original line number Diff line number Diff line Loading @@ -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"); Loading