diff --git a/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh b/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh index b615aa5a6379d7187b0bb56db660833a42e13f33..2cb79eede16e6283359e6d80cbaff22148c3ffad 100644 --- a/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh +++ b/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh @@ -352,7 +352,6 @@ public: for (int i = 0; i < size; i++) { CellData& cellData = problem_.variables().cellData(i); - storePressureSolution(i, cellData); if (pressureType_ == pw) { diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2p.hh index 8ef79f66f4692181614962a813d2259c2000fc3c..9a0c5ecc6bdba635ed465b2678b403db2292e9af 100644 --- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2p.hh +++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2p.hh @@ -348,7 +348,6 @@ public: int idx = problem_.variables().index(*eIt); CellData& cellData = problem_.variables().cellData(idx); - storePressureSolution(*eIt); (*pC)[idx] = cellData.capillaryPressure(); if (pressureType_ == pw) @@ -1864,7 +1863,7 @@ void FVMPFAL2PFABoundPressure2P<TypeTag>::assemble() lambdaBound[nPhaseIdx] /= viscosity_[nPhaseIdx]; Scalar potentialBound = interactionVolume.getDirichletValues(intVolFaceIdx)[pressureIdx]; - Scalar gdeltaZ = (problem_.bboxMax()-globalPos) * gravity_; + Scalar gdeltaZ = (problem_.bboxMax()-globalPosFace) * gravity_; //calculate potential gradients Scalar potentialW = 0; diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2padaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2padaptive.hh index 37c5b3856b905f69c3d7561019793b60acd7748c..a612522ef63a4bf944335af856c8dbbeb46414ce 100644 --- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2padaptive.hh +++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2padaptive.hh @@ -369,7 +369,6 @@ public: int idx = problem_.variables().index(*eIt); CellData& cellData = problem_.variables().cellData(idx); - storePressureSolution(*eIt); (*pC)[idx] = cellData.capillaryPressure(); if (pressureType_ == pw) @@ -2659,7 +2658,7 @@ void FVMPFAL2PFABoundPressure2PAdaptive<TypeTag>::assemble() lambdaBound[nPhaseIdx] /= viscosity_[nPhaseIdx]; Scalar potentialBound = interactionVolume.getDirichletValues(intVolFaceIdx)[pressureIdx]; - Scalar gdeltaZ = (problem_.bboxMax()-globalPos) * gravity_; + Scalar gdeltaZ = (problem_.bboxMax()-globalPosFace) * gravity_; //calculate potential gradients Scalar potentialW = 0; diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2p.hh index 76e5627f819538fe0c949f0fead05581a31d2dfb..82afaa96eabd05473a0af3ce00882ddd9ff43122 100644 --- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2p.hh +++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2p.hh @@ -813,7 +813,7 @@ void FVMPFAL2PFABoundVelocity2P<TypeTag>::calculateVelocity() lambdaBound[wPhaseIdx] /= viscosity_[wPhaseIdx]; lambdaBound[nPhaseIdx] /= viscosity_[nPhaseIdx]; - Scalar gdeltaZ = (problem_.bboxMax()-globalPos) * gravity_; + Scalar gdeltaZ = (problem_.bboxMax()-globalPosFace) * gravity_; Scalar potentialBoundW = interactionVolume.getDirichletValues(intVolFaceIdx)[pressureIdx] + density_[wPhaseIdx]*gdeltaZ; Scalar potentialBoundNW = potentialBoundW; diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2padaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2padaptive.hh index 7ce8226574120415330368482a2e95304e1909e7..c936c913f7f5675eb85dec1d210e81cd9f61f56f 100644 --- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2padaptive.hh +++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2padaptive.hh @@ -1156,7 +1156,7 @@ void FVMPFAL2PFABoundVelocity2PAdaptive<TypeTag>::calculateVelocity() lambdaBound[wPhaseIdx] /= viscosity_[wPhaseIdx]; lambdaBound[nPhaseIdx] /= viscosity_[nPhaseIdx]; - Scalar gdeltaZ = (problem_.bboxMax()-globalPos) * gravity_; + Scalar gdeltaZ = (problem_.bboxMax()-globalPosFace) * gravity_; Scalar potentialBoundW = interactionVolume.getDirichletValues(intVolFaceIdx)[pressureIdx] + density_[wPhaseIdx]*gdeltaZ; Scalar potentialBoundNW = potentialBoundW; diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundpressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundpressure2p.hh index 2ac546010c2338662ac8cfde580737edbc17bbbd..2b778d8d3ff0160e6312bbfb100854f6e4e8c74d 100644 --- a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundpressure2p.hh +++ b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundpressure2p.hh @@ -337,7 +337,6 @@ public: int idx = problem_.variables().index(*eIt); CellData& cellData = problem_.variables().cellData(idx); - storePressureSolution(*eIt); (*pC)[idx] = cellData.capillaryPressure(); if (pressureType_ == pw) @@ -1938,7 +1937,7 @@ void FVMPFAO2PFABoundPressure2P<TypeTag>::assemble() lambdaBound[nPhaseIdx] /= viscosity_[nPhaseIdx]; Scalar potentialBound = interactionVolume.getDirichletValues(intVolFaceIdx)[pressureIdx]; - Scalar gdeltaZ = (problem_.bboxMax()-globalPos) * gravity_; + Scalar gdeltaZ = (problem_.bboxMax()-globalPosFace) * gravity_; //calculate potential gradients Scalar potentialW = 0; diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundvelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundvelocity2p.hh index af0c7a4f24a91ac7780d567ff38dc96f3dec1acc..aa48cf4a3f0a9f61059ec9f3629bb56f42bb7ae3 100644 --- a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundvelocity2p.hh +++ b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundvelocity2p.hh @@ -205,8 +205,11 @@ public: { ParentType::addOutputVtkFields(writer); + std::cout<<"muh\n"; if (vtkOutputLevel_ > 0) { + std::cout<<"muhin\n"; + Dune::BlockVector < DimVector > &velocityWetting = *(writer.template allocateManagedBuffer< Scalar, dim>(problem_.gridView().size(0))); Dune::BlockVector < DimVector > &velocityNonwetting = @@ -695,7 +698,7 @@ void FVMPFAO2PFABoundVelocity2P<TypeTag>::calculateVelocity() lambdaBound[wPhaseIdx] /= viscosity_[wPhaseIdx]; lambdaBound[nPhaseIdx] /= viscosity_[nPhaseIdx]; - Scalar gdeltaZ = (problem_.bboxMax()-globalPos) * gravity_; + Scalar gdeltaZ = (problem_.bboxMax()-globalPosFace) * gravity_; Scalar potentialBoundW = interactionVolume.getDirichletValues(intVolFaceIdx)[pressureIdx] + density_[wPhaseIdx]*gdeltaZ; Scalar potentialBoundNW = potentialBoundW;