diff --git a/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh b/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh index 069558aaccc82ba6a3c899423b51aefecf9e81ef..13194b0b08c83732864bb18fa56e7d461162d50a 100644 --- a/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh +++ b/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh @@ -140,7 +140,7 @@ public: //constitutive functions are initialized and stored in the variables object void updateMaterialLaws(); - void initial(bool solveTwice = true) + void initialize(bool solveTwice = true) { updateMaterialLaws(); diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressure2p.hh index f42af5b2e41bb9efea45cb13cc71104f4c95d028..f8d6bb64aa48e54f01235fd00abb566e0c9043c8 100644 --- a/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressure2p.hh +++ b/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressure2p.hh @@ -130,7 +130,7 @@ public: //constitutive functions are initialized and stored in the variables object void updateMaterialLaws(); - void initial(bool solveTwice = true) + void initialize(bool solveTwice = true) { updateMaterialLaws(); diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressure2p_new.hh b/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressure2p_new.hh index 8c01078e430aa355f82ea0f1b1dded5525565ea3..82a322b4bdef306fdc8967e7fe4e619ccbabdac9 100644 --- a/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressure2p_new.hh +++ b/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressure2p_new.hh @@ -142,7 +142,7 @@ public: //constitutive functions are initialized and stored in the variables object void updateMaterialLaws(bool first); - void initial(bool solveTwice = true) + void initialize(bool solveTwice = true) { updateMaterialLaws(true); diff --git a/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh b/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh index 1978de6367868d7ab692c4ce389faf310109b66e..fd80ad00901b38a87402d7b168ab5faffd0bf454 100644 --- a/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh +++ b/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh @@ -148,7 +148,7 @@ public: //constitutive functions are initialized and stored in the variables object void updateMaterialLaws(); - void initial(bool solveTwice = true) + void initialize(bool solveTwice = true) { updateMaterialLaws(); assemble(true); diff --git a/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh b/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh index 38f43bf0a9342b848e2943170126978dd54b8d66..fca60f982d1151d66e3284ce0b913576413f3448 100644 --- a/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh +++ b/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh @@ -155,7 +155,7 @@ public: virtual int update(const Scalar t, Scalar& dt, RepresentationType& updateVec, bool impes); //! Sets the initial solution \f$S_0\f$. - void initialTransport(); + void initialize(); //! Update the values of the material laws and constitutive relations. /*! @@ -948,7 +948,7 @@ int FVSaturation2P<TypeTag>::update(const Scalar t, Scalar& dt, RepresentationTy } template<class TypeTag> -void FVSaturation2P<TypeTag>::initialTransport() +void FVSaturation2P<TypeTag>::initialize() { // iterate through leaf grid an evaluate c0 at cell center ElementIterator eItEnd = problem_.gridView().template end<0> (); diff --git a/dumux/decoupled/common/impes.hh b/dumux/decoupled/common/impes.hh index eefd13b48c29d1fb2a279283fecea5740fa89538..73a5d1b1538c1972d3563fa90da04a3b2c3ea272 100644 --- a/dumux/decoupled/common/impes.hh +++ b/dumux/decoupled/common/impes.hh @@ -78,9 +78,9 @@ public: virtual void initial() { //initial saturations - problem.saturationModel().initialTransport(); + problem.saturationModel().initialize(); //call function with true to get a first initialisation of the pressure field - problem.pressureModel().initial(); + problem.pressureModel().initialize(); problem.pressureModel().calculateVelocity(); //update constitutive functions